From 7575798fbbcedbe7ee8f6fb0e7af4a84ba95625f Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 28 Feb 2024 15:01:08 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=89=BE=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/fuwuzhaoren/addForm.vue | 1777 ++++++++--------- 1 file changed, 804 insertions(+), 973 deletions(-) diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue index c0cc0ad9e..209af354c 100644 --- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue +++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue @@ -1,224 +1,100 @@ - - From a03438ab707bc61b983494cb99da758ae0d4abd1 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 28 Feb 2024 15:46:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B8=A9=E6=9A=96=E6=89=BE=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E6=8A=80=E8=83=BD=E6=89=BE=E4=BA=BA=E3=80=81=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E6=89=BE=E4=BA=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/fuwuzhaoren/addForm.vue | 4 +- .../gangweizhaoren/addForm.vue | 1787 ++++++++--------- .../jinengzhaoren/addForm.vue | 1783 ++++++++-------- .../wennuanzhaoren/addForm.vue | 1781 ++++++++-------- 4 files changed, 2420 insertions(+), 2935 deletions(-) diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue index 209af354c..60f29bec9 100644 --- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue +++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue @@ -226,7 +226,7 @@ export default { checkStrictly: true, emitPath: false, }, - serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }], // 退休 + serviceStatusOptions: [{ 'label': '进行中', 'value': 'in_service' }, { 'label': '已完成', 'value': 'completed' }, { 'label': '取消', 'value': 'cancel' }], keyWords: "", formData: { categoryCode: [], @@ -787,8 +787,6 @@ export default { feedback: this.formData.feedback, serviceRecordId: this.serviceRecordId, }; - console.log(params); - console.log(this.formType); let url = ""; if (this.formType != "edit") { url = "/governance/icServiceRecordV2/searchAdd"; diff --git a/src/views/modules/communityService/gangweizhaoren/addForm.vue b/src/views/modules/communityService/gangweizhaoren/addForm.vue index 453ad30ff..c0d3eafd5 100644 --- a/src/views/modules/communityService/gangweizhaoren/addForm.vue +++ b/src/views/modules/communityService/gangweizhaoren/addForm.vue @@ -1,28 +1,14 @@ - - diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue index aadb0af5e..0ebe53530 100644 --- a/src/views/modules/communityService/jinengzhaoren/addForm.vue +++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue @@ -1,28 +1,14 @@ - - diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue index c0dbcb16e..0caee237b 100644 --- a/src/views/modules/communityService/wennuanzhaoren/addForm.vue +++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue @@ -1,28 +1,14 @@ - - From cbdb1c1909764bd49b333181a7bbebe3e1dd8ab6 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 15 Mar 2024 16:04:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8D=95=E9=80=89=E6=A1=86=E5=9B=9E=E5=A1=AB=E9=97=AE=E9=A2=98?= =?UTF-8?q?,=E4=BD=8E=E4=BF=9D=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/editResi.vue | 15 ++++++++------- src/views/components/resiExpand/editExpand.vue | 11 +++++------ src/views/modules/portrayal/jumin/index.vue | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 212302f2c..1cec211b6 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -1043,10 +1043,6 @@ export default { economyDto: { monthIncome: null, //月收入 }, - subsistenceAllowanceDto: { - reasons: null, - category: [], - }, }, orgOption:[], footerInputList: [ @@ -1469,7 +1465,7 @@ export default { { label: "子女死亡日期", itemType: "datepicker1", - formName: "certificateDate", + formName: "childDeathDate", pformName: "specialSupportDto", opction: [], }, @@ -1630,7 +1626,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) { @@ -1664,6 +1659,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, //原工作单位 @@ -1703,7 +1704,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; } 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/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index d62488fa8..e8e04b888 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -1077,7 +1077,7 @@ export default { { label: "子女死亡日期", itemType: "datepicker1", - formName: "certificateDate", + formName: "childDeathDate", opction: [], }, { From 5b746eaf6397992b8f9daef454c60995ed48ea52 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 15 Mar 2024 16:26:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=8D=E9=80=89=E6=A1=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/editResi.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 1cec211b6..9859a180e 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -2197,7 +2197,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 { From 80605e5276fee43ba25cf832564b851bdfa8c0bc Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 20 Mar 2024 14:13:27 +0800 Subject: [PATCH 5/6] =?UTF-8?q?bug#1049=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA,=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=AE=8C=E6=88=90=E6=88=96=E8=80=85=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=B7=E6=B1=82=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/smartImport/cpts/completeTask.vue | 2 +- .../base/smartImport/cpts/createdTask.vue | 21 +++++++++++++++++++ src/views/modules/base/smartImport/index.vue | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) 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数据文件。

@@ -228,6 +235,7 @@ export default { dataList: [], groupList: [], fileCode:null, + fileList:[] }; }, props: {}, @@ -349,6 +357,7 @@ export default { const { fileName, url } = res.data.data; this.createdFileName = fileName; this.createdFileUrl = url; + this.fileList.push({name:fileName,url:url}) this.checkExtractExcelHead(); } else { this.$message.error(res.data.msg); @@ -362,6 +371,9 @@ export default { }); this.$refs.upload.clearFiles(); }, + removeFile(){ + this.fileList = []; + }, // 下载全部模板 async handleExportModuleAll() { let url = "/actual/base/residentBaseInfo/import/download-template"; @@ -476,5 +488,14 @@ export default { @import "@/assets/scss/buttonstyle.scss"; @import "@/assets/scss/modules/management/detail-main.scss"; @import "@/assets/scss/pages/smartImport.scss"; +.uploadList{ + width: 99%; + height: 180px; + border: 1px dashed #ccc; + border-radius: 5px; + display: flex; + justify-content: center; + align-items: center; +} \ No newline at end of file diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue index 2768893c0..7c6093c64 100644 --- a/src/views/modules/base/smartImport/index.vue +++ b/src/views/modules/base/smartImport/index.vue @@ -199,6 +199,8 @@ export default { handleClose() { this.pageType = "list"; this.processStatus = null; + this.pageNo = 1; + this.getTableData(); }, // 新增弹出框组件确定事件 handleOk(type) { From 5aa7b9c343da9bf62b4c0474586606bda8a74de9 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 21 Mar 2024 14:40:21 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E7=BA=A2=E8=89=B2?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=8E=E7=AE=AD=E5=A4=B4=E6=8C=87=E7=A4=BA?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/smartImport/cpts/createdTask.vue | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue index 893b01b44..e2f9a7a3c 100644 --- a/src/views/modules/base/smartImport/cpts/createdTask.vue +++ b/src/views/modules/base/smartImport/cpts/createdTask.vue @@ -148,10 +148,24 @@ min-width="80" > - + + +