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 1/3] 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 2/3] 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 }} +
+ +
+ +
房屋类型： From fe075c4ed8283ef05fea2a7c6d67d69ca0aa120a Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 28 Apr 2022 11:10:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/checkBox.vue | 17 ++++++-- src/views/modules/base/diyInfo.vue | 65 +++++++++++++++++++++++++----- src/views/modules/base/resi.vue | 3 +- 3 files changed, 70 insertions(+), 15 deletions(-) diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue index 1f2d19a2a..41bc5cfae 100644 --- a/src/views/components/checkBox.vue +++ b/src/views/components/checkBox.vue @@ -1,15 +1,16 @@ @@ -37,6 +38,7 @@ export default { checkedList: [], isIndeterminate: false, pid: '', + loading: false } }, created() { @@ -53,8 +55,9 @@ export default { this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid }) }, handleChange(value) { + console.log('value----', value) let checkedCount = value.length; - this.checkAll = checkedCount === this.list.length; + this.checkAll = checkedCount === this.boxList.length; this.isIndeterminate = checkedCount > 0 && checkedCount < this.boxList.length; this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid }) }, @@ -75,4 +78,10 @@ export default { .mb10 { margin-bottom: 10px; } +.no-data { + padding-top: 30px; + font-size: 14px; + text-align: center; + color: #999; +} \ No newline at end of file diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index ec4a3eb3b..a202036ab 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -4,10 +4,10 @@
- - + +
-
@@ -19,7 +19,7 @@
导出信息
预览
-
+
@@ -129,6 +129,7 @@ import checkBox from '../../components/checkBox.vue' import dragItem from '../../components/dragItem.vue' import Sortable from 'sortablejs' +import { requestPost } from "@/js/dai/request" export default { props: { list: { @@ -149,8 +150,10 @@ export default { exportLoading: false, activeCollapse: ['1'], activeName: 'first', + leftActive: '', info: {}, rightList: [], + leftList: [], form: { isSaveTemp: false, name: '', @@ -161,11 +164,14 @@ export default { diyDialog: false, } }, - created() { + async created() { this.list.forEach(item => { this.$set(this.info, item.id, []) }) - console.log('infodiy----', this.list) + this.leftActive = this.list[0].id + this.leftList = [...this.list] + this.leftList[0].queryItemList = await this.getExportChildList(this.leftList[0].id) + console.log('infodiy----', this.leftList) this.getTemplateList() }, watch: { @@ -175,14 +181,24 @@ export default { }, deep: true - } + }, + // list: { + // handler(val) { + // if (val.length > 0) { + // this.leftList = [...val] + // this.leftList[0].queryItemList = this.getExportChildList(this.leftList[0].id) + // } + // }, + // deep: true, + // // immediate: true + // }, }, methods: { handleChangeBox({list, pid}) { console.log('ccccc----', list) // if (list.length == 0) return let obj = {} - this.list.forEach(item =>{ + this.leftList.forEach(item =>{ if (item.id == pid) obj = { ...item, queryItemList: [...list] } }) const groups = this.rightList.map(item => item.id) @@ -203,12 +219,23 @@ export default { } this.activeCollapse = [...this.activeCollapse, pid] }, + handleTabsClick(val) { + console.log('tabs-----', val) + this.leftList.forEach(async item => { + if (item.id == val.name) { + if (item.queryItemList.length == 0) item.queryItemList = await this.getExportChildList(item.id) + } + }) + }, handleDelItem(val) { const { item, index } = val console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`]) - const checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList + let checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList checkList.forEach((n, i) => { - if (n == item.itemId) this.$refs[`checkbox${item.itemGroupId}`][0].checkedList.splice(i, 1) + if (n == item.itemId) { + checkList.splice(i, 1) + this.$refs[`checkbox${item.itemGroupId}`][0].handleChange(checkList) + } }) this.rightList.forEach((n, i) => { if (n.id === item.itemGroupId) { @@ -387,6 +414,20 @@ export default { return this.$message.error('网络错误') }) }, + async getExportChildList (groupId) { + const url = `/oper/customize/icformitem/getItemList/${groupId}` + let params = {} + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + + return data + + } else { + this.$message.error(msg) + } + }, } } @@ -422,6 +463,10 @@ export default { } } } +.h80 { + height: calc(80vh - 160px); + overflow: auto; +} .diy-footer { display: flex; align-items: center; diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 391035b10..01335d6c1 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1260,7 +1260,8 @@ export default { data.forEach(item => { (async (id) => { - item.queryItemList = await this.getExportChildList(id) + // item.queryItemList = await this.getExportChildList(id) + item.queryItemList = [] })(item.id) }) this.exportList = [...data]