From 019540705296049a8fe7892b07e0b895c6c28f6b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 22 Apr 2022 18:12:01 +0800 Subject: [PATCH 01/24] init --- .../rent/rentblacklist-add-or-update.vue | 187 +++++++++++++ .../modules/plugins/rent/rentblacklist.vue | 81 ++++++ .../rent/rentcontractfile-add-or-update.vue | 138 ++++++++++ .../modules/plugins/rent/rentcontractfile.vue | 74 +++++ .../rent/rentcontractinfo-add-or-update.vue | 257 ++++++++++++++++++ .../modules/plugins/rent/rentcontractinfo.vue | 91 +++++++ .../rent/renttenantinfo-add-or-update.vue | 159 +++++++++++ .../modules/plugins/rent/renttenantinfo.vue | 77 ++++++ 8 files changed, 1064 insertions(+) create mode 100644 src/views/modules/plugins/rent/rentblacklist-add-or-update.vue create mode 100644 src/views/modules/plugins/rent/rentblacklist.vue create mode 100644 src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue create mode 100644 src/views/modules/plugins/rent/rentcontractfile.vue create mode 100644 src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue create mode 100644 src/views/modules/plugins/rent/rentcontractinfo.vue create mode 100644 src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue create mode 100644 src/views/modules/plugins/rent/renttenantinfo.vue diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue new file mode 100644 index 000000000..2f5671d67 --- /dev/null +++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue new file mode 100644 index 000000000..75ec29136 --- /dev/null +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue new file mode 100644 index 000000000..69a392e06 --- /dev/null +++ b/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue @@ -0,0 +1,138 @@ + + + diff --git a/src/views/modules/plugins/rent/rentcontractfile.vue b/src/views/modules/plugins/rent/rentcontractfile.vue new file mode 100644 index 000000000..44fc94877 --- /dev/null +++ b/src/views/modules/plugins/rent/rentcontractfile.vue @@ -0,0 +1,74 @@ + + + diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue new file mode 100644 index 000000000..df366c9aa --- /dev/null +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -0,0 +1,257 @@ + + + diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue new file mode 100644 index 000000000..bbf1d5f69 --- /dev/null +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -0,0 +1,91 @@ + + + diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue new file mode 100644 index 000000000..d4248505d --- /dev/null +++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue @@ -0,0 +1,159 @@ + + + diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue new file mode 100644 index 000000000..b603e7260 --- /dev/null +++ b/src/views/modules/plugins/rent/renttenantinfo.vue @@ -0,0 +1,77 @@ + + + From 9fa0beabf010fe20f56c9d116e126db1d1c295d6 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Sun, 24 Apr 2022 09:39:33 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=90=8D=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentblacklist.vue | 2 +- src/views/modules/plugins/rent/rentcontractfile.vue | 2 +- src/views/modules/plugins/rent/rentcontractinfo.vue | 2 +- src/views/modules/plugins/rent/renttenantinfo.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue index 75ec29136..cd8594296 100644 --- a/src/views/modules/plugins/rent/rentblacklist.vue +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -58,7 +58,7 @@ diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue new file mode 100644 index 000000000..2ddbf7a43 --- /dev/null +++ b/src/views/modules/plugins/rent/resi.vue @@ -0,0 +1,1278 @@ + + + + + + + From 6e715e136d071ac2bdca74b81d950b8066cb2084 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 25 Apr 2022 10:17:11 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/rent/rentblacklist-add-or-update.vue | 4 ++-- src/views/modules/plugins/rent/rentblacklist.vue | 11 ++++++----- .../plugins/rent/rentcontractfile-add-or-update.vue | 4 ++-- src/views/modules/plugins/rent/rentcontractfile.vue | 13 +++++-------- .../plugins/rent/rentcontractinfo-add-or-update.vue | 4 ++-- src/views/modules/plugins/rent/rentcontractinfo.vue | 10 +++++----- .../modules/plugins/rent/rentcontractreview.vue | 10 +++++----- .../plugins/rent/renttenantinfo-add-or-update.vue | 4 ++-- src/views/modules/plugins/rent/renttenantinfo.vue | 13 +++++-------- 9 files changed, 34 insertions(+), 39 deletions(-) diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue index 2f5671d67..36506da3e 100644 --- a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue @@ -150,7 +150,7 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/rent/rentBlacklist/${this.dataForm.id}`).then(({ data: res }) => { + this.$http.get(`/pli/power/rentBlacklist/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -166,7 +166,7 @@ export default { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/rent/rentBlacklist/', this.dataForm).then(({ data: res }) => { + this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentBlacklist/', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue index 1f3e17f01..f62bad8d0 100644 --- a/src/views/modules/plugins/rent/rentblacklist.vue +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -45,7 +45,7 @@ {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} @@ -58,8 +58,8 @@ @@ -86,11 +86,12 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/rent/rentBlacklist/page', + getDataListURL: '/pli/power/rentBlacklist/page', getDataListIsPage: true, - deleteURL: '/rent/rentBlacklist', + deleteURL: '/pli/power/rentBlacklist', deleteIsBatch: true }, + timeRange: '', dataForm: { id: '' } diff --git a/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue index 69a392e06..02786b2f8 100644 --- a/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractfile-add-or-update.vue @@ -101,7 +101,7 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/rent/rentContractFile/${this.dataForm.id}`).then(({ data: res }) => { + this.$http.get(`/pli/power/rentContractFile/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -117,7 +117,7 @@ export default { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/rent/rentContractFile/', this.dataForm).then(({ data: res }) => { + this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentContractFile/', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/rent/rentcontractfile.vue b/src/views/modules/plugins/rent/rentcontractfile.vue index fd5550f4c..0110bdd89 100644 --- a/src/views/modules/plugins/rent/rentcontractfile.vue +++ b/src/views/modules/plugins/rent/rentcontractfile.vue @@ -9,10 +9,7 @@ {{ $t('query') }} - {{ $t('add') }} - - - {{ $t('deleteBatch') }} + {{ $t('add') }} @@ -29,8 +26,8 @@ @@ -57,9 +54,9 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/rent/rentContractFile/page', + getDataListURL: '/pli/power/rentContractFile/page', getDataListIsPage: true, - deleteURL: '/rent/rentContractFile', + deleteURL: '/pli/power/rentContractFile', deleteIsBatch: true }, dataForm: { diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index df366c9aa..60e4504e1 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -220,7 +220,7 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/rent/rentContractInfo/${this.dataForm.id}`).then(({ data: res }) => { + this.$http.get(`/pli/power/rentContractInfo/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -236,7 +236,7 @@ export default { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/rent/rentContractInfo/', this.dataForm).then(({ data: res }) => { + this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentContractInfo/', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index b7bbb0156..239e66b7b 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -9,7 +9,7 @@ {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} @@ -27,8 +27,8 @@ @@ -55,9 +55,9 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/rent/rentContractInfo/page', + getDataListURL: '/pli/power/rentContractInfo/page', getDataListIsPage: true, - deleteURL: '/rent/rentContractInfo', + deleteURL: '/pli/power/rentContractInfo', deleteIsBatch: true }, dataForm: { diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index 6c94b790b..593c21a01 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -9,7 +9,7 @@ {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} @@ -26,8 +26,8 @@ @@ -54,9 +54,9 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/rent/rentContractInfo/page', + getDataListURL: '/pli/power/rentContractInfo/page', getDataListIsPage: true, - deleteURL: '/rent/rentContractInfo', + deleteURL: '/pli/power/rentContractInfo', deleteIsBatch: true }, dataForm: { diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue index d4248505d..870b11eb7 100644 --- a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue @@ -122,7 +122,7 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/rent/rentTenantInfo/${this.dataForm.id}`).then(({ data: res }) => { + this.$http.get(`/pli/power/rentTenantInfo/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -138,7 +138,7 @@ export default { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/rent/rentTenantInfo/', this.dataForm).then(({ data: res }) => { + this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentTenantInfo/', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue index e3e0ab03d..e6b11241d 100644 --- a/src/views/modules/plugins/rent/renttenantinfo.vue +++ b/src/views/modules/plugins/rent/renttenantinfo.vue @@ -9,10 +9,7 @@ {{ $t('query') }} - {{ $t('add') }} - - - {{ $t('deleteBatch') }} + {{ $t('add') }} @@ -32,8 +29,8 @@ @@ -60,9 +57,9 @@ export default { data () { return { mixinViewModuleOptions: { - getDataListURL: '/rent/rentTenantInfo/page', + getDataListURL: '/pli/power/rentTenantInfo/page', getDataListIsPage: true, - deleteURL: '/rent/rentTenantInfo', + deleteURL: '/pli/power/rentTenantInfo', deleteIsBatch: true }, dataForm: { From 2003057c2f68b12a7c9455a32ad7e90cd2755115 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 25 Apr 2022 13:26:46 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E6=94=B9=E9=80=A0=E5=8E=9F=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=E4=BA=BA=E5=91=98=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/blackSearch.vue | 649 ++++++++++++++++++++++++ src/views/modules/plugins/rent/resi.vue | 2 +- 2 files changed, 650 insertions(+), 1 deletion(-) create mode 100644 src/views/components/blackSearch.vue diff --git a/src/views/components/blackSearch.vue b/src/views/components/blackSearch.vue new file mode 100644 index 000000000..6cc4a41a7 --- /dev/null +++ b/src/views/components/blackSearch.vue @@ -0,0 +1,649 @@ + + + + + diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue index 2ddbf7a43..7e70c1618 100644 --- a/src/views/modules/plugins/rent/resi.vue +++ b/src/views/modules/plugins/rent/resi.vue @@ -269,7 +269,7 @@ From d1f9ab884cdeec6adf1a28a6b7d22da0a58020da Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 25 Apr 2022 15:58:20 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo.vue | 286 ++++++++++++++++-- 1 file changed, 265 insertions(+), 21 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 84924539d..00102b444 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -2,6 +2,101 @@
+ + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ @@ -60,8 +155,8 @@ @@ -93,14 +188,24 @@ export default { deleteURL: '/pli/power/rentContractInfo', deleteIsBatch: true }, + optionsV: [], + optionsB: [], + optionsH: [], + optionsD: [], + optionsG: [], dataForm: { id: '', - lesseeIdCard: '', - state: '', - lesseeMobile: '', - lesseeName: '', - startTime: '', - endTime: '' + gridId: '', + villageId: '', + buildId: '', + unitId: '', + homeId: '', + lesseeIdCard: '', + state: '', + lesseeMobile: '', + lesseeName: '', + startTime: '', + endTime: '' }, stateArr: [ { dictValue: '0', dictName: '未审核' }, @@ -128,19 +233,158 @@ export default { components: { AddOrUpdate }, - methods: { - btKeyUpLesseeIdCard (e) { - e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') - this.dataForm.lesseeIdCard = e.target.value - }, - btKeyUpLesseeMobile (e) { - e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') - this.dataForm.lesseeMobile = e.target.value - }, - btKeyUpLesseeName (e) { - e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') - this.dataForm.lesseeName = e.target.value - }, + created () { + this.getGridList() + this.getValiheList() + }, + computed: { + changeVDisabled() { + return !this.dataForm.villageId + }, + changeBDisabled() { + return !this.dataForm.buildId + }, + changeDDisabled() { + return !this.dataForm.unitId } + }, + methods: { + btKeyUpLesseeIdCard (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeIdCard = e.target.value + }, + btKeyUpLesseeMobile (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeMobile = e.target.value + }, + btKeyUpLesseeName (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeName = e.target.value + }, + handleClearVillage() { + this.dataForm.buildId = '' + this.dataForm.homeId = '' + }, + handleClearBuild() { + this.dataForm.buildId = '' + this.dataForm.unitId = '' + this.dataForm.homeId = '' + }, + handleClearDan() { + this.dataForm.unitId = '' + this.dataForm.homeId = '' + }, + handleChangeGrid(val) { + console.log('val', val) + this.dataForm.villageId = '' + this.dataForm.buildId = '' + this.dataForm.unitId = '' + this.dataForm.homeId = '' + this.getValiheList() + }, + getGridList() { + const { user } = this.$store.state + this.$http + .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsG = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getValiheList() { + const { user } = this.$store.state + this.$http + .post('/gov/org/icneighborhood/neighborhoodoption', { + gridId: this.dataForm.gridId, + agencyId: '' + // agencyId: user.agencyId + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsV = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getBuildList() { + this.$http + .post('/gov/org/icbuilding/buildingoption', { + neighborHoodId: this.dataForm.villageId + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsB = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getUniList() { + this.$http + .post('/gov/org/icbuildingunit/unitoption', { + buildingId: this.dataForm.buildId + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsD = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getHouseList() { + this.$http + .post('/gov/org/ichouse/houseoption', { unitId: this.dataForm.unitId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsH = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + handleChangeV(val) { + console.log('val', val) + this.dataForm.buildId = '' + this.dataForm.unitId = '' + this.dataForm.homeId = '' + this.getBuildList() + }, + handleChangeB(val) { + console.log('val', val) + this.dataForm.unitId = '' + this.dataForm.homeId = '' + this.getUniList() + }, + handleChangeD(val) { + console.log('val', val) + this.dataForm.homeId = '' + this.getHouseList() + }, + }, } From daf01223880b89a7e49a48e2a0eae9492df98cb6 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 25 Apr 2022 16:02:13 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/rent/rentcontractreview.vue | 259 +++++++++++++++++- 1 file changed, 256 insertions(+), 3 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index 593c21a01..fc6f95025 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -2,8 +2,110 @@
- - + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
{{ $t('query') }} @@ -59,13 +161,164 @@ export default { deleteURL: '/pli/power/rentContractInfo', deleteIsBatch: true }, + optionsV: [], + optionsB: [], + optionsH: [], + optionsD: [], + optionsG: [], dataForm: { - id: '' + id: '', + gridId: '', + villageId: '', + buildId: '', + unitId: '', + homeId: '' } } }, components: { AddOrUpdate + }, + created () { + this.getGridList() + this.getValiheList() + }, + computed: { + changeVDisabled() { + return !this.dataForm.villageId + }, + changeBDisabled() { + return !this.dataForm.buildId + }, + changeDDisabled() { + return !this.dataForm.unitId + } + }, + methods: { + handleClearVillage() { + this.dataForm.buildId = '' + this.dataForm.homeId = '' + }, + handleClearBuild() { + this.dataForm.buildId = '' + this.dataForm.unitId = '' + this.dataForm.homeId = '' + }, + handleClearDan() { + this.dataForm.unitId = '' + this.dataForm.homeId = '' + }, + handleChangeGrid(val) { + console.log('val', val) + this.dataForm.villageId = '' + this.dataForm.buildId = '' + this.dataForm.unitId = '' + this.dataForm.homeId = '' + this.getValiheList() + }, + getGridList() { + const { user } = this.$store.state + this.$http + .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsG = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getValiheList() { + const { user } = this.$store.state + this.$http + .post('/gov/org/icneighborhood/neighborhoodoption', { + gridId: this.dataForm.gridId, + agencyId: '' + // agencyId: user.agencyId + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsV = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getBuildList() { + this.$http + .post('/gov/org/icbuilding/buildingoption', { + neighborHoodId: this.dataForm.villageId + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsB = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getUniList() { + this.$http + .post('/gov/org/icbuildingunit/unitoption', { + buildingId: this.dataForm.buildId + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsD = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getHouseList() { + this.$http + .post('/gov/org/ichouse/houseoption', { unitId: this.dataForm.unitId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsH = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + handleChangeV(val) { + console.log('val', val) + this.dataForm.buildId = '' + this.dataForm.unitId = '' + this.dataForm.homeId = '' + this.getBuildList() + }, + handleChangeB(val) { + console.log('val', val) + this.dataForm.unitId = '' + this.dataForm.homeId = '' + this.getUniList() + }, + handleChangeD(val) { + console.log('val', val) + this.dataForm.homeId = '' + this.getHouseList() + }, } } From 9ef1eb50f94c50b7e15ac68e4e140ee5412d0300 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 25 Apr 2022 16:29:20 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo.vue | 4 ++-- .../modules/plugins/rent/rentcontractreview.vue | 14 ++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 00102b444..bc9a4e2d7 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -155,8 +155,8 @@ diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index fc6f95025..32493ba75 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -2,14 +2,12 @@
- - +
@@ -47,10 +43,8 @@ @@ -90,10 +82,8 @@ v-model.trim="dataForm.homeId" :disabled="changeDDisabled" placeholder="房号" - size="small" clearable style="width: 120px;" - class="resi-cell-select" > Date: Mon, 25 Apr 2022 16:44:12 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/zh-CN.js | 3 + .../rent/rentcontractinfo-add-or-update.vue | 211 +++++++++--------- .../modules/plugins/rent/rentcontractinfo.vue | 8 +- 3 files changed, 110 insertions(+), 112 deletions(-) diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 9a495765f..6f3923da2 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -12,6 +12,9 @@ t.add = '新增' t.delete = '删除' t.deleteBatch = '删除' t.update = '修改' +t.checkBtn = '审核' +t.checkTGBtn = '审核通过' +t.checkBTGBtn = '审核不通过' t.query = '查询' t.export = '导出' t.handle = '操作' diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 60e4504e1..fcc54a223 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -1,88 +1,97 @@ @@ -113,14 +122,7 @@ export default { lesseeMobile: '', signDate: '', startDate: '', - endDate: '', - reason: '', - delFlag: '', - revision: '', - createdBy: '', - createdTime: '', - updatedBy: '', - updatedTime: '' + endDate: '' } } }, @@ -183,27 +185,6 @@ export default { ], endDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - reason: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - delFlag: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - revision: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - createdBy: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - createdTime: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - updatedBy: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - updatedTime: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] } } @@ -230,6 +211,16 @@ export default { } }).catch(() => {}) }, + // 审核提交方法 + checkHandle(type){ + this.$message({ + message: type, + type: 'success', + duration: 500, + onClose: () => {} + }) + + }, // 表单提交 dataFormSubmitHandle: debounce(function () { this.$refs['dataForm'].validate((valid) => { diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 00102b444..6b72d40b2 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -141,7 +141,11 @@ - + + + @@ -155,7 +159,7 @@ From 2c897e3afc9a79d6a89f7b3bbd6e6f27e5e8f623 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 26 Apr 2022 09:43:09 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/zh-CN.js | 1 + .../rent/rentcontractinfo-add-or-update.vue | 95 ++++++----- .../modules/plugins/rent/rentcontractinfo.vue | 153 +++++++++++------- .../plugins/rent/rentcontractreview.vue | 85 +++++++++- 4 files changed, 230 insertions(+), 104 deletions(-) diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 6f3923da2..993f4b0ad 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -13,6 +13,7 @@ t.delete = '删除' t.deleteBatch = '删除' t.update = '修改' t.checkBtn = '审核' +t.lookBtn = '查看' t.checkTGBtn = '审核通过' t.checkBTGBtn = '审核不通过' t.query = '查询' diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index fcc54a223..387ec8a9e 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -1,43 +1,45 @@ + + + @@ -104,6 +109,7 @@ export default { visible: false, dataForm: { id: '', + flag: '', gridId: '', gridName: '', buildId: '', @@ -123,7 +129,10 @@ export default { signDate: '', startDate: '', endDate: '' - } + }, + dataListLoading: false, + dialogVisible: false, + dialogImageUrl: '' } }, computed: { @@ -199,6 +208,11 @@ export default { } }) }, + // 查看大图 + imgShow(url){ + this.dialogImageUrl = url + this.dialogVisible = true + }, // 获取信息 getInfo () { this.$http.get(`/pli/power/rentContractInfo/${this.dataForm.id}`).then(({ data: res }) => { @@ -212,12 +226,13 @@ export default { }).catch(() => {}) }, // 审核提交方法 - checkHandle(type){ + checkHandle: function (type) { this.$message({ message: type, type: 'success', duration: 500, - onClose: () => {} + onClose: () => { + } }) }, diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 354a5fd54..00a4dcbf2 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -97,12 +97,20 @@
- - - - - - +
+ + + + + + + + + +
+ + + @@ -110,10 +118,14 @@
- - - - + + + + + + + + @@ -184,56 +196,60 @@ import mixinViewModule from '@/mixins/view-module' import AddOrUpdate from './rentcontractinfo-add-or-update' export default { mixins: [mixinViewModule], - data () { - return { - mixinViewModuleOptions: { - getDataListURL: '/pli/power/rentContractInfo/page', - getDataListIsPage: true, - deleteURL: '/pli/power/rentContractInfo', - deleteIsBatch: true - }, - optionsV: [], - optionsB: [], - optionsH: [], - optionsD: [], - optionsG: [], - dataForm: { - id: '', - gridId: '', - villageId: '', - buildId: '', - unitId: '', - homeId: '', - lesseeIdCard: '', - state: '', - lesseeMobile: '', - lesseeName: '', - startTime: '', - endTime: '' - }, - stateArr: [ - { dictValue: '0', dictName: '未审核' }, - { dictValue: '1', dictName: '审核通过' }, - { dictValue: '2', dictName: '审核不通过' } - ], - pickerBeginDateBefore: { - disabledDate: (time) => { - let beginDateVal = this.dataForm.endTime - if (beginDateVal) { - return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + data: function () { + return { + mixinViewModuleOptions: { + getDataListURL: '/pli/power/rentContractInfo/page', + getDataListIsPage: true, + deleteURL: '/pli/power/rentContractInfo', + deleteIsBatch: true + }, + optionsV: [], + optionsB: [], + optionsH: [], + optionsD: [], + optionsG: [], + dataForm: { + id: '', + gridId: '', + villageId: '', + buildId: '', + unitId: '', + homeId: '', + lesseeName: '', + lesseeIdCard: '', + lesseeMobile: '', + lessorName: '', + lessorIdCard: '', + lessorMobile: '', + startTime: '', + endTime: '', + endDate: '' + }, + pickerBeginDateBefore: { + disabledDate: (time) => { + let beginDateVal = this.dataForm.endTime + if (beginDateVal) { + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() + } } - } - }, - pickerBeginDateAfter: { - disabledDate: (time) => { - let EndDateVal = this.dataForm.startTime - if (EndDateVal) { - return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + }, + pickerBeginDateAfter: { + disabledDate: (time) => { + let EndDateVal = this.dataForm.startTime + if (EndDateVal) { + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() + } } - } + }, + endDateArr: [ + {dictValue: '0', dictName: '近一个月'}, + {dictValue: '1', dictName: '近两个月'}, + {dictValue: '2', dictName: '近三个月'}, + {dictValue: '3', dictName: '到期的房屋合同'} + ] } - } - }, + }, components: { AddOrUpdate }, @@ -253,6 +269,15 @@ export default { } }, methods: { + // 新增 / 修改 + addOrUpdateHandle (id,flag) { + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.dataForm.id = id + this.$refs.addOrUpdate.dataForm.flag = flag + this.$refs.addOrUpdate.init() + }) + }, btKeyUpLesseeIdCard (e) { e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') this.dataForm.lesseeIdCard = e.target.value @@ -265,6 +290,18 @@ export default { e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') this.dataForm.lesseeName = e.target.value }, + btKeyUpLessorIdCard (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeIdCard = e.target.value + }, + btKeyUpLessorMobile (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeMobile = e.target.value + }, + btKeyUpLessorName (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeName = e.target.value + }, handleClearVillage() { this.dataForm.buildId = '' this.dataForm.homeId = '' diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index 32493ba75..59124ad3e 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -97,28 +97,69 @@
+
+ + + + + + + + + + + + +
+ + + + + + + + + + + {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} - + + + - + @@ -162,8 +203,19 @@ export default { villageId: '', buildId: '', unitId: '', - homeId: '' - } + homeId: '', + lesseeIdCard: '', + state: '0', + lesseeMobile: '', + lesseeName: '', + startTime: '', + endTime: '' + }, + stateArr: [ + {dictValue: '0', dictName: '未审核'}, + {dictValue: '1', dictName: '审核通过'}, + {dictValue: '2', dictName: '审核不通过'} + ] } }, components: { @@ -185,6 +237,27 @@ export default { } }, methods: { + // 新增 / 修改 + addOrUpdateHandle (id,flag) { + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.dataForm.id = id + this.$refs.addOrUpdate.dataForm.flag = flag + this.$refs.addOrUpdate.init() + }) + }, + btKeyUpLesseeIdCard (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeIdCard = e.target.value + }, + btKeyUpLesseeMobile (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeMobile = e.target.value + }, + btKeyUpLesseeName (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lesseeName = e.target.value + }, handleClearVillage() { this.dataForm.buildId = '' this.dataForm.homeId = '' From 2d0422ae21e143783f552dbfc7b183d2aef08363 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 26 Apr 2022 15:53:05 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentblacklist-add-or-update.vue | 2 + src/views/modules/plugins/rent/resi.vue | 58 +++++++++++++++++-- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue index 36506da3e..e7047362e 100644 --- a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue @@ -163,6 +163,8 @@ export default { // 表单提交 dataFormSubmitHandle: debounce(function () { this.$refs['dataForm'].validate((valid) => { + console.log(this.dataForm) + return if (!valid) { return false } diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue index e9aa50cdb..c974c2cd9 100644 --- a/src/views/modules/plugins/rent/resi.vue +++ b/src/views/modules/plugins/rent/resi.vue @@ -261,7 +261,16 @@ :userId="lookInfo.userId" :gridName="lookInfo.gridName" @close="handleCancleLook" /> - + + + + 取 消 + 确 定 + +
@@ -333,7 +342,10 @@ export default { lookInfo: { userId: '', gridName: '' - } + }, + blacklistVisible: false, // 加入黑名单 + blacklistReason: '', // 加入黑名单原因 + rowData: {}, // 加入黑名单的人员信息 } }, props: { @@ -376,7 +388,7 @@ export default { this.pageLoading = true this.searchH = this.$refs.resiSearch.$el.offsetHeight console.log('storeoooo----0000', this.$store) - console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight) + // console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight) }, mounted () { @@ -400,7 +412,34 @@ export default { }) }, joinBlacklist (row) { - console.log(row) + this.blacklistVisible = true + this.blacklistReason = '' + this.rowData = { ...row } + }, + confirmJoinBlacklist () { + const params = { + idCard: this.rowData.ID_CARD, + name: this.rowData.NAME, + mobile: this.rowData.MOBILE, + gender: this.rowData.GENDER == '女' ? '0' : this.rowData.GENDER == '男' ? '1' : '', + type: '1', + userid: this.rowData.icResiUserId, + joinReason: this.blacklistReason + } + this.$http.post('/pli/power/rentBlacklist/save', params).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.blacklistVisible = false + this.getTableData() + } + }) + }).catch(() => {}) }, checkSelect (row, index) { @@ -528,7 +567,6 @@ export default { return _val || row[item.columnName] }, handleSearch (val) { - console.log('searchhh--', val) this.currentPage = 1 this.conditions = val this.getTableData() @@ -940,7 +978,6 @@ export default { this.tableHeader.push(item) } }) - console.log('xxxxxxxxxxxxxxx', this.tableHeader) } }) .catch(() => { @@ -1299,4 +1336,13 @@ export default { margin-top: 15px; } } +.blacklist-reason { + width: 100%; + height: 80px; + border: 1px solid #e4e4e4; + border-radius: 4px; + resize: none; + padding: 8px; + box-sizing: border-box; +} From 2e36fbb871a8b23917e513d47e3296b2b34d27d5 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 26 Apr 2022 16:25:22 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 387ec8a9e..6ee970efb 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -32,7 +32,7 @@ @@ -83,7 +83,7 @@ @@ -92,8 +92,8 @@ @@ -227,14 +227,24 @@ export default { }, // 审核提交方法 checkHandle: function (type) { + const params = { + id: this.dataForm.id, + state: type + } + this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } this.$message({ - message: type, - type: 'success', - duration: 500, - onClose: () => { - } + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.visible = false + this.$emit('refreshDataList') + } }) - + }).catch(() => {}) }, // 表单提交 dataFormSubmitHandle: debounce(function () { From dfebf58b096f31a1de2e3ebd0514981b033d0f43 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 26 Apr 2022 17:05:37 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/view-module.js | 5 ++ .../rent/rentblacklist-add-or-update.vue | 4 +- .../modules/plugins/rent/rentblacklist.vue | 60 +++++++++++++++++-- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js index b139641e7..ebde6a3ee 100644 --- a/src/mixins/view-module.js +++ b/src/mixins/view-module.js @@ -63,6 +63,11 @@ export default { } this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0 + this.dataList.forEach(item => { + if (item.gender) { + item.gender = item.gender == '0' ? '女' : item.gender == '1' ? '男' : item.gender + } + }) }).catch(() => { this.dataListLoading = false }) diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue index e7047362e..7d13084c8 100644 --- a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue @@ -163,12 +163,10 @@ export default { // 表单提交 dataFormSubmitHandle: debounce(function () { this.$refs['dataForm'].validate((valid) => { - console.log(this.dataForm) - return if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentBlacklist/', this.dataForm).then(({ data: res }) => { + this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentBlacklist/save', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue index f62bad8d0..8d0ddabcd 100644 --- a/src/views/modules/plugins/rent/rentblacklist.vue +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -58,8 +58,9 @@ @@ -74,6 +75,16 @@ + + + + 取 消 + 确 定 + + @@ -94,7 +105,10 @@ export default { timeRange: '', dataForm: { id: '' - } + }, + blacklistVisible: false, // 解除黑名单 + blacklistReason: '', // 解除黑名单原因 + removeId: '', // 解除黑名单的人员信息id } }, watch: { @@ -106,10 +120,48 @@ export default { this.dataForm.startTime = ""; this.dataForm.endTime = ""; } - }, + } }, components: { AddOrUpdate + }, + methods: { + removeBlacklist (id) { + this.blacklistVisible = true + this.blacklistReason = '' + this.removeId = id + }, + confirmRemoveBlacklist () { + const params = { + id: this.removeId, + removeReason: this.blacklistReason + } + this.$http.post('/pli/power/rentBlacklist/update', params).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.blacklistVisible = false + this.getDataList() + } + }) + }).catch(() => {}) + } } } + \ No newline at end of file From da4e297b950bb389e30afbb4a451e09bf0685f4b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 27 Apr 2022 09:54:35 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=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/modules/plugins/rent/resi.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue index c974c2cd9..73dbf70f7 100644 --- a/src/views/modules/plugins/rent/resi.vue +++ b/src/views/modules/plugins/rent/resi.vue @@ -423,7 +423,7 @@ export default { mobile: this.rowData.MOBILE, gender: this.rowData.GENDER == '女' ? '0' : this.rowData.GENDER == '男' ? '1' : '', type: '1', - userid: this.rowData.icResiUserId, + userId: this.rowData.icResiUserId, joinReason: this.blacklistReason } this.$http.post('/pli/power/rentBlacklist/save', params).then(({ data: res }) => { From 4fd93feef5fb829113c7dd38706d763aa4f93c4d Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 28 Apr 2022 09:55:14 +0800 Subject: [PATCH 18/24] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/resi.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue index 73dbf70f7..717063560 100644 --- a/src/views/modules/plugins/rent/resi.vue +++ b/src/views/modules/plugins/rent/resi.vue @@ -439,7 +439,9 @@ export default { this.getTableData() } }) - }).catch(() => {}) + }).catch(err => { + this.$message.error(err.message) + }) }, checkSelect (row, index) { From 96b0d9a0bdf2648dd5e922d6830ec22b56c85068 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 10:34:28 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 00a4dcbf2..eda4cbea6 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -290,18 +290,18 @@ export default { e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') this.dataForm.lesseeName = e.target.value }, - btKeyUpLessorIdCard (e) { - e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') - this.dataForm.lesseeIdCard = e.target.value - }, - btKeyUpLessorMobile (e) { - e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') - this.dataForm.lesseeMobile = e.target.value - }, - btKeyUpLessorName (e) { - e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') - this.dataForm.lesseeName = e.target.value - }, + btKeyUpLessorIdCard (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lessorIdCard = e.target.value + }, + btKeyUpLessorMobile (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lessorMobile = e.target.value + }, + btKeyUpLessorName (e) { + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '') + this.dataForm.lessorName = e.target.value + }, handleClearVillage() { this.dataForm.buildId = '' this.dataForm.homeId = '' From 10578077414147f307587f50451ebafe922a4117 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 11:07:11 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 6 +++--- .../modules/plugins/rent/rentcontractinfo.vue | 12 ++++++------ .../modules/plugins/rent/rentcontractreview.vue | 17 +++++++++++------ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 6ee970efb..c47d3cb06 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -91,9 +91,9 @@ diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index eda4cbea6..bea1c29d5 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -158,15 +158,15 @@ {{scope.$index+1}} - + - - - - - + + + + + diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index 59124ad3e..69a454f85 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -147,15 +147,20 @@ {{scope.$index+1}} - + - - - - - + + + + + + - - - + + + + + + diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index e81aee7bb..f245491ca 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -148,9 +148,14 @@ - - - + + + + + + From b425d065d4d0ce68dc6fda242d6373ab9e6f4cf0 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 13:45:56 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E6=94=B9=E5=8F=98=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo-add-or-update.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index c47d3cb06..7eeec13f2 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -92,8 +92,8 @@ From f6f5065758adfa82a1606ddfd78d70d37d96edf6 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 Apr 2022 14:02:57 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentblacklist.vue | 4 ++-- src/views/modules/plugins/rent/rentcontractinfo.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue index 8d0ddabcd..0a4b7c47a 100644 --- a/src/views/modules/plugins/rent/rentblacklist.vue +++ b/src/views/modules/plugins/rent/rentblacklist.vue @@ -53,7 +53,7 @@ - + @@ -164,4 +164,4 @@ export default { padding: 8px; box-sizing: border-box; } - \ No newline at end of file + diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 2bb299e95..4ef1cf789 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -171,9 +171,9 @@ - - - + + +