From 1f8717c4229b5acdf0d5b3e68a4e7f13605d37e6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 10 May 2022 13:57:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E3=80=82=E8=BF=81?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=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/resiChangeTransfer.vue | 42 +++++++++---------- .../modules/plugins/change/resideath.vue | 2 +- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index 2dcf979f6..d2ba1279e 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -505,7 +505,7 @@ export default { }, async saveForm () { - const url = '/pli/power/changeRelocation/saveOutOfInfo' + const url = '/epmetuser/changeRelocation/saveOutOfInfo' let noData = new Date() noData = util.dateFormatter(noData, 'time') this.dataForm.transferTime = noData @@ -513,31 +513,29 @@ export default { const { data, code, msg } = await requestPost(url, this.dataForm) if (code === 0) { - // this.$message.success('调动成功') - // 调用之前接口 - this.saveFormOld() - // this.handleCancle() + this.$message.success('调动成功') + this.handleCancle() } else { this.$message.error(msg) } }, - async saveFormOld () { - const url = '/epmetuser/icusertransferrecord/add' - let noData = new Date() - noData = util.dateFormatter(noData, 'time') - this.dataForm.transferTime = noData - - console.log('-----------3--------------') - console.log(this.dataForm) - const { data, code, msg } = await requestPost(url, this.dataForm) - - if (code === 0) { - this.$message.success('调动成功') - this.handleCancle() - } else { - this.$message.error(msg) - } - }, + // async saveForm () { + // const url = '/epmetuser/icusertransferrecord/add' + // let noData = new Date() + // noData = util.dateFormatter(noData, 'time') + // this.dataForm.transferTime = noData + // + // console.log('-----------3--------------') + // console.log(this.dataForm) + // const { data, code, msg } = await requestPost(url, this.dataForm) + // + // if (code === 0) { + // this.$message.success('调动成功') + // this.handleCancle() + // } else { + // this.$message.error(msg) + // } + // }, handleCancle () { this.resetData() diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue index 5e94f2c51..06b0f2749 100644 --- a/src/views/modules/plugins/change/resideath.vue +++ b/src/views/modules/plugins/change/resideath.vue @@ -429,7 +429,7 @@ export default { joinReason: this.blacklistReason, welfareFlag: this.welfareFlag } - this.$http.post('/pli/power/rentDeath/save', params).then(({ data: res }) => { + this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } From 0c1b1c87f9f52528095865b97488553e296719e1 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 10 May 2022 15:03:16 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E3=80=82=E8=BF=81?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=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/modules/plugins/change/changedeath.vue | 6 +++--- .../plugins/change/changerelocation-add-or-update.vue | 4 ++-- src/views/modules/plugins/change/changerelocation.vue | 6 +++--- src/views/modules/plugins/change/changewelfare.vue | 6 +++--- src/views/modules/plugins/change/resichange.vue | 2 +- src/views/modules/plugins/change/resiwelfare.vue | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 69475b29c..33161588c 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -129,11 +129,11 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/pli/power/rentDeath/page', + getDataListURL: '/epmetuser/rentDeath/page', getDataListIsPage: true, - deleteURL: '/pli/power/rentDeath', + deleteURL: '/epmetuser/rentDeath', deleteIsBatch: true, - exportURL: '/pli/power/rentDeath/export' + exportURL: '/epmetuser/rentDeath/export' }, timeRange: '', dataForm: { diff --git a/src/views/modules/plugins/change/changerelocation-add-or-update.vue b/src/views/modules/plugins/change/changerelocation-add-or-update.vue index 24b9960fd..a4eccfc45 100644 --- a/src/views/modules/plugins/change/changerelocation-add-or-update.vue +++ b/src/views/modules/plugins/change/changerelocation-add-or-update.vue @@ -234,7 +234,7 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/pli/power/changeRelocation/${this.dataForm.id}`).then(({ data: res }) => { + this.$http.get(`/epmetuser/changeRelocation/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -250,7 +250,7 @@ export default { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/changeRelocation/', this.dataForm).then(({ data: res }) => { + this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/changeRelocation/', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index b61364234..b5fc3f4e3 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/src/views/modules/plugins/change/changerelocation.vue @@ -202,11 +202,11 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/pli/power/changeRelocation/page', + getDataListURL: '/epmetuser/changeRelocation/page', getDataListIsPage: true, - deleteURL: '/pli/power/changeRelocation', + deleteURL: '/epmetuser/changeRelocation', deleteIsBatch: true, - exportURL: '/pli/power/changeRelocation/export' + exportURL: '/epmetuser/changeRelocation/export' }, timeRange: '', optionsV: [], diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue index cff0f4db2..223f0b895 100644 --- a/src/views/modules/plugins/change/changewelfare.vue +++ b/src/views/modules/plugins/change/changewelfare.vue @@ -130,9 +130,9 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/pli/power/changeWelfare/page', + getDataListURL: '/epmetuser/changeWelfare/page', getDataListIsPage: true, - deleteURL: '/pli/power/changeWelfare', + deleteURL: '/epmetuser/changeWelfare', deleteIsBatch: true }, dataForm: { @@ -206,7 +206,7 @@ export default { id: this.rowData.id, removeReason: this.removeReason } - this.$http.post('/pli/power/changeWelfare/removeWelfare', params).then(({ data: res }) => { + this.$http.post('/epmetuser/changeWelfare/removeWelfare', params).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue index 1e813d7dd..ca71ae96b 100644 --- a/src/views/modules/plugins/change/resichange.vue +++ b/src/views/modules/plugins/change/resichange.vue @@ -432,7 +432,7 @@ export default { } console.log('----------8----------') console.log(params) - this.$http.post('/pli/power/rentDeath/save', params).then(({ data: res }) => { + this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue index b0d7ca1a9..213494223 100644 --- a/src/views/modules/plugins/change/resiwelfare.vue +++ b/src/views/modules/plugins/change/resiwelfare.vue @@ -426,7 +426,7 @@ export default { userId: this.rowData.icResiUserId, joinReason: this.blacklistReason } - this.$http.post('/pli/power/changeWelfare/save', params).then(({ data: res }) => { + this.$http.post('/epmetuser/changeWelfare/save', params).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } From 6070d491d601bb21a3ee82485ff72520427c1dc6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 11 May 2022 09:13:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=81=E5=87=BA=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiChangeTransfer.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index d2ba1279e..d9a898166 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -13,6 +13,12 @@ {{ gridName }} + + {{ dataForm.ownerName }} + + Date: Wed, 11 May 2022 09:41:01 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=BB=E4=BA=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/change/changedeath.vue | 2 +- src/views/modules/plugins/change/resideath.vue | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 33161588c..965084d62 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -85,7 +85,7 @@ - + diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue index 06b0f2749..b859d42fe 100644 --- a/src/views/modules/plugins/change/resideath.vue +++ b/src/views/modules/plugins/change/resideath.vue @@ -267,6 +267,17 @@
享受福利 +
+
+
+ + 取 消 确 定 @@ -348,6 +359,7 @@ export default { blacklistReason: '', // 加入黑名单原因 welfareFlag: false, rowData: {}, // 加入黑名单的人员信息 + deathDate: '' } }, props: { @@ -427,7 +439,8 @@ export default { type: '1', userId: this.rowData.icResiUserId, joinReason: this.blacklistReason, - welfareFlag: this.welfareFlag + welfareFlag: this.welfareFlag, + deathDate: this.deathDate } this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => { if (res.code !== 0) { From 6e8d2bf8d94fe0c5543a93608e50024d975c38ef Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 11 May 2022 10:28:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=B4=AD=E6=88=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/rent/renthouse-add-or-update.vue | 306 ++++++++++++++++++ src/views/modules/plugins/rent/renthouse.vue | 98 ++++++ 2 files changed, 404 insertions(+) create mode 100644 src/views/modules/plugins/rent/renthouse-add-or-update.vue create mode 100644 src/views/modules/plugins/rent/renthouse.vue diff --git a/src/views/modules/plugins/rent/renthouse-add-or-update.vue b/src/views/modules/plugins/rent/renthouse-add-or-update.vue new file mode 100644 index 000000000..417c5a0ed --- /dev/null +++ b/src/views/modules/plugins/rent/renthouse-add-or-update.vue @@ -0,0 +1,306 @@ + + + diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue new file mode 100644 index 000000000..bd9ea3697 --- /dev/null +++ b/src/views/modules/plugins/rent/renthouse.vue @@ -0,0 +1,98 @@ + + + From 210ddb33b941f7d1a84a9aaf2977c9b8d3655b39 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 11 May 2022 10:32:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E5=8D=95=E9=80=89=E6=A1=86=E9=80=89=E4=B8=8D=E4=B8=AD=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiChangeTransfer.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index d9a898166..b7a0d18c1 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -234,9 +234,10 @@ export default { } }, - components: {}, - mounted () { + components: { + }, + mounted () { }, computed: { dataRule () { @@ -561,7 +562,8 @@ export default { homeId: '', //调动到的房屋Id transferTime: '', //调动时间【日期类型】 reason: '', //备注 - outOfTime: '' + outOfTime: '', + welfareFlag: false } this.customerId = ''//客户id