From 12146fb2e0971ba6041a04249663b8a4bd9855a0 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 6 Jul 2022 10:15:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BF=81=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/change/verifyForm.vue | 93 ++++++++++++++----- 1 file changed, 70 insertions(+), 23 deletions(-) diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue index 99c19afe..fb9151e9 100644 --- a/src/views/modules/plugins/change/verifyForm.vue +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -34,7 +34,7 @@ {{ detailInfo.villageName + detailInfo.buildName + detailInfo.unitName + detailInfo.homeName }} - + - {{ detailInfo.moveOutDate }} - + --> 当前人员已不在该房屋 + + + 需要 + 不需要 + + --> - + + + + + + {{ detailInfo.moveOutDate }} + + + + + - 其他 - + --> -
+
-
+ { this.loadingForm = false @@ -500,9 +539,9 @@ export default { async getAgencylist() { const url = '/gov/org/customeragency/rootagencygridtree' - + const { agencyId } = this.$store.state.user const params = { - agencyId: this.rootAgency.id + agencyId: agencyId } const { data, code, msg } = await requestPost(url, params) if (code === 0) { @@ -663,6 +702,10 @@ export default { setTimeout(() => { this.btnDisable = false }, 2000) + if (this.isMoveOut == 0) { + this.saveForm() + return + } this.$refs['ref_form'].validate((valid, messageObj) => { if (!valid) { // app.util.validateRule(messageObj) @@ -690,6 +733,7 @@ export default { let params = { id: this.detailInfo.id, confirmResult: this.confirmResult, + isMoveOut: this.isMoveOut, reason: this.reason } if (this.confirmResult == 1 && this.detailInfo.isInHome) { @@ -715,12 +759,15 @@ export default { } }, async saveForm() { - const url = '/epmetuser/changeRelocation/moveOutHome' + const url = '/epmetuser/changeRelocation/moveOutHomeConfirm' let noData = new Date() noData = util.dateFormatter(noData, 'time') this.dataForm.transferTime = noData - - const { data, code, msg } = await requestPost(url, this.dataForm) + const _data = { + ...this.dataForm, + isMoveOut: this.isMoveOut + } + const { data, code, msg } = await requestPost(url, _data) if (code === 0) { // this.$message.success('调动成功') From 601e7a0a94be4f32e6e7995304acb5f5071d3944 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 6 Jul 2022 15:07:26 +0800 Subject: [PATCH 2/6] dd --- src/views/modules/plugins/change/verifyForm.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue index fb9151e9..3b333e2d 100644 --- a/src/views/modules/plugins/change/verifyForm.vue +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -744,7 +744,8 @@ export default { buildName: this.dataForm.buildName, unitName: this.dataForm.unitName, homeName: this.dataForm.homeName, - xxdz: this.dataForm.address + xxdz: this.dataForm.address, + moveOutDate: this.dataForm.outOfTime } } From 08e7d9f9ec3d2ccac15a75a83a2906b1c2bcb4c2 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 7 Jul 2022 09:41:47 +0800 Subject: [PATCH 3/6] dd --- src/views/modules/plugins/change/verifyForm.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue index 3b333e2d..ffdb5df0 100644 --- a/src/views/modules/plugins/change/verifyForm.vue +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -95,7 +95,7 @@ class="item_width_1" > - + From 512c6eb87956cfc341f3dbe0297dcea9339fa911 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 7 Jul 2022 16:19:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/collect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index bd19c5e0..3d6cdb81 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -110,7 +110,7 @@ prop="houseType" align="center" width="100" - label="自有/租住" + label="房屋状态" > @@ -447,6 +450,10 @@ export default { console.log('searchH----', this.$refs.searchCard.$el.offsetHeight) }, methods: { + filterEdit (id) { + const { user } = this.$store.state + return id === user.agencyId + }, handleClearVillage() { this.fmData.buildId = '' this.fmData.homeId = '' diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue index ffdb5df0..1efb046a 100644 --- a/src/views/modules/plugins/change/verifyForm.vue +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -85,7 +85,7 @@ { required: true, message: '请选择审核结果', trigger: 'blur' }, ]" > - + Date: Thu, 7 Jul 2022 17:24:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/epidemic/veroFocus/veroFocusList.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue index 5dd83f00..603f42a0 100644 --- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue +++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue @@ -756,14 +756,14 @@ export default { async deleteFocus (row) { const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" - let idCards = []; + let ids = []; this.selectionAll.forEach((element) => { - idCards.push(element.idCard); + ids.push(element.id); }); let params = { attentionType: 1, - idCards: idCards, + ids: ids, }; const { data, code, msg } = await requestPost(url, params);