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 1/4] =?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 2/4] =?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 3/4] =?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 4/4] =?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