From dfa7b9020b535d2e5adcc473edc807049b02ab95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Mon, 6 May 2024 17:49:09 +0800 Subject: [PATCH 01/36] =?UTF-8?q?4.3.2=E7=89=88=E6=9C=AC=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/communityTable.vue | 8 ++++++-- src/views/modules/base/community/roomForm.vue | 17 +++++++++-------- .../communityService/fuwuzhaoren/personList.vue | 5 +++++ .../gangweizhaoren/personList.vue | 5 +++++ .../modules/communityService/gxxq/index.vue | 8 ++++++-- .../jinengzhaoren/personList.vue | 5 +++++ .../communityService/labelConfig/addForm.vue | 3 +++ .../communityService/policy/addPolicy.vue | 16 +++++++++++++++- .../communityService/policy/personList.vue | 11 +++++++++-- .../communityService/policy/policyList.vue | 14 ++++++++++++-- .../wennuanzhaoren/personList.vue | 6 +++++- 11 files changed, 80 insertions(+), 18 deletions(-) diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 3bd2be5b8..91b9812c2 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -77,6 +77,10 @@ 下载房屋模板 +
+ 下载电子门牌二维码 +
- 更多 + 更多 + diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index 521111e1e..dce3bfa59 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -37,7 +37,7 @@ v-model.trim="dataForm.doorName"> - 生成 - + --> - +
-
+ + 下载 + target="_blank">下载电子门牌二维码
diff --git a/src/views/modules/communityService/fuwuzhaoren/personList.vue b/src/views/modules/communityService/fuwuzhaoren/personList.vue index 74f4e7567..b4a3fc9a8 100644 --- a/src/views/modules/communityService/fuwuzhaoren/personList.vue +++ b/src/views/modules/communityService/fuwuzhaoren/personList.vue @@ -97,6 +97,7 @@
+ 公众号消息推送 标记享受服务人员 查询
@@ -162,6 +163,10 @@ prop="serveTimes" label="享受服务次数"> + 已推送 + diff --git a/src/views/modules/communityService/gangweizhaoren/personList.vue b/src/views/modules/communityService/gangweizhaoren/personList.vue index 74f4e7567..988b68f4c 100644 --- a/src/views/modules/communityService/gangweizhaoren/personList.vue +++ b/src/views/modules/communityService/gangweizhaoren/personList.vue @@ -97,6 +97,7 @@
+ 公众号消息推送 标记享受服务人员 查询
@@ -162,6 +163,10 @@ prop="serveTimes" label="享受服务次数"> + 已推送 + diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue index 69b3f7c5c..aedd88f64 100644 --- a/src/views/modules/communityService/gxxq/index.vue +++ b/src/views/modules/communityService/gxxq/index.vue @@ -292,13 +292,17 @@ export default { assignFlag: "", }, statusArray: [ + { + value: 2, + label: "待处理", + }, { value: 1, - label: "已指派服务", + label: "已派单", }, { value: 0, - label: "未指派服务", + label: "已完成", }, ], endPickerOptions: { diff --git a/src/views/modules/communityService/jinengzhaoren/personList.vue b/src/views/modules/communityService/jinengzhaoren/personList.vue index 74f4e7567..b4a3fc9a8 100644 --- a/src/views/modules/communityService/jinengzhaoren/personList.vue +++ b/src/views/modules/communityService/jinengzhaoren/personList.vue @@ -97,6 +97,7 @@
+ 公众号消息推送 标记享受服务人员 查询
@@ -162,6 +163,10 @@ prop="serveTimes" label="享受服务次数"> + 已推送 + diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue index d298def0c..a5d404be5 100644 --- a/src/views/modules/communityService/labelConfig/addForm.vue +++ b/src/views/modules/communityService/labelConfig/addForm.vue @@ -231,10 +231,12 @@

取 消 + 预览 确 定
+ @@ -675,6 +677,7 @@ export default { this.formState = false this.handleClickAddRow(); }, + }, props: {}, computed: {}, diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 530b3a537..77ab2a150 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -150,6 +150,18 @@ 按标签查找 + + + + { this.$refs["ref_label_form"].initForm("info"); diff --git a/src/views/modules/communityService/policy/personList.vue b/src/views/modules/communityService/policy/personList.vue index 7a0771763..56038d464 100644 --- a/src/views/modules/communityService/policy/personList.vue +++ b/src/views/modules/communityService/policy/personList.vue @@ -122,6 +122,13 @@
+ 公众号消息推送 + 已推送 +
@@ -461,14 +470,12 @@ export default { \ No newline at end of file From 832d865d0b5b58910e7d8e514194d70daf19f99c Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 24 May 2024 09:13:45 +0800 Subject: [PATCH 07/36] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E6=9B=B4=E6=96=B0=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/home/index.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 3adc2d98b..844f56cc4 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -503,7 +503,16 @@ export default { this.$router.push({ path: obj[item.category], }); - } + } else if(item.msgType == "sys_version_upgrade_publish"){ + let { targetId } = item + this.$router.push({ path: `notice-version`, query: { version_id: targetId } }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { + if (item.name === "notice-version") { + return { ...item }; + } + return item; + }); + } this.getNoticeData() }, From 33038cd013b389a4146035007b902647b453a348 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 24 May 2024 10:54:40 +0800 Subject: [PATCH 08/36] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/gxxq/addForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue index 99c1fdca6..a9975b7a3 100644 --- a/src/views/modules/communityService/gxxq/addForm.vue +++ b/src/views/modules/communityService/gxxq/addForm.vue @@ -431,7 +431,7 @@ export default { this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd; this.newFormData.serverOrgType = data.assignInfo.serverOrgType; this.newFormData.serverOrgId = data.assignInfo.serverOrgId; - this.newFormData.noticeApproches = data.assignInfo.noticeApproches; + this.newFormData.noticeApproches = data.assignInfo.noticeApproches || []; for (let i in data.assignInfo.serviceScopeList) { this.newFormData.serviceScopeList.push( From b84afc8c444accbd22bccc3bd3d9f336092bf50e Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 24 May 2024 15:48:05 +0800 Subject: [PATCH 09/36] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=94=B9=E8=81=94=E7=B3=BB=E4=BA=BA=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/regionalParty/units.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 9ee821e20..e5b8a9d58 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -48,7 +48,7 @@ Date: Fri, 24 May 2024 17:40:03 +0800 Subject: [PATCH 10/36] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=85=A5=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/organization/organization.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index a4dd01b13..00b7c09cd 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1655,6 +1655,16 @@ export default { // 添加人员 async submitPeoDo () { + const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]); + + // 用于存储提取结果的 Set 对象 + const result = new Set(); + + // 调用递归函数提取 level 与 agencyId 组合成的字符串 + this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result); + + // 将 Set 对象转换为数组 + const manageScopeArray = Array.from(result); const url = "/gov/org/staff/addstaffv2"; const { peoForm: { orgType }, @@ -1674,7 +1684,7 @@ export default { : orgType == "dept" ? this.currentDepartmentId : this.currentGridOrgId, - manageScopes:this.peoForm.manageScopes + manageScopes:manageScopeArray }; const { data, code, msg } = await requestPost(url, params); From 5d3b45041c46bfc281bbba1249be2f3abd7c03c8 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 25 May 2024 15:00:06 +0800 Subject: [PATCH 11/36] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=8C=87=E6=B4=BE=E4=BA=BA=E5=91=98=E5=BF=85=E5=A1=AB,?= =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/regionalParty/unitsForm.vue | 17 +++++++++-------- .../modules/communityService/gxxq/addForm.vue | 9 +-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue index 1cf0f4287..977356130 100644 --- a/src/views/modules/communityParty/regionalParty/unitsForm.vue +++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue @@ -76,8 +76,8 @@ class="u-item-width-normal" > - - + item.staffId === val)[0].mobile + this.formData.contactMobile = this.dicts.stafflist.filter(item=>item.staffId === val)[0].mobile; + this.formData.contact = val; }else{ - this.formData.contactMobile = '' + this.formData.contactMobile = ''; + this.formData.contact = ''; } }, getStafflist() { @@ -510,7 +511,7 @@ export default { unitName: "", serviceMatterList: [], type: "", - contact: "", + principalId: "", contactMobile: "", memberCount: 0, remark: "", //备注【最大500字】 @@ -543,7 +544,7 @@ export default { ], type: [{ required: true, message: "分类不能为空", trigger: "blur" }], - contact: [ + principalId: [ { required: true, message: "联系人不能为空", trigger: "blur" }, ], contactMobile: [ diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue index a9975b7a3..bd2bdf122 100644 --- a/src/views/modules/communityService/gxxq/addForm.vue +++ b/src/views/modules/communityService/gxxq/addForm.vue @@ -339,7 +339,7 @@ export default { { max: 1000, message: "不能超出1000个字符", trigger: "blur" }, ], resiSearchTagId: [ - { required: false, message: "指派人员不能为空", trigger: "bulr" }, + { required: true, message: "指派人员不能为空", trigger: "bulr" }, ], categoryCode: [ { required: true, message: "需求分类不能为空", trigger: "bulr" }, @@ -383,13 +383,6 @@ export default { this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59"; } }, - "formData.assignFlag"(newValue) { - if (newValue === 1) { - this.dataRule.resiSearchTagId[0].required = true; - } else { - this.dataRule.resiSearchTagId[0].required = false; - } - }, }, components: { labelForm }, created() {}, From d4efd8c2711363123ed970eb05850ebbcae4df4b Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 28 May 2024 16:03:14 +0800 Subject: [PATCH 12/36] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9,=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=89=BE=E4=BA=BA=E6=B7=BB=E5=8A=A0=E5=85=AC=E7=9B=8A=E5=B2=97?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityService/fuwuzhaoren/addForm.vue | 9 ++++++++- src/views/modules/communityService/gxxq/index.vue | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityService/fuwuzhaoren/addForm.vue b/src/views/modules/communityService/fuwuzhaoren/addForm.vue index 59fabfb9c..65fbdc9ac 100644 --- a/src/views/modules/communityService/fuwuzhaoren/addForm.vue +++ b/src/views/modules/communityService/fuwuzhaoren/addForm.vue @@ -6,7 +6,7 @@ + size="small" class="u-item-width-normal" @change="handelChangeCategoryCode"> @@ -383,6 +383,13 @@ export default { }, methods: { + handelChangeCategoryCode(val){ + if(val[0] === '1041'){ + this.serviceOptions.push({label:'公益岗',value:'public_welfare_post'}) + }else{ + this.serviceOptions = this.serviceOptions.filter(item=>item.value!='public_welfare_post') + } + }, handelDisabledRules(v) { if (!v) { delete this.dataRule.resiSearchTagId; diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue index 69b3f7c5c..b30a26122 100644 --- a/src/views/modules/communityService/gxxq/index.vue +++ b/src/views/modules/communityService/gxxq/index.vue @@ -146,7 +146,7 @@ /> Date: Wed, 29 May 2024 10:53:06 +0800 Subject: [PATCH 13/36] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index 73102e142..81a001d6e 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -343,9 +343,11 @@ export default { }, handelChangeStaff(val){ if(val){ - this.formData.principalPhone = this.stafflist.filter(item=>item.name === val)[0].mobile + this.formData.principalPhone = this.stafflist.filter(item=>item.name === val)[0].mobile; + this.formData.principalId= this.stafflist.filter(item=>item.name === val)[0].staffId; }else{ - this.formData.principalPhone = '' + this.formData.principalPhone = ''; + this.formData.principalId = null; } }, async getDemandOptions() { From 2975d4a1626289c3d62e1497ef08284ac82fce85 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 30 May 2024 17:48:16 +0800 Subject: [PATCH 14/36] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=AD=BB=E4=BA=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9,?= =?UTF-8?q?=E8=80=81=E5=B9=B4=E4=BA=BA=E5=8A=A0=E4=B8=A4=E4=B8=AA=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/addResi.vue | 11 +++-- src/views/components/editResi.vue | 40 ++++++++++++++----- .../components/resiExpand/editExpand.vue | 7 +++- src/views/components/resiExpand/index.vue | 12 ++---- src/views/components/resiSearch.vue | 10 +++++ .../modules/portrayal/jumin/cpts/staffTag.vue | 13 +++++- src/views/modules/portrayal/jumin/index.vue | 16 ++++++-- 7 files changed, 82 insertions(+), 27 deletions(-) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 3ca535131..6864b6f30 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -577,12 +577,12 @@ export default { ] }, { - id: 'deathDto', + id: 'baseInfoDto', children: [ { label: "死亡时间", itemType: "datepicker1", - formName: "deathTime", + formName: "deathDate", check:'fourFont' }, ] @@ -1346,6 +1346,11 @@ export default { this.form.baseInfoDto.categoryInfo.partyFlag = 2; } if (index != 3 && index) { + if(value === 'deathFlag'){ + this.form.baseInfoDto.deathFlag = event?1:0 + }else{ + this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0; + } this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0; } else if (index == 3) { if (event) { @@ -1366,7 +1371,7 @@ export default { 'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' }, 'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' }, 'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' }, - 'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' }, + 'deathFlag': { formId: 'baseInfoDto', formType: 'baseInfoDto', title: '死亡' }, 'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' }, 'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' }, 'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' }, diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 87a03b93a..cbee5dd61 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -889,7 +889,9 @@ export default { nation: null, //民族 localResidenceFlag: 0, //是否本地户籍 nativePlace: null, //籍贯, - remark: null, //备注 + remark: null, //备注, + deathFlag:0,//死亡 + deathDate:null,//死亡日期 categoryInfo: { partyFlag: 0, subsistenceAllowanceFlag: 0, @@ -1092,14 +1094,14 @@ export default { ], }, { - id: "deathDto", + id: "baseInfoDto", children: [ { label: "死亡时间", itemType: "datepicker1", - formName: "deathTime", + formName: "deathDate", check:'fourFont', - pformName: "deathDto", + pformName: "baseInfoDto", }, ], }, @@ -1514,7 +1516,7 @@ export default { formType: "chronicDiseaseDto", title: "慢病信息", }, - deathFlag: { formId: "deathDto", formType: "deathDto", title: "死亡" }, + deathFlag: { formId: "baseInfoDto", formType: "baseInfoDto", title: "死亡信息" }, oldPeopleFlag: { formId: "oldPeopleDto", formType: "oldPeopleDto", @@ -2172,7 +2174,11 @@ export default { this.form.baseInfoDto.categoryInfo.partyFlag = 2; } if (index != 3 && index) { - this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0; + if(value === 'deathFlag'){ + this.form.baseInfoDto.deathFlag = event?1:0 + }else{ + this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0; + } } else if (index == 3) { if (event) { @@ -2193,7 +2199,7 @@ export default { 'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' }, 'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' }, 'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' }, - 'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' }, + 'deathFlag': { formId: 'baseInfoDto', formType: 'baseInfoDto', title: '死亡' }, 'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' }, 'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' }, 'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' }, @@ -2226,15 +2232,29 @@ export default { }); } }); - delete this.form[this.incidence[value].formType]; + if(value === 'deathFlag'){ + this.form.baseInfoDto.deathFlag = 0; + this.form.baseInfoDto.deathDate = null; + }else{ + delete this.form[this.incidence[value].formType]; + } } }, submitExpandAdd(form, formType) { - this.form[formType] = form[formType]; + if(formType === 'baseInfoDto' ){ + this.form.baseInfoDto.deathDate = form[formType].deathDate; + this.form.baseInfoDto.deathFlag = 1; + }else{ + this.form[formType] = form[formType]; + } this.dialogVisible = false; }, hideExpand(formType) { - delete this.form[formType]; + if(formType!= 'baseInfoDto'){ + delete this.form[formType]; + }else{ + this.form['baseInfoDto'].deathFlag = 0; + } this.dialogVisible = false; }, // 提交扩展信息 diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue index 7a0b2bfcb..a9e705273 100644 --- a/src/views/components/resiExpand/editExpand.vue +++ b/src/views/components/resiExpand/editExpand.vue @@ -182,6 +182,10 @@ export default { volunteerDto: { volunteerCategory: [] }, + // 死亡时间 + baseInfoDto:{ + deathDate:null + } }, casProps: { value: 'id', @@ -227,7 +231,8 @@ export default { }, showForm() { this.$nextTick(() => { - // console.log(this.form,'拓展组件form'); + console.log(this.form,'拓展组件form'); + console.log(this.formList,'拓展组件formList'); const promises = this.formList.forEach((item) => { item.form.map(async (group) => { return group.children.reduce(async (accPromise, item) => { diff --git a/src/views/components/resiExpand/index.vue b/src/views/components/resiExpand/index.vue index 49d949c54..0b401c6d7 100644 --- a/src/views/components/resiExpand/index.vue +++ b/src/views/components/resiExpand/index.vue @@ -121,10 +121,6 @@ export default { chronicDiseaseDto: { chronicDiseaseCodes: [] }, - // 死亡信息 - deathDto: { - deathTime: null - }, // 老年人 oldPeopleDto: { oldPeopleCategories:[], @@ -170,7 +166,9 @@ export default { volunteerDto: { volunteerCategory: [] }, - + baseInfoDto:{ + deathDate:null + } }, casProps: { value: 'id', @@ -249,8 +247,6 @@ export default { console.error('Error fetching options:', error); }); this.getOrgTree() - console.log(this.form, '子组件form'); - console.log(this.formList, '子组件formList'); }) }, async getDictDataForm(url, params) { @@ -278,7 +274,7 @@ export default { if (this.formType === 'add') { this.form.id = this.form.partyOrgId; } - // this.$emit('submitExpand', this.form, this.formType) + this.$emit('submitExpand', this.form, this.formType) }, handlePartyOrgCascadarChange(selectedNode) { this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1]; diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 5a3cc6f04..713380788 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -290,6 +290,16 @@ export default { "label": "失智老人", "value": "DEMENTED_FLAG", "children": null + }, + { + "label": "独居老人", + "value": "LIVE_ALONE_FLAG", + "children": null + }, + { + "label": "普通老年人", + "value": "OLD_PEOPLE_FLAG", + "children": null }, ] }, diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index f8bba504c..b82c7eb7e 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -169,8 +169,17 @@ export default { const updateValue = (flag, dataIndex) => { const { tableData } = this.formData; const valueArray = tableData[dataIndex].value; + if(flag === 'deathFlag'){ + if(this.userInfo.baseInfoDto.deathFlag !== 1){ + this.formData.tableData[dataIndex].value = valueArray.filter(item => item !== flag); + }else{ + valueArray.push(flag) + } + console.log(valueArray,'seee'); + return + } if (this.userInfo.baseInfoDto.categoryInfo[flag] === 1) { - valueArray.push(flag); + valueArray.push(flag,'seeee'); } else { this.formData.tableData[dataIndex].value = valueArray.filter(item => item !== flag); } @@ -181,7 +190,6 @@ export default { this.formData.tableData[0].value = this.userInfo.baseInfoDto.categoryInfo.partyFlag; //添加回填需要在这里加上key与对应的index(在formData.tableData中对应的下标) updateValue('disabilityFlag', 1); - updateValue('deathFlag', 1); updateValue('seriousIllnessFlag', 1); updateValue('chronicDiseaseFlag', 1); updateValue('emptyNesterFlag', 2); @@ -197,6 +205,7 @@ export default { updateValue('buildingChiefFlag', 4); updateValue('unitChiefFlag', 4); updateValue('publicWelfareFlag', 4); + updateValue('deathFlag', 1); }, handeleClickRadio(val) { if (val === 1) { diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 133ec9172..4ff177c54 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -26,7 +26,7 @@ > {{ item.name }} { console.log(err); From 60c50b53bfbfc7eba7e59a57ad647eec6a93f3f6 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 31 May 2024 19:37:09 +0800 Subject: [PATCH 15/36] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E7=BE=A4=E4=BC=97,=E5=8A=A0=E6=B5=81=E5=8A=A8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=B7=9F=E6=96=B0=E9=98=B6=E5=B1=82=E4=BA=BA=E5=A3=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/addResi.vue | 6 +++++- src/views/components/resiSearch.vue | 10 +++++++++- src/views/modules/portrayal/jumin/cpts/staffTag.vue | 9 ++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 6864b6f30..2fa2dc1d3 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -1401,7 +1401,11 @@ export default { this.dialogVisible = false; }, hideExpand(formType) { - delete this.form[formType]; + if(formType!= 'baseInfoDto'){ + delete this.form[formType]; + }else{ + this.form['baseInfoDto'].deathFlag = 0; + } this.dialogVisible = false; }, }, diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 713380788..ca9cd879d 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -328,6 +328,14 @@ export default { "label": "特扶人员", "value": "SPECIAL_SUPPORT_FLAG", "children": null + },{ + "label": "新阶层人士", + "value": "NEW_STRATUM_FLAG", + "children": null + },{ + "label": "流动人员", + "value": "FLOATING_FLAG", + "children": null } ], itemList, @@ -419,7 +427,7 @@ export default { label: "邪教人员", value: "xiejiaorenyuan", children: null - }, + } ], careerStatusList: [], form: { diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index b82c7eb7e..f0a896b1b 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -11,7 +11,7 @@ {{ item.label + style="margin-right: 50px;" :value="item.value">{{ item.label }} @@ -104,6 +104,12 @@ export default { { label: '特扶人员', value: 'specialSupportFlag' + },{ + label: '流动人员', + value: 'floatingFlag' + },{ + label: '新阶层人士', + value: 'newstratumflag' } ] }, @@ -165,6 +171,7 @@ export default { } }, updatedForm() { + this.formData.tableData[0].value = 0; if (this.formType == 'add' || !this.userInfo.baseInfoDto.categoryInfo) return; const updateValue = (flag, dataIndex) => { const { tableData } = this.formData; From a14553808d00a6fc90729c497ed003089818d90b Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sun, 2 Jun 2024 11:54:38 +0800 Subject: [PATCH 16/36] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5,?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC=E5=B1=85=E6=B0=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/addResi.vue | 13 ++-- src/views/components/resiSearch.vue | 11 +++ src/views/modules/base/resi.vue | 73 ++++++------------- src/views/modules/home/index.vue | 2 +- .../modules/portrayal/jumin/cpts/staffTag.vue | 23 ++++-- 5 files changed, 60 insertions(+), 62 deletions(-) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 2fa2dc1d3..76bf83305 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -321,7 +321,7 @@
人员标签
- +
@@ -598,7 +598,6 @@ export default { opctionUrl: 'sys/dict/data/dictlist', opctionParams: { dictType: 'oldPeople_categories' }, opction:[] - }, { label: "居住情况", @@ -1202,10 +1201,12 @@ export default { if (this.form.baseInfoDto.idNum.length === 18 || this.form.baseInfoDto.idNum.length === 15) { const _id = this.form.baseInfoDto.idNum.substr(0, 6) - const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum) - this.form.baseInfoDto.birthday = birth - this.form.baseInfoDto.gender = sex == 1 ? '1' : '2' - this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0 + const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum); + this.form.baseInfoDto.birthday = birth; + this.form.baseInfoDto.gender = sex == 1 ? '1' : '2'; + // this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0; + let obj = {oldPeopleFlag:age >= 60 ? 1 : 0,fertileWomanFlag:this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0} + this.$refs['stafftag'].updatedForm(obj); // this.form.IS_BDHJ = huji == _id ? '1' : '' // 身份证前端验证角色方法 因原型没有注释 // this.validateIdcard(this.form.idNum) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index ca9cd879d..73865aa08 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -427,6 +427,16 @@ export default { label: "邪教人员", value: "xiejiaorenyuan", children: null + }, + { + label: "统战人员", + value: "tongzhanrenyuan", + children: null + }, + { + label: "信访人员", + value: "xinfangrenyaun", + children: null } ], careerStatusList: [], @@ -440,6 +450,7 @@ export default { ageEnd: '', integrityScoreFrom: null,//居民信息完整度はじめ integrityScoreTo: null,//居民信息完整度end + identity:'', gender: '', cultureLevel: '', localResidenceFlag: '', diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 1b5048f7e..d6f8247bb 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -602,48 +602,6 @@ export default { this.$refs.myResiSearch.form.categoryKey = categoryKey; this.$refs.myResiSearch.form.agencyId = agencyId; } - - // if (this.valueb == '党员') { - // _obj.partyFlag = 1 - // this.getTableData(_obj); - // // console.log("this.valueb",this.valueb) - // } if (this.valueb == '残疾人') { - // _obj.healthStatus.push('DISABILITY_FLAG'); - // this.getTableData(_obj); - // } if (this.valueb == '退役军人') { - // _obj.attentionCrowds.push('VETERAN_FLAG'); - // _obj.partyFlag = 1 - // this.getTableData(_obj); - // } - // else { - // // 处理 categoryKey - // if (Array.isArray(categoryKey) && categoryKey.length) { - // _obj.categoryKey = categoryKey.join(","); - // } else { - // _obj.categoryKey = ""; - // } - // // 处理 agencyId - // if (Array.isArray(agencyId) && agencyId.length) { - // _obj.agencyId = agencyId[agencyId.length - 1]; - // } else { - // _obj.agencyId = ""; - // } - // _obj.level = level || ""; - // _obj.orgType = level || ""; - // _obj = { ..._obj, ...this.searchAgencyObj }; - // if (type) { - // this.currentPage = 1; - // } - // console.log("this.valueb", _obj) - // this.getTableData(_obj); - // this.searchForm = _obj; - // // 还原form的值 - // this.$refs.myResiSearch.form.categoryKey = categoryKey; - // this.$refs.myResiSearch.form.agencyId = agencyId; - // } - - - }, // 居民多选是否禁止选中 // checkSelectable (row, index) { @@ -1199,18 +1157,35 @@ export default { this.$refs.myResiSearch.form.healthStatus = []; this.$refs.myResiSearch.form.specialCategoryCodes = []; this.$refs.myResiSearch.form.partyFlag=null; - if (newVal.params.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.params.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.params.category === 'VETERAN_FLAG'|| newVal.params.category === 'ENSURE_HOUSE_FLAG'|| newVal.params.category === 'OLD_PEOPLE_FLAG') { + if (newVal.query.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.query.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.query.category === 'VETERAN_FLAG'|| newVal.query.category === 'ENSURE_HOUSE_FLAG'|| newVal.query.category === 'OLD_PEOPLE_FLAG'|| newVal.query.category === 'FERTILE_WOMAN_FLAG' || newVal.query.category === 'FLOATING_FLAG' || newVal.query.category === 'NEW_STRATUM_FLAG') { this.$refs.myResiSearch.form.attentionCrowds.push( - newVal.params.category + newVal.query.category ); - } else if(newVal.params.category === 'CHRONIC_DISEASE_FLAG' ||newVal.params.category === 'SERIOUS_ILLNESS_FLAG'||newVal.params.category === 'DISABILITY_FLAG'){ + } else if(newVal.query.category === 'CHRONIC_DISEASE_FLAG' ||newVal.query.category === 'SERIOUS_ILLNESS_FLAG'||newVal.query.category === 'DISABILITY_FLAG'){ this.$refs.myResiSearch.form.healthStatus.push( - newVal.params.category + newVal.query.category ); - }else if(newVal.params.category === 'SPECIAL_CROWD_FLAG'){ - this.$refs.myResiSearch.form.specialCategoryCodes = ["anzhibangjiao","shequjiaozheng","xidurenyuan","buliangqingshaonian","zhaoshizhaohuojingshenbing","xiejiaorenyuan"]; - }else if(newVal.params.category === 'PARTY_FLAG'){ + }else if(newVal.query.category === 'SQJZ_FLAG' || newVal.query.category === 'AZBJ_FLAG' || newVal.query.category === 'DRUG_FLAG' || newVal.query.category === 'XJRY_FLAG' || newVal.query.category === 'ZSZHJSB_FLAG' || newVal.query.category === 'UNITED_FRONT_FLAG'|| newVal.query.category === 'PETITION_OFFICER_FLAG' || newVal.query.category === 'BLQSN_FLAG'){ + let obj = { + SQJZ_FLAG:'shequjiaozheng', + AZBJ_FLAG:'anzhibangjiao', + DRUG_FLAG:'xidurenyuan', + XJRY_FLAG:'xiejiaorenyuan', + ZSZHJSB_FLAG:'zhaoshizhaohuojingshenbing', + UNITED_FRONT_FLAG:'tongzhanrenyuan', + PETITION_OFFICER_FLAG:'xinfangrenyaun', + BLQSN_FLAG:'buliangqingshaonian' + } + this.$refs.myResiSearch.form.specialCategoryCodes = [obj[newVal.query.category]]; + }else if(newVal.query.category === 'PARTY_FLAG'){ this.$refs.myResiSearch.form.partyFlag =1; + }else if(newVal.query.category === 'BUILDING_CHIEF_FLAG' || newVal.query.category === 'VOLUNTEER_FLAG' || newVal.query.category === 'UNIT_CHIEF_FLAG' || newVal.query.category ==='PUBLIC_WELFARE_FLAG'){ + console.log(newVal.query.category); + this.$refs.myResiSearch.form.identity = newVal.query.category; + }else if(newVal.query.category === 'MASS_FLAG'){ + this.$refs.myResiSearch.form.partyFlag = 0; + }else if(newVal.query.category === 'LEAGUE_FLAG'){ + this.$refs.myResiSearch.form.partyFlag = 2; } this.handleSearchFrom(); }); diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 844f56cc4..58b95ff24 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -630,7 +630,7 @@ export default { handelClickToResi(e){ this.$router.push({ name: "base-resi", - params: { + query: { category: e.residentCategory || null, }, }); diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index f0a896b1b..14dc06c46 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -69,10 +69,10 @@ export default { label: '慢病', value: 'chronicDiseaseFlag' }, - { - label: '死亡', - value: 'deathFlag' - } + // { + // label: '死亡', + // value: 'deathFlag' + // } ] }, { @@ -109,7 +109,7 @@ export default { value: 'floatingFlag' },{ label: '新阶层人士', - value: 'newstratumflag' + value: 'newStratumFlag' } ] }, @@ -170,8 +170,17 @@ export default { console.log(error); } }, - updatedForm() { + updatedForm(val) { this.formData.tableData[0].value = 0; + if(val){ + for (let key in val) { + if (val[key] === 1) { + this.formData.tableData[2].value.push(key); + }else{ + this.formData.tableData[2].value = this.formData.tableData[2].value.filter(item => item !== key); + } + } + } if (this.formType == 'add' || !this.userInfo.baseInfoDto.categoryInfo) return; const updateValue = (flag, dataIndex) => { const { tableData } = this.formData; @@ -208,6 +217,8 @@ export default { updateValue('specialSupportFlag', 2); updateValue('fertileWomanFlag', 2); updateValue('bereavedPersonFlag', 2); + updateValue('floatingFlag', 2); + updateValue('newstratumflag', 2); updateValue('volunteerFlag', 4); updateValue('buildingChiefFlag', 4); updateValue('unitChiefFlag', 4); From cee14dce9b98c60ccacc13fdd12f8f7f62fda53f Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sun, 2 Jun 2024 12:04:09 +0800 Subject: [PATCH 17/36] =?UTF-8?q?=E8=80=81=E5=B9=B4=E4=BA=BA=E5=9B=9E?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/addResi.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 76bf83305..319f6f05f 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -475,6 +475,11 @@ export default { }, economyDto: { monthIncome: null,//月收入 + }, + oldPeopleDto:{ + oldPeopleCategories:[], + resideSituation: null, + oldSubsidy:null } }, footerInputList: [ @@ -1207,6 +1212,7 @@ export default { // this.form.baseInfoDto.categoryInfo.oldPeopleFlag = age >= 60 ? 1 : 0; let obj = {oldPeopleFlag:age >= 60 ? 1 : 0,fertileWomanFlag:this.form.baseInfoDto.gender == 2 && (age >= 18 && age < 49)? 1 : 0} this.$refs['stafftag'].updatedForm(obj); + this.form.oldPeopleDto.oldPeopleCategories = ['oldPeopleFlag']; // this.form.IS_BDHJ = huji == _id ? '1' : '' // 身份证前端验证角色方法 因原型没有注释 // this.validateIdcard(this.form.idNum) From d2ce02f2963f2bc130720af69fe2d996350e7521 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sun, 2 Jun 2024 14:38:34 +0800 Subject: [PATCH 18/36] =?UTF-8?q?=E6=96=B0=E9=98=B6=E5=B1=82=E4=BA=BA?= =?UTF-8?q?=E5=A3=AB=E7=BC=96=E8=BE=91=E6=9C=AA=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/portrayal/jumin/cpts/staffTag.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index 14dc06c46..afa79fd9e 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -191,11 +191,10 @@ export default { }else{ valueArray.push(flag) } - console.log(valueArray,'seee'); return } if (this.userInfo.baseInfoDto.categoryInfo[flag] === 1) { - valueArray.push(flag,'seeee'); + valueArray.push(flag); } else { this.formData.tableData[dataIndex].value = valueArray.filter(item => item !== flag); } @@ -218,7 +217,7 @@ export default { updateValue('fertileWomanFlag', 2); updateValue('bereavedPersonFlag', 2); updateValue('floatingFlag', 2); - updateValue('newstratumflag', 2); + updateValue('newStratumFlag', 2); updateValue('volunteerFlag', 4); updateValue('buildingChiefFlag', 4); updateValue('unitChiefFlag', 4); From d4fba6e5815d1b525e485e523ec6b830c33d95af Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 3 Jun 2024 09:39:55 +0800 Subject: [PATCH 19/36] 1 --- src/views/modules/portrayal/jumin/cpts/staffTag.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index afa79fd9e..233630906 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -69,10 +69,10 @@ export default { label: '慢病', value: 'chronicDiseaseFlag' }, - // { - // label: '死亡', - // value: 'deathFlag' - // } + { + label: '死亡', + value: 'deathFlag' + } ] }, { From 1e05f1fb9744d79bf641f83b061034e6c691e843 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 3 Jun 2024 15:12:07 +0800 Subject: [PATCH 20/36] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/roomForm.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index f1b0ea9ad..874e3c52d 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -524,9 +524,9 @@ export default { doorName: [ { required: true, message: '门牌号不能为空', trigger: 'blur' } ], - coding: [ - { required: true, message: '房屋编码不能为空', trigger: 'blur' } - ], + // coding: [ + // { required: true, message: '房屋编码不能为空', trigger: 'blur' } + // ], houseType: [ { required: true, message: '房屋类型不能为空', trigger: 'blur' } ], From d9ca83327f205e69c920a845188fb104c0d4a591 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 3 Jun 2024 15:40:04 +0800 Subject: [PATCH 21/36] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=BF=9B=E5=88=B0=E5=B1=85=E6=B0=91=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=90=8E=E6=B2=A1=E6=9C=89=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/addResi.vue | 112 +++++++++++++++++++++++-------- 1 file changed, 83 insertions(+), 29 deletions(-) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 319f6f05f..e509c3346 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -338,6 +338,18 @@ + + + + + + +
+ 取 消 + 确 定 +
+ @@ -364,20 +376,35 @@ import resiExpand from "./resiExpand"; export default { data() { return { - dialogVisible: false, - dialogTitle: "", - formList: [], - - orgOptions: [], - orgOptionProps: { - value: 'agencyId', - label: 'agencyName', - children: 'subAgencyList', - emitPath: false, - multiple: false, - checkStrictly: true - }, - form: { + resiId:null, + showCheckPassword:false, + checkPasswordFrom: { + password: "", + }, + checkPasswordRulse: { + password: [ + { required: true, message: "请输入密码", trigger: "blur" }, + { + min: 6, + max: 18, + message: "长度在 6 到 18 个字符", + trigger: "blur", + }, + ], + }, + dialogVisible: false, + dialogTitle: "", + formList: [], + orgOptions: [], + orgOptionProps: { + value: 'agencyId', + label: 'agencyName', + children: 'subAgencyList', + emitPath: false, + multiple: false, + checkStrictly: true + }, + form: { baseInfoDto: { name: null,//姓名 idType: null,//证件类型 @@ -481,8 +508,8 @@ export default { resideSituation: null, oldSubsidy:null } - }, - footerInputList: [ + }, + footerInputList: [ { id: 'healthDto', children: [ @@ -911,14 +938,13 @@ export default { ] }, - ], - - idTypeList, - genderList, - hasOptions, - disabilityFlagList, - btnLoading: false, - rules: { + ], + idTypeList, + genderList, + hasOptions, + disabilityFlagList, + btnLoading: false, + rules: { "baseInfoDto.name": [ { required: true, message: "请输入姓名", trigger: "blur" }, ], @@ -934,8 +960,8 @@ export default { "baseInfoDto.nationality": [ { required: true, message: "请选择国籍", trigger: "blur" }, ], - }, - dicts: { + }, + dicts: { educationList: [], //文化程度 nationList: [], //民族 nationalityList: [], //国籍 @@ -956,8 +982,8 @@ export default { value: 1, }, ], - }, - logLevelChecked: 0, + }, + logLevelChecked: 0, }; }, created() { @@ -967,6 +993,33 @@ export default { this.initHouseBind(); }, methods: { + handelClickCheckPassword() { + this.$refs.checkPasswordFrom.validate((vali) => { + if (vali) { + this.saveCheckPassword(this.checkPasswordFrom.password); + } else { + return false; + } + }); + }, + async saveCheckPassword(password){ + const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`; + let parm = { + password, + }; + const { data, code, msg } = await requestPost(url, parm); + if (code === 0) { + this.showCheckPassword = false; + this.$router.push({ + name: "edit-resi", + query: { id: this.resiId }, + params: { idNum: data.idNum, mobile: data.mobile, name: data.name, nationality: data.nationality }, + }); + this.checkPasswordFrom.password = ""; + } else { + this.$message.error(msg); + } + }, // 从房屋画像进行添加居民时绑定房屋信息 initHouseBind() { for (let i in this.form.resideInfoDtos) { @@ -1234,7 +1287,8 @@ export default { cancelButtonText: '继续填写', type: 'warning' }).then(() => { - this.$router.push({ name: 'edit-resi', query: { id: data.id }, params: { idNum: data.idNum, mobile: data.mobile } }); + this.resiId = data.id + this.showCheckPassword = true; }).catch(() => { From 32ad2bd9b01943db8e31046007ce6855b5d08129 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 3 Jun 2024 16:48:07 +0800 Subject: [PATCH 22/36] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B5=81=E5=8A=A8?= =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E5=B8=B8=E4=BD=8F=E4=BA=BA=E5=8F=A3=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/resi.vue | 2 +- src/views/modules/home/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index d6f8247bb..9187f721d 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1157,7 +1157,7 @@ export default { this.$refs.myResiSearch.form.healthStatus = []; this.$refs.myResiSearch.form.specialCategoryCodes = []; this.$refs.myResiSearch.form.partyFlag=null; - if (newVal.query.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.query.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.query.category === 'VETERAN_FLAG'|| newVal.query.category === 'ENSURE_HOUSE_FLAG'|| newVal.query.category === 'OLD_PEOPLE_FLAG'|| newVal.query.category === 'FERTILE_WOMAN_FLAG' || newVal.query.category === 'FLOATING_FLAG' || newVal.query.category === 'NEW_STRATUM_FLAG') { + if (newVal.query.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.query.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.query.category === 'VETERAN_FLAG'|| newVal.query.category === 'ENSURE_HOUSE_FLAG'|| newVal.query.category === 'OLD_PEOPLE_FLAG'|| newVal.query.category === 'FERTILE_WOMAN_FLAG' || newVal.query.category === 'FLOATING_FLAG' || newVal.query.category === 'NEW_STRATUM_FLAG' || newVal.query.category === 'permanentFlag') { this.$refs.myResiSearch.form.attentionCrowds.push( newVal.query.category ); diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 58b95ff24..c04163e03 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -39,14 +39,14 @@
-
+
{{ pandectData.permanentResiCount }}
常住人口
-
+
{{ pandectData.floatingResiCount }}
流动人口 From cd931a84bce71a0eade058e474bce9a60c18e490 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 4 Jun 2024 14:04:44 +0800 Subject: [PATCH 23/36] =?UTF-8?q?=E8=B0=83=E5=87=86=E5=A4=B1=E4=B8=9A?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/resi.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 9187f721d..ab858b3e8 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1186,6 +1186,8 @@ export default { this.$refs.myResiSearch.form.partyFlag = 0; }else if(newVal.query.category === 'LEAGUE_FLAG'){ this.$refs.myResiSearch.form.partyFlag = 2; + } else if(newVal.query.category === 'UNEMPLOYED_FLAG'){ + this.$refs.myResiSearch.form.careerStatus = '0'; } this.handleSearchFrom(); }); From 7c31072efeee1f1e7f64e624ff6a18b6b6c62a44 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 4 Jun 2024 14:54:37 +0800 Subject: [PATCH 24/36] =?UTF-8?q?=E5=B1=85=E4=BD=8F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E4=B8=AD?= 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 insertion(+) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index cbee5dd61..734f4bcbc 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -1126,6 +1126,7 @@ export default { opctionUrl: "sys/dict/data/dictlist", opctionParams: { dictType: "reside_situation" }, pformName: "oldPeopleDto", + opction:[] }, { label: "高龄补助", From f23898a2995787dd3d0ce71f83dfc5363b061076 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 4 Jun 2024 15:00:01 +0800 Subject: [PATCH 25/36] 1 --- src/views/components/addResi.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index e509c3346..6d21395eb 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -638,6 +638,7 @@ export default { formName: "resideSituation", opctionUrl: 'sys/dict/data/dictlist', opctionParams: { dictType: 'reside_situation' }, + opction:[] }, { label: "高龄补助", From 5388d26799d66f0b1b130eadadc59379927f2ec7 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 4 Jun 2024 15:05:43 +0800 Subject: [PATCH 26/36] =?UTF-8?q?=E4=BD=8E=E4=BF=9D=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=97=A0=E6=B3=95=E9=80=89=E4=B8=AD=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/addResi.vue | 1 + src/views/components/editResi.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 6d21395eb..df728cc9a 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -658,6 +658,7 @@ export default { formName: "category", opctionUrl: 'sys/dict/data/dictlist', opctionParams: { dictType: 'subsistence_allowance_category' }, + opction:[] }, { label: "低保享受原因", diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 734f4bcbc..686022b41 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -1148,6 +1148,7 @@ export default { opctionUrl: "sys/dict/data/dictlist", opctionParams: { dictType: "subsistence_allowance_category" }, pformName: "subsistenceAllowanceDto", + opction: [], }, { label: "低保享受原因", From 3a09fb29a6bb50e8d35fc48e85a316c980d95c01 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 4 Jun 2024 18:21:29 +0800 Subject: [PATCH 27/36] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=80=81=E5=B9=B4?= =?UTF-8?q?=E4=BA=BA=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/resiExpand/editExpand.vue | 49 ++++++++++++++++++- src/views/components/resiExpand/index.vue | 35 +++++++++++-- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue index a9e705273..16f4d5ab4 100644 --- a/src/views/components/resiExpand/editExpand.vue +++ b/src/views/components/resiExpand/editExpand.vue @@ -19,7 +19,7 @@ @@ -211,11 +211,56 @@ export default { }, methods: { handleFormChange(pid,id,type){ + console.log(pid,id,type,'拓展组件'); + console.log(this.formList); this.changPid = pid; this.changId = id; this.changType = type; nextTick(1000) this.$emit('submitExpand', this.form,{changId:this.changId,changPid:this.changPid,changType:this.changType}) + // let index = this.formList.findIndex(item=>item.formId === "oldPeopleDto") + if (pid === 'oldPeopleDto' && id === 'oldPeopleCategories') { + this.formList.forEach((item,index) => { + item.form[0].children.forEach(async (itemC,indexC) => { + if (itemC.formName === "oldPeopleCategories") { + await nextTick(500) + if (itemC.value.findIndex(itemK => itemK === "liveAloneFlag") != -1) { + itemC.opction.forEach(itemJ => { + if (itemJ.value === "emptyNesterFlag") { + itemJ.disabled = true; + this.form[pid].resideSituation = 'duju' + item.form[0].children[1].disabled = true; + this.$forceUpdate() + } else { + itemJ.disabled = false; + this.$forceUpdate() + } + }) + } else if (itemC.value.findIndex(itemK => itemK === "emptyNesterFlag") != -1) { + itemC.opction.forEach(itemJ => { + if (itemJ.value === "liveAloneFlag") { + itemJ.disabled = true; + this.form[pid].resideSituation = 'kongchao' + item.form[0].children[1].disabled = true; + this.$forceUpdate() + + } else { + itemJ.disabled = false; + this.$forceUpdate() + } + }) + } else { + this.form[pid].resideSituation = 'duju' + item.form[0].children[1].disabled = false; + itemC.opction.forEach(itemJ => { + itemJ.disabled = false; + }) + this.$forceUpdate() + } + } + }) + }) + } }, checkNumberInput(itemj, itemk) { if (this.form[itemj][itemk]) { diff --git a/src/views/components/resiExpand/index.vue b/src/views/components/resiExpand/index.vue index 0b401c6d7..4e0cb5b38 100644 --- a/src/views/components/resiExpand/index.vue +++ b/src/views/components/resiExpand/index.vue @@ -17,9 +17,9 @@ + class="list_item_width_1" @change="handelChangeSelsect(itemj.id,itemk.formName)" :disabled="itemk.disabled"> + :value="items.value" > @@ -43,10 +43,10 @@ 元 - -