diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 15e07213d..f1253f0cb 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -1049,10 +1049,6 @@ export default { economyDto: { monthIncome: null, //月收入 }, - subsistenceAllowanceDto: { - reasons: null, - category: [], - }, }, orgOption:[], footerInputList: [ @@ -1475,7 +1471,7 @@ export default { { label: "子女死亡日期", itemType: "datepicker1", - formName: "certificateDate", + formName: "childDeathDate", pformName: "specialSupportDto", opction: [], }, @@ -1636,7 +1632,6 @@ export default { this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId,i); } this.form = { ...res.data.data }; - this.form.baseInfoDto.idNum = this.$route.params.idNum; this.form.baseInfoDto.mobile = this.$route.params.mobile; if (!res.data.data.familyInfoDto) { @@ -1670,6 +1665,12 @@ export default { specialCategoryCodes: [], }; } + if (!res.data.data.subsistenceAllowanceDto) { + this.form.subsistenceAllowanceDto = { + reasons: [], + category:null , + }; + } if (!res.data.data.unemployedDto) { this.form.unemployedDto = { originWorkUnit: null, //原工作单位 @@ -1709,7 +1710,7 @@ export default { formData.partyOrgIdPath || null; } this.footerInputList[i].children[index].value = - formData[formName] || null; + formData[formName] != null?formData[formName]:null this.footerInputList[i].children[index].id = formData.id; } @@ -2201,7 +2202,6 @@ export default { // 提交扩展信息 submitExpand(_form, { changId, changPid, changType }) { if (changType == "checkbox") { - this.form[changPid] = {}; this.form[changPid][changId] = []; this.form[changPid][changId].push(..._form[changPid][changId]); } else { diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue index 5db8656ec..bf1c2686e 100644 --- a/src/views/components/resiExpand/editExpand.vue +++ b/src/views/components/resiExpand/editExpand.vue @@ -119,6 +119,7 @@ export default { disabilityDesc: null, guardianFlag: null, guardianName: null, + guardianMobile:null, specialSkillFlag: null, workCapacityFlag: null }, @@ -142,8 +143,8 @@ export default { }, // 低保人员 subsistenceAllowanceDto: { - reasons: null, - category: [] + reasons: [], + category:null , }, // 退役军人 veteranDto: { @@ -179,7 +180,6 @@ export default { volunteerDto: { volunteerCategory: [] }, - }, casProps: { value: 'id', @@ -234,7 +234,6 @@ export default { }, showForm() { this.$nextTick(() => { - // console.log(this.formList,'拓展组件formList'); // console.log(this.form,'拓展组件form'); const promises = this.formList.forEach((item) => { item.form.map(async (group) => { @@ -248,8 +247,8 @@ export default { this.partyOrgIdPath = item.orgPath.split(':')[0] await this.getOrgTree() this.form[item.pformName][item.formName] = item.value || null - } else { - this.form[item.pformName][item.formName] = item.value || null + } else{ + this.form[item.pformName][item.formName] = item.value != null?item.value:null; } if (item.opctionUrl) { try { diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue index 3a5844321..4a4fc18a6 100644 --- a/src/views/modules/base/smartImport/cpts/completeTask.vue +++ b/src/views/modules/base/smartImport/cpts/completeTask.vue @@ -45,7 +45,7 @@ 下载结果说明
+
+
+ {{ file.name }} + +
+

4、上传按导入模板整理后的excel数据文件。

@@ -157,7 +164,7 @@