From 3bb707bec82ee6104527e217ce9e720b8d288c78 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 11 May 2022 16:42:25 +0800 Subject: [PATCH 1/2] 666 --- .../modules/base/huji/chusheng/cpts/edit.vue | 79 ++++++++++++++----- 1 file changed, 61 insertions(+), 18 deletions(-) diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue index 96c2ecdc..4ad5714a 100644 --- a/src/views/modules/base/huji/chusheng/cpts/edit.vue +++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue @@ -22,6 +22,7 @@ clearable class="resi-cell-select" @change="handleChangeGrid" + :disabled="formType === 'edit'" style="width: 250px" > @@ -79,7 +81,7 @@ - 享受福利 补充居民信息 @@ -157,6 +165,7 @@ show-word-limit placeholder="请输入手机号 " v-model="fmData.mobile" + :disabled="formType === 'edit'" > @@ -172,6 +181,7 @@ placeholder="请输入身份证号" v-model="fmData.idCard" @blur="handleBlurId" + :disabled="formType === 'edit'" > @@ -188,6 +198,7 @@ clearable style="width: 120px" class="resi-cell-select" + :disabled="formType === 'edit'" > @@ -386,6 +398,7 @@ function iniFmData() { idCard: "", isWelfare: "0", //福利0否，1是 isCheck: "0", + isReplace: "0", gender: "", birthplace: "", father: "", @@ -410,6 +423,7 @@ export default { optionsH: [], optionsD: [], optionsG: [], + optionsRelation: [], optionsGender: [ { value: "1", @@ -420,9 +434,9 @@ export default { label: "女", }, ], - optionsRelation: [], fmData: iniFmData(), + checkResult: {}, }; }, components: {}, @@ -490,6 +504,7 @@ export default { } ); if (code === 0) { + this.checkResult = data; if (!data.moveInstatus) { this.$message({ type: "error", @@ -566,11 +581,10 @@ export default { return this.$message.error(res.msg); } else { console.log("获取查询详情成功", res.data); - this.optionsRelation = res.data; + if (res.data) { + this.optionsRelation = res.data; + } } - }) - .catch(() => { - return this.$message.error("网络错误"); }); }, @@ -682,9 +696,6 @@ export default { this.alreadyHaveMaster = false; } } - }) - .catch(() => { - return this.$message.error("网络错误"); }); }, @@ -696,14 +707,18 @@ export default { if (row) { // this.fmData = { ...this.fmData, ...row }; this.getInfo(row.id); + this.getValiheList(); + this.getBuildList(); + this.getUniList(); + this.getHouseList(); } }, async getInfo(id) { const { data, code, msg } = await requestPost( - "/epmetuser/icBirthRecord", + "/epmetuser/icBirthRecord/" + id, { - id, + // id, } ); if (code === 0) { @@ -738,13 +753,37 @@ export default { let url = ""; if (this.formType === "add") { url = "/epmetuser/icBirthRecord/save"; - } else { + } else if (this.formType === "edit") { url = "/epmetuser/icBirthRecord/update"; + } else { + return; + } - this.fmData.orgId = this.orgId; + const { fmData, checkResult } = this; + if ( + fmData.isCheck == "1" && + checkResult.resiHomeId != fmData.homeId && + checkResult.status == "0" + ) { + await this.$confirm( + "居民信息中房屋信息与当前选择房屋不一致，是否更新？", + "提示", + { + confirmButtonText: "更新", + cancelButtonText: "不更新", + type: "warning", + center: true, + } + ) + .then(() => { + this.fmData.isReplace = "1"; + }) + .catch(() => { + this.fmData.isReplace = "0"; + }); } - const { data, code, msg } = await requestPost(url, this.fmData); + const { data, code, msg } = await requestPost(url, fmData); if (code === 0) { this.$message({ @@ -765,7 +804,11 @@ export default { this.$emit("dialogCancle"); }, resetData() { - this.orgId = ""; + this.checkResult = {}; + this.optionsB = []; + this.optionsH = []; + this.optionsD = []; + this.optionsRelation = []; this.fmData = iniFmData(); }, // 开启加载动画 From 5628026ac6876a79a2d67424955416d6d0465a85 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 11 May 2022 16:50:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E6=88=B7=E4=B8=80=E6=A1=A3?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=98=B2=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/buildTable.vue | 7 ++++++- src/views/modules/base/community/communityTable.vue | 7 ++++++- src/views/modules/base/community/roomTable.vue | 8 +++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 125a8feb..3fe03ac3 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -55,6 +55,7 @@ 导出一户一档 @@ -227,6 +228,8 @@ export default { formShow: false, formTitle: '新增楼栋', + yihuyidangDisabled: false, + } }, components: { @@ -588,6 +591,7 @@ export default { //导出一户一档 handleExportYihuyidang () { + this.yihuyidangDisabled = true let title = this.agencyObj.label title = title + '-一户一档' let url = "/gov/org/house/exportHouseUser" @@ -604,16 +608,17 @@ export default { } - app.ajax.exportFilePost( url, params, (data, rspMsg) => { this.download(data, title + '.xls') + this.yihuyidangDisabled = false }, (rspMsg, data) => { this.$message.error(rspMsg); + this.yihuyidangDisabled = false } ); }, diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 11aaf2be..5eb4596f 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -79,6 +79,7 @@ 导出一户一档 @@ -222,7 +223,8 @@ export default { files: "", fileName: "", - uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import' + uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import', + yihuyidangDisabled: false, } }, @@ -569,6 +571,7 @@ export default { //导出一户一档 handleExportYihuyidang () { + this.yihuyidangDisabled = true let title = this.agencyObj.label title = title + '-一户一档' let url = "/gov/org/house/exportHouseUser" @@ -596,8 +599,10 @@ export default { (data, rspMsg) => { this.download(data, title + '.xls') + this.yihuyidangDisabled = false }, (rspMsg, data) => { + this.yihuyidangDisabled = false this.$message.error(rspMsg); } ); diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 5f4c75f0..a3b8a17a 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -38,6 +38,7 @@ 导出一户一档 @@ -235,7 +236,9 @@ export default { value: '0', label: '自住' }, - ] + ], + + yihuyidangDisabled: false, } @@ -609,6 +612,7 @@ export default { //导出一户一档 handleExportYihuyidang () { + this.yihuyidangDisabled = true let title = this.agencyObj.label title = title + '-一户一档' let url = "/gov/org/house/exportHouseUser" @@ -631,9 +635,11 @@ export default { (data, rspMsg) => { this.download(data, title + '.xls') + this.yihuyidangDisabled = false }, (rspMsg, data) => { this.$message.error(rspMsg); + this.yihuyidangDisabled = false } ); },