From 93274d928a6bf3b4f720ad4bd6fbcf55846abeab Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 27 Apr 2022 13:39:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/diyInfo.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index b93a49398..c0f6586c9 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -204,13 +204,13 @@ export default { }, handleDelItem(val) { const { item, index } = val - console.log('item------', item, this.$refs[`checkbox${item.id}`]) - const checkList = this.$refs[`checkbox${item.id}`][0].checkedList + console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`]) + const checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList checkList.forEach((n, i) => { - if (n == item.itemId) this.$refs[`checkbox${item.id}`][0].checkedList.splice(i, 1) + if (n == item.itemId) this.$refs[`checkbox${item.itemGroupId}`][0].checkedList.splice(i, 1) }) this.rightList.forEach((n, i) => { - if (n.id === item.id) { + if (n.id === item.itemGroupId) { n.queryItemList.splice(index, 1) if (n.queryItemList.length === 0) this.rightList.splice(i, 1) } From ec1827be3be767d4b9e214d1e83e0898996d89da Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 27 Apr 2022 13:58:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BAloading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/checkBox.vue | 2 +- src/views/modules/base/diyInfo.vue | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue index 4bab4aea7..1f2d19a2a 100644 --- a/src/views/components/checkBox.vue +++ b/src/views/components/checkBox.vue @@ -35,7 +35,7 @@ export default { boxList: [], checkAll: false, checkedList: [], - isIndeterminate: true, + isIndeterminate: false, pid: '', } }, diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index c0f6586c9..af53b5d31 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -87,7 +87,7 @@ 保存为常用模板 - 导出 + 导出 { console.log('err', err) From 8bad3a59383ed22d74b42b7d1853cdf717a8ac78 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 27 Apr 2022 15:03:31 +0800 Subject: [PATCH 3/5] dd --- src/views/modules/base/diyInfo.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index af53b5d31..ec4a3eb3b 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -330,6 +330,7 @@ export default { }) .catch(err => { console.log('err', err) + this.exportLoading = false return this.$message.error('网络错误') }) }, From 510664fc7f57ebba070673f41c3fd6b6cd08147b Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 27 Apr 2022 16:32:20 +0800 Subject: [PATCH 4/5] dd --- src/views/components/resiSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index ef2b7fa67..45f56bf30 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -712,7 +712,7 @@ export default { width: 200px; } .resi-cell--daterange { - width: 200px; + max-width: 260px; } .resi-cell-select { width: 200px; From de06262cf888e68abc49c2568c455a1d7f48ddc0 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 27 Apr 2022 16:43:27 +0800 Subject: [PATCH 5/5] 11 --- .../scss/modules/visual/basicInfoMain.scss | 4 ++-- .../visual/basicinfo/basicInfoCommunity.vue | 19 ++++++++++--------- .../visual/basicinfo/cpts/roomInfo.vue | 13 ++++++++++--- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index ecc3d6387..d3817619d 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -296,8 +296,8 @@ .icon_party { position: absolute; - top: 13px; - left: 18px; + top: 10px; + left: 12px; } .icon_roomstate { position: absolute; diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index 4cc2f4021..3f8e1b792 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -216,21 +216,22 @@ export default { this.userArray = [] this.roomArray.forEach((element, index) => { - - let obj = JSON.parse(JSON.stringify(element)) - - obj.showAllUser = false - this.$set(this.roomArray, index, obj) - // element.showAllUser = false + if (index !== selIndex) { + let obj = JSON.parse(JSON.stringify(element)) + obj.showAllUser = false + this.$set(this.roomArray, index, obj) + } }); - await nextTick(50); - if ((selIndex === 0 || selIndex) && !this.roomArray[selIndex].showAllUser) { - + await nextTick(100); await this.loadUser(this.roomArray[selIndex].houseId, selIndex) + } else { + let obj = JSON.parse(JSON.stringify(this.roomArray[selIndex])) + obj.showAllUser = false + this.$set(this.roomArray, selIndex, obj) } diff --git a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue index 8e06df7f2..a3b93557b 100644 --- a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue +++ b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue @@ -20,18 +20,25 @@ -->
+
+ 所属房屋： + {{ formData.neighborHoodName }}-{{ formData. buildingName }}-{{ formData. unitName }}-{{ formData. doorName }} +
+ +
+ +
房屋类型：