Merge branch 'dev-0420' into test

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;

src/views/components/checkBox.vue

@@ -35,7 +35,7 @@ export default {
       boxList: [],
       checkAll: false,
       checkedList: [],
-      isIndeterminate: true,
+      isIndeterminate: false,
       pid: '',
     }
   },

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;

src/views/modules/base/diyInfo.vue

@@ -87,7 +87,7 @@
           <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
         </div>
       </div>
-      <el-button class="diy-button--delete" @click="handleExport">导出</el-button>
+      <el-button class="diy-button--delete" :loading="exportLoading" @click="handleExport">导出</el-button>
     </div>
     <el-dialog :visible.sync="diyDialog"
                :close-on-click-modal="false"
@@ -146,6 +146,7 @@ export default {
   },
   data() {
     return {
+      exportLoading: false,
       activeCollapse: ['1'],
       activeName: 'first',
       info: {},
@@ -204,13 +205,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)
         }
@@ -272,6 +273,7 @@ export default {
     handleExport() {
       if (this.rightList.length === 0) return this.$message.error('请选择导出信息')
       if (this.form.isSaveTemp && !this.form.name) return this.$message.error('请输入模板名称')
+      this.exportLoading = true
       this.exportTemplate()
 
     },
@@ -324,9 +326,11 @@ export default {
             this.$message.success('导出成功')
             this.$emit('close')
           } else this.$message.error('下载失败')
+          this.exportLoading = false
         })
         .catch(err => {
           console.log('err', err)
+          this.exportLoading = false
           return this.$message.error('网络错误')
         })
     },

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)
       }
 
 

src/views/modules/visual/basicinfo/cpts/roomInfo.vue

@@ -20,18 +20,25 @@
           </div>
         </div> -->
         <div class="list">
+          <div class="item">
+            <span class="item-field">所属房屋：</span>
+            <span>{{  formData.neighborHoodName }}-{{ formData. buildingName }}-{{ formData. unitName }}-{{ formData. doorName }}</span>
+          </div>
+
+        </div>
+        <!-- <div class="list">
           <div class="item">
             <span class="item-field">所属楼栋：</span>
             <span>{{  formData.buildingName }}</span>
           </div>
 
-        </div>
-        <div class="list">
+        </div> -->
+        <!-- <div class="list">
           <div class="item">
             <span class="item-field">房屋名称：</span>
             <span>{{ formData. houseName }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="list">
           <div class="item">
             <span class="item-field">房屋类型：</span>