From 385957fa9ad329322f26c00d1a4bd1561eff9053 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 14 Oct 2022 10:14:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shujuduibi/canji.vue  | 80 ++++++++++++-------------
 src/views/modules/shujuduibi/siwang.vue |  8 +--
 2 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
index fc921ef03..0b3846306 100644
--- a/src/views/modules/shujuduibi/canji.vue
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -5,14 +5,11 @@
       :searchParams="searchParams"
       :tableParams="tableParams"
       :tableUrl="tableUrl"
-      :delUrl="delUrl"
       :delMultipleUrl="delMultipleUrl"
-      :delAuth="delAuth"
       :infoUrl="infoUrl"
       :exportUrl="exportUrl"
       :editParams="editParams"
-      :editElseRules="editElseRules"
-      :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
+      :editParamsDiv="5"
       idName="id"
     >
       <template v-slot:listBtn="{ multipleSelection }">
@@ -27,22 +24,19 @@
         >
       </template>
 
-      <template v-slot:editOperateSup="{ id, info }">
-        <h3>对比信息</h3>
-        <el-table
-          :data="cookInfo(info)"
-          style="width: 100%"
-          :row-class-name="tableRowClassName"
-        >
-          <el-table-column prop="resiinfo" label="对比信息" width="180">
-          </el-table-column>
-          <el-table-column prop="result" label="结果">
-            <template slot-scope="scope">
-              <i class="el-icon-time"></i>
-              <span style="margin-left: 10px">{{ scope.row.date }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
+      <template v-slot:editBottomSup="{ id, info }">
+        <div class="m-duibi">
+          <h3>对比信息</h3>
+          <el-table
+            :data="cookInfo(info)"
+            style="width: 100%"
+            :row-class-name="tableRowClassName"
+          >
+            <el-table-column prop="resiInfo" label="数据库信息">
+            </el-table-column>
+            <el-table-column prop="result" label="结果"></el-table-column>
+          </el-table>
+        </div>
       </template>
     </base-page>
   </div>
@@ -67,14 +61,14 @@ export default {
         { field: "选择框", keyName: "", type: "selection" },
         { field: "序号", keyName: "", type: "no" },
         { field: "姓名", keyName: "name", type: "text" },
-        { field: "证件号", keyName: "idCard", type: "text" },
-        { field: "手机", keyName: "mobile", type: "text" },
+        { field: "证件号", keyName: "idCard", type: "text", width: 200 },
+        { field: "手机", keyName: "mobile", type: "text", width: 120 },
         { field: "性别", keyName: "gender", type: "text" },
-        { field: "民族", keyName: "mz", type: "text" },
+        { field: "民族", keyName: "mzCn", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
-        { field: "残疾类别", keyName: "cjlb", type: "text" },
-        { field: "残疾等级", keyName: "cardNum", type: "text" },
-        { field: "残疾证号", keyName: "cjzk", type: "text" },
+        { field: "残疾类别", keyName: "cjlbCn", type: "text" },
+        { field: "残疾等级", keyName: "cjzkCn", type: "text" },
+        { field: "残疾证号", keyName: "cardNum", type: "text", width: 200 },
         { field: "监护人", keyName: "guardian", type: "text" },
         { field: "状态", keyName: "dealStatus", type: "text" },
         { field: "失败原因", keyName: "dealResult", type: "text" },
@@ -92,11 +86,11 @@ export default {
         { field: "证件号", keyName: "idCard", type: "input" },
         { field: "手机", keyName: "mobile", type: "input" },
         { field: "性别", keyName: "gender", type: "input" },
-        { field: "民族", keyName: "mz", type: "input" },
+        { field: "民族", keyName: "mzCn", type: "input" },
         { field: "家庭住址", keyName: "address", type: "input" },
-        { field: "残疾类别", keyName: "cjlb", type: "input" },
-        { field: "残疾等级", keyName: "cardNum", type: "input" },
-        { field: "残疾证号", keyName: "cjzk", type: "input" },
+        { field: "残疾类别", keyName: "cjlbCn", type: "input" },
+        { field: "残疾等级", keyName: "cjzkCn", type: "input" },
+        { field: "残疾证号", keyName: "cardNum", type: "input" },
         { field: "监护人", keyName: "guardian", type: "input" },
         { field: "状态", keyName: "dealStatus", type: "input" },
         { field: "失败原因", keyName: "dealResult", type: "input" },
@@ -116,20 +110,20 @@ export default {
         { field: "证件号", keyName: "idCard", type: "text" },
         { field: "手机", keyName: "mobile", type: "text" },
         { field: "性别", keyName: "gender", type: "text" },
-        { field: "民族", keyName: "mz", type: "text" },
+        { field: "民族", keyName: "mzCn", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
-        { field: "残疾类别", keyName: "cjlb", type: "text" },
-        { field: "残疾等级", keyName: "cardNum", type: "text" },
-        { field: "残疾证号", keyName: "cjzk", type: "text" },
+        { field: "残疾类别", keyName: "cjlbCn", type: "text" },
+        { field: "残疾等级", keyName: "cjzkCn", type: "text" },
+        { field: "残疾证号", keyName: "cardNum", type: "text" },
         { field: "监护人", keyName: "guardian", type: "text" },
       ];
       return arr.map((item) => {
+        let val = info[item.keyName] || "--";
+        let resiVal = info.resiInfo[item.keyName] || "--";
+
         return {
-          resiinfo: item.field + "：" + info.resiinfo[item.keyName],
-          result:
-            info.resiinfo[item.keyName] == info[item.keyName]
-              ? "一致"
-              : "不一致",
+          resiInfo: item.field + "：" + resiVal,
+          result: resiVal == val ? "一致" : "不一致",
         };
       });
     },
@@ -173,7 +167,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.el-table .z-stress {
-  background: #f0f9eb;
+.m-duibi {
+  padding: 10px;
+}
+
+::v-deep .el-table .z-stress {
+  background: oldlace;
 }
 </style>
diff --git a/src/views/modules/shujuduibi/siwang.vue b/src/views/modules/shujuduibi/siwang.vue
index 7deababc0..4f34e3331 100644
--- a/src/views/modules/shujuduibi/siwang.vue
+++ b/src/views/modules/shujuduibi/siwang.vue
@@ -5,14 +5,10 @@
       :searchParams="searchParams"
       :tableParams="tableParams"
       :tableUrl="tableUrl"
-      :delUrl="delUrl"
       :delMultipleUrl="delMultipleUrl"
-      :delAuth="delAuth"
       :infoUrl="infoUrl"
       :exportUrl="exportUrl"
       :editParams="editParams"
-      :editElseRules="editElseRules"
-      :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
       idName="id"
     >
       <template v-slot:listBtn="{ multipleSelection }">
@@ -48,7 +44,7 @@ export default {
         { field: "选择框", keyName: "", type: "selection" },
         { field: "序号", keyName: "", type: "no" },
         { field: "姓名", keyName: "name", type: "text" },
-        { field: "证件号", keyName: "idCard", type: "text" },
+        { field: "证件号", keyName: "idCard", type: "text", width: 200 },
         { field: "死亡日期", keyName: "deathDate", type: "text" },
         { field: "现年龄", keyName: "age", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
@@ -59,7 +55,7 @@ export default {
 
       infoUrl: "/epmetuser/dataSyncRecordDeath/detail/",
       //   delUrl: "/gov/org/icDangerousChemicals/del",
-      exportUrl: "/epmetuser/dataSyncRecordDeath/expoprt",
+      exportUrl: "/epmetuser/dataSyncRecordDeath/export",
 
       editParams: [
         { field: "姓名", keyName: "name", type: "input" },

From 035a85cad9ce540732c12bfb0e8de3919f3930d3 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 14 Oct 2022 10:57:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=B8=8D=E7=BB=99?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=90=EF=BC=8C=E5=8F=AA=E5=A5=BD=E9=83=BD=E6=94=B9?=
 =?UTF-8?q?=E4=B8=80=E9=81=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/index.vue   | 11 ++++++-----
 src/views/modules/shujuduibi/canji.vue  | 10 +++++-----
 src/views/modules/shujuduibi/siwang.vue | 17 ++++++++++++++++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 7bdf0f82a..f06ecc7ac 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -431,6 +431,11 @@ export default {
       type: Boolean,
       default: true,
     },
+
+    cookTableData: {
+      type: Function,
+      default: (val) => val,
+    },
   },
 
   data() {
@@ -761,11 +766,7 @@ export default {
 
       if (code === 0) {
         this.total = data.total || 0;
-        this.tableData = data.list
-          ? data.list.map((item) => {
-              return item;
-            })
-          : [];
+        this.tableData = data.list ? this.cookTableData(data.list) : [];
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
index 0b3846306..2acd45d28 100644
--- a/src/views/modules/shujuduibi/canji.vue
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -63,14 +63,14 @@ export default {
         { field: "姓名", keyName: "name", type: "text" },
         { field: "证件号", keyName: "idCard", type: "text", width: 200 },
         { field: "手机", keyName: "mobile", type: "text", width: 120 },
-        { field: "性别", keyName: "gender", type: "text" },
+        { field: "性别", keyName: "genderCn", type: "text" },
         { field: "民族", keyName: "mzCn", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
         { field: "残疾类别", keyName: "cjlbCn", type: "text" },
         { field: "残疾等级", keyName: "cjzkCn", type: "text" },
         { field: "残疾证号", keyName: "cardNum", type: "text", width: 200 },
         { field: "监护人", keyName: "guardian", type: "text" },
-        { field: "状态", keyName: "dealStatus", type: "text" },
+        { field: "状态", keyName: "dealStatusName", type: "text" },
         { field: "失败原因", keyName: "dealResult", type: "text" },
       ],
 
@@ -85,14 +85,14 @@ export default {
         { field: "姓名", keyName: "name", type: "input" },
         { field: "证件号", keyName: "idCard", type: "input" },
         { field: "手机", keyName: "mobile", type: "input" },
-        { field: "性别", keyName: "gender", type: "input" },
+        { field: "性别", keyName: "genderCn", type: "input" },
         { field: "民族", keyName: "mzCn", type: "input" },
         { field: "家庭住址", keyName: "address", type: "input" },
         { field: "残疾类别", keyName: "cjlbCn", type: "input" },
         { field: "残疾等级", keyName: "cjzkCn", type: "input" },
         { field: "残疾证号", keyName: "cardNum", type: "input" },
         { field: "监护人", keyName: "guardian", type: "input" },
-        { field: "状态", keyName: "dealStatus", type: "input" },
+        { field: "状态", keyName: "dealStatusName", type: "input" },
         { field: "失败原因", keyName: "dealResult", type: "input" },
       ],
     };
@@ -109,7 +109,7 @@ export default {
         { field: "姓名", keyName: "name", type: "text" },
         { field: "证件号", keyName: "idCard", type: "text" },
         { field: "手机", keyName: "mobile", type: "text" },
-        { field: "性别", keyName: "gender", type: "text" },
+        { field: "性别", keyName: "genderCn", type: "text" },
         { field: "民族", keyName: "mzCn", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
         { field: "残疾类别", keyName: "cjlbCn", type: "text" },
diff --git a/src/views/modules/shujuduibi/siwang.vue b/src/views/modules/shujuduibi/siwang.vue
index 4f34e3331..274c8566a 100644
--- a/src/views/modules/shujuduibi/siwang.vue
+++ b/src/views/modules/shujuduibi/siwang.vue
@@ -9,6 +9,7 @@
       :infoUrl="infoUrl"
       :exportUrl="exportUrl"
       :editParams="editParams"
+      :cookTableData="cookTableData"
       idName="id"
     >
       <template v-slot:listBtn="{ multipleSelection }">
@@ -45,9 +46,11 @@ export default {
         { field: "序号", keyName: "", type: "no" },
         { field: "姓名", keyName: "name", type: "text" },
         { field: "证件号", keyName: "idCard", type: "text", width: 200 },
-        { field: "死亡日期", keyName: "deathDate", type: "text" },
+        { field: "死亡日期", keyName: "deathDate", type: "text", width: 120 },
         { field: "现年龄", keyName: "age", type: "text" },
         { field: "家庭住址", keyName: "address", type: "text" },
+        { field: "状态", keyName: "dealStatusName", type: "text" },
+        { field: "失败原因", keyName: "dealResult", type: "text" },
       ],
 
       tableUrl: "/epmetuser/dataSyncRecordDeath/page",
@@ -73,6 +76,18 @@ export default {
   async mounted() {},
 
   methods: {
+    cookTableData(tableData) {
+      return tableData.map((item) => {
+        item.dealStatusName =
+          !item.dealStatus || item.dealStatus == 0
+            ? "未处理"
+            : item.dealStatus == 1
+            ? "处理成功"
+            : "处理失败";
+        return item;
+      });
+    },
+
     async handleSync(item) {
       const { data, code, msg } = await requestPost(
         "/epmetuser/dataSyncRecordDeath/batchupdate",

From fed29fd2c3a8d94821db3bfaec8d107f31bf0efb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 14 Oct 2022 13:46:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=B8=9C=E8=A5=BF=20=E8=AE=A9=E4=B8=8D=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shujuduibi/canji.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
index 2acd45d28..0d7a877c7 100644
--- a/src/views/modules/shujuduibi/canji.vue
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -118,8 +118,9 @@ export default {
         { field: "监护人", keyName: "guardian", type: "text" },
       ];
       return arr.map((item) => {
-        let val = info[item.keyName] || "--";
-        let resiVal = info.resiInfo[item.keyName] || "--";
+        let val = (info && info[item.keyName]) || "--";
+        let resiVal =
+          (info && info.resiInfo && info.resiInfo[item.keyName]) || "--";
 
         return {
           resiInfo: item.field + "：" + resiVal,