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 fc921ef03..0d7a877c7 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"
>
@@ -27,22 +24,19 @@
>
-
- 对比信息
-
-
-
-
-
-
- {{ scope.row.date }}
-
-
-
+
+
+
对比信息
+
+
+
+
+
+
@@ -67,16 +61,16 @@ 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: "gender", type: "text" },
- { field: "民族", keyName: "mz", type: "text" },
+ { field: "证件号", keyName: "idCard", type: "text", width: 200 },
+ { field: "手机", keyName: "mobile", type: "text", width: 120 },
+ { field: "性别", keyName: "genderCn", 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: "dealStatusName", type: "text" },
{ field: "失败原因", keyName: "dealResult", type: "text" },
],
@@ -91,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: "mz", type: "input" },
+ { field: "性别", keyName: "genderCn", 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: "dealStatusName", type: "input" },
{ field: "失败原因", keyName: "dealResult", type: "input" },
],
};
@@ -115,21 +109,22 @@ export default {
{ field: "姓名", keyName: "name", type: "text" },
{ field: "证件号", keyName: "idCard", type: "text" },
{ field: "手机", keyName: "mobile", type: "text" },
- { field: "性别", keyName: "gender", type: "text" },
- { field: "民族", keyName: "mz", type: "text" },
+ { field: "性别", keyName: "genderCn", 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 && info[item.keyName]) || "--";
+ let resiVal =
+ (info && info.resiInfo && 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 +168,11 @@ export default {
diff --git a/src/views/modules/shujuduibi/siwang.vue b/src/views/modules/shujuduibi/siwang.vue
index 7deababc0..274c8566a 100644
--- a/src/views/modules/shujuduibi/siwang.vue
+++ b/src/views/modules/shujuduibi/siwang.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 ? '待完善' : '修改')"
+ :cookTableData="cookTableData"
idName="id"
>
@@ -48,10 +45,12 @@ export default {
{ field: "选择框", keyName: "", type: "selection" },
{ field: "序号", keyName: "", type: "no" },
{ field: "姓名", keyName: "name", type: "text" },
- { field: "证件号", keyName: "idCard", type: "text" },
- { field: "死亡日期", keyName: "deathDate", type: "text" },
+ { field: "证件号", keyName: "idCard", type: "text", width: 200 },
+ { 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",
@@ -59,7 +58,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" },
@@ -77,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",