Merge branch 'dev-220228' into test

src/assets/scss/modules/visual/communityManage.scss

@@ -0,0 +1,66 @@
+.div_search {
+  display: flex;
+
+  .resi-cell {
+    display: flex;
+    align-items: center;
+    .resi-cell-label {
+      width: 70px;
+      box-sizing: border-box;
+      margin-right: 15px;
+      text-align: right;
+      // line-height: 32;
+    }
+
+    .resi-cell-input {
+      width: 180px;
+    }
+  }
+}
+
+.div_table {
+  margin-top: 20px;
+  position: relative;
+}
+.div_del {
+  position: absolute;
+  left: 10px;
+  bottom: 0;
+}
+.div_search {
+  display: flex;
+
+  .resi-cell {
+    display: flex;
+    align-items: center;
+    .resi-cell-label {
+      width: 70px;
+      box-sizing: border-box;
+      margin-right: 15px;
+      text-align: right;
+      // line-height: 32;
+    }
+
+    .resi-cell-input {
+      width: 180px;
+    }
+  }
+}
+
+.div_btn {
+  display: flex;
+  margin-top: 20px;
+
+  .btn_upload {
+    margin-left: 10px;
+    display: flex;
+  }
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}

src/views/modules/base/community/buildTable.vue

@@ -85,12 +85,18 @@
     </div>
 
     <div class="div_table">
-      <el-table :data="tableData"
+      <el-table ref="ref_table"
+                :data="tableData"
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                style="width: 100%">
+                style="width: 100%"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         width="55">
+        </el-table-column>
         <el-table-column prop="buildingName"
                          label="楼栋名称"
                          min-width="180">
@@ -150,6 +156,18 @@
                        :total="total">
         </el-pagination>
       </div>
+
+      <div v-if="tableData.length>0"
+           class="div_del">
+        <el-checkbox :indeterminate="isIndeterminate"
+                     v-model="selAllFlag"
+                     @change="handleSelectAll">全选</el-checkbox>
+        <el-button style="margin-left:15px"
+                   type="red"
+                   size="small"
+                   @click="deleteBatch">批量删除</el-button>
+      </div>
+
     </div>
 
     <!-- 修改弹出框 -->
@@ -186,6 +204,8 @@ export default {
       pageSize: 20,
       pageNo: 0,
       tableLoading: true,
+      selAllFlag: false,
+      isIndeterminate: false,//复选框的不确定状态
 
       agencyObj: {},//树所选的小区对象
       ownerName: '',
@@ -287,6 +307,62 @@ export default {
       this.$emit('refreshTree')
     },
 
+    handleSelectAll (selectAllFlag) {
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          this.$refs.ref_table.toggleRowSelection(row);
+        });
+      }
+    },
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("确认删除选择的楼宇?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteCommunityBatch()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+      } else {
+        this.$message.warning('请先选择要删除的楼宇')
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection
+
+      if (selection.length > 0) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+    selectionChange (selection) {
+      this.selection = selection
+
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true
+        this.isIndeterminate = false
+      } else if (selection.length > 0) {
+        this.selAllFlag = false
+        this.isIndeterminate = true
+      } else {
+        this.selAllFlag = false
+        this.isIndeterminate = false
+      }
+    },
+
     async handleDelete (row) {
 
       this.$confirm("确认删除?", "提示", {
@@ -310,6 +386,41 @@ export default {
 
     },
 
+    async deleteCommunityBatch () {
+      let ids = []
+      this.selection.forEach(element => {
+
+        ids.push(element.buildingId)
+      });
+
+      const url = "/gov/org/house/delete"
+
+      let params = {
+        type: 'building',
+        ids: ids
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else if (code > 8000) {
+        // this.$message({
+        //   type: "success",
+        //   message: msg
+        // });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
     async deleteBuild (row) {
       const url = "/gov/org/building/buildingdel"
 
@@ -547,59 +658,5 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/buttonstyle.scss";
-.div_search {
+@import "@/assets/scss/modules/visual/communityManage.scss";
-  display: flex;
-
-  .resi-cell {
-    display: flex;
-    align-items: center;
-    .resi-cell-label {
-      width: 70px;
-      box-sizing: border-box;
-      margin-right: 15px;
-      text-align: right;
-      // line-height: 32;
-    }
-
-    .resi-cell-input {
-      width: 180px;
-    }
-  }
-}
-
-.div_table {
-  margin-top: 20px;
-}
-.div_search {
-  display: flex;
-
-  .resi-cell {
-    display: flex;
-    align-items: center;
-    .resi-cell-label {
-      width: 70px;
-      box-sizing: border-box;
-      margin-right: 15px;
-      text-align: right;
-      // line-height: 32;
-    }
-
-    .resi-cell-input {
-      width: 180px;
-    }
-  }
-}
-
-.div_btn {
-  display: flex;
-  margin-top: 20px;
-}
-
-.el-row {
-  /* margin-bottom: 20px; */
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10px;
-  margin-right: 50px;
-}
 </style>

src/views/modules/base/community/communityTable.vue

@@ -180,14 +180,15 @@
         </el-pagination>
       </div>
 
-      <div class="div_del">
+      <div v-if="tableData.length>0"
+           class="div_del">
         <el-checkbox :indeterminate="isIndeterminate"
                      v-model="selAllFlag"
                      @change="handleSelectAll">全选</el-checkbox>
         <el-button style="margin-left:15px"
                    type="red"
                    size="small"
-                   @click="deleteBatch">删除</el-button>
+                   @click="deleteBatch">批量删除</el-button>
       </div>
     </div>
 
@@ -263,61 +264,7 @@ export default {
     ...mapGetters(['clientHeight'])
   },
   methods: {
-    handleSelectAll (selectAllFlag) {
-      this.$refs.ref_table.clearSelection();
-      if (selectAllFlag) {
-        this.tableData.forEach(row => {
-          this.$refs.ref_table.toggleRowSelection(row);
-        });
-      }
-    },
-    deleteBatch () {
-      if (this.selection.length > 0) {
-        this.$confirm("确认删除选择的小区?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.deleteCommunityBatch()
-          })
-          .catch(err => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
 
-          });
-      } else {
-        this.$message.warning('请先选择要删除的小区')
-      }
-    },
-    selectAll (selection) {
-      this.selection = selection
-
-      if (selection.length > 0) {
-        this.selAllFlag = true
-      } else {
-        this.selAllFlag = false
-      }
-
-    },
-    selectionChange (selection) {
-      this.selection = selection
-
-      if (selection.length === this.tableData.length) {
-        this.selAllFlag = true
-        this.isIndeterminate = false
-      } else if (selection.length > 0) {
-        this.selAllFlag = false
-        this.isIndeterminate = true
-      } else {
-        this.selAllFlag = false
-        this.isIndeterminate = false
-      }
-    },
     handleSearch () {
       this.loadTable()
     },
@@ -326,7 +273,7 @@ export default {
       if (fromTree) {
         this.agencyObj = treeObj
       }
-      console.log(this.agencyObj)
+
       const url = "/gov/org/neighborhood/neighborhoodlist"
 
       let params = {
@@ -391,6 +338,62 @@ export default {
       this.$emit('refreshTree')
     },
 
+    handleSelectAll (selectAllFlag) {
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          this.$refs.ref_table.toggleRowSelection(row);
+        });
+      }
+    },
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("确认删除选择的小区?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteCommunityBatch()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+      } else {
+        this.$message.warning('请先选择要删除的小区')
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection
+
+      if (selection.length > 0) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+    selectionChange (selection) {
+      this.selection = selection
+
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true
+        this.isIndeterminate = false
+      } else if (selection.length > 0) {
+        this.selAllFlag = false
+        this.isIndeterminate = true
+      } else {
+        this.selAllFlag = false
+        this.isIndeterminate = false
+      }
+    },
+
     async handleDelete (row) {
 
       this.$confirm("确认删除?", "提示", {
@@ -413,10 +416,18 @@ export default {
     },
 
     async deleteCommunityBatch () {
-      const url = "/gov/org/neighborhood/neighborhooddel"
+      let ids = []
+      console.log(this.selection)
+      this.selection.forEach(element => {
+
+        ids.push(element.neighborHoodId)
+      });
+
+      const url = "/gov/org/house/delete"
 
       let params = {
-        neighborHoodId: row.neighborHoodId
+        type: 'neighborHood',
+        ids: ids
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -428,6 +439,13 @@ export default {
         });
         this.$emit('refreshTree')
         this.loadTable()
+      } else if (code > 8000) {
+        // this.$message({
+        //   type: "success",
+        //   message: msg
+        // });
+        this.$emit('refreshTree')
+        this.loadTable()
       } else {
         this.$message.error(msg)
       }
@@ -681,70 +699,5 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/buttonstyle.scss";
-.div_search {
+@import "@/assets/scss/modules/visual/communityManage.scss";
-  display: flex;
-
-  .resi-cell {
-    display: flex;
-    align-items: center;
-    .resi-cell-label {
-      width: 70px;
-      box-sizing: border-box;
-      margin-right: 15px;
-      text-align: right;
-      // line-height: 32;
-    }
-
-    .resi-cell-input {
-      width: 180px;
-    }
-  }
-}
-
-.div_table {
-  margin-top: 20px;
-  position: relative;
-}
-.div_del {
-  position: absolute;
-  left: 10px;
-  bottom: 0;
-}
-.div_search {
-  display: flex;
-
-  .resi-cell {
-    display: flex;
-    align-items: center;
-    .resi-cell-label {
-      width: 70px;
-      box-sizing: border-box;
-      margin-right: 15px;
-      text-align: right;
-      // line-height: 32;
-    }
-
-    .resi-cell-input {
-      width: 180px;
-    }
-  }
-}
-
-.div_btn {
-  display: flex;
-  margin-top: 20px;
-
-  .btn_upload {
-    margin-left: 10px;
-    display: flex;
-  }
-}
-
-.el-row {
-  /* margin-bottom: 20px; */
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10px;
-  margin-right: 50px;
-}
 </style>

src/views/modules/base/community/roomTable.vue

@@ -64,12 +64,18 @@
     </div>
 
     <div class="div_table">
-      <el-table :data="tableData"
+      <el-table ref="ref_table"
+                :data="tableData"
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 v-loading="tableLoading"
                 border
                 :height="tableHeight"
-                style="width: 100%">
+                style="width: 100%"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         width="55">
+        </el-table-column>
         <el-table-column prop="houseName"
                          label="房屋名称"
                          width="120">
@@ -141,6 +147,18 @@
                        :total="total">
         </el-pagination>
       </div>
+
+      <div v-if="tableData.length>0"
+           class="div_del">
+        <el-checkbox :indeterminate="isIndeterminate"
+                     v-model="selAllFlag"
+                     @change="handleSelectAll">全选</el-checkbox>
+        <el-button style="margin-left:15px"
+                   type="red"
+                   size="small"
+                   @click="deleteBatch">批量删除</el-button>
+      </div>
+
     </div>
 
     <!-- 修改弹出框 -->
@@ -175,6 +193,8 @@ export default {
       pageSize: 20,
       pageNo: 0,
       tableLoading: true,
+      selAllFlag: false,
+      isIndeterminate: false,//复选框的不确定状态
 
       agencyObj: {},//树所选的小区对象
       ownerName: '',
@@ -274,6 +294,62 @@ export default {
       this.loadTable()
     },
 
+    handleSelectAll (selectAllFlag) {
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          this.$refs.ref_table.toggleRowSelection(row);
+        });
+      }
+    },
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("确认删除选择的房屋?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteCommunityBatch()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+      } else {
+        this.$message.warning('请先选择要删除的房屋')
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection
+
+      if (selection.length > 0) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+    selectionChange (selection) {
+      this.selection = selection
+
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true
+        this.isIndeterminate = false
+      } else if (selection.length > 0) {
+        this.selAllFlag = false
+        this.isIndeterminate = true
+      } else {
+        this.selAllFlag = false
+        this.isIndeterminate = false
+      }
+    },
+
     async handleDelete (row) {
 
       this.$confirm("确认删除?", "提示", {
@@ -297,6 +373,41 @@ export default {
 
     },
 
+    async deleteCommunityBatch () {
+      let ids = []
+      this.selection.forEach(element => {
+
+        ids.push(element.houseId)
+      });
+
+      const url = "/gov/org/house/delete"
+
+      let params = {
+        type: 'house',
+        ids: ids
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else if (code > 8000) {
+        // this.$message({
+        //   type: "success",
+        //   message: msg
+        // });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
     async deleteRoom (row) {
       const url = "/gov/org/house/housedel"
 
@@ -502,58 +613,5 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/buttonstyle.scss";
-.div_search {
+@import "@/assets/scss/modules/visual/communityManage.scss";
-  display: flex;
-
-  .resi-cell {
-    display: flex;
-    align-items: center;
-    .resi-cell-label {
-      width: 70px;
-      box-sizing: border-box;
-      margin-right: 15px;
-      text-align: right;
-      // line-height: 32;
-    }
-
-    .resi-cell-input {
-      width: 180px;
-    }
-  }
-}
-
-.div_table {
-  margin-top: 20px;
-}
-.div_search {
-  display: flex;
-
-  .resi-cell {
-    display: flex;
-    align-items: center;
-    .resi-cell-label {
-      width: 70px;
-      box-sizing: border-box;
-      margin-right: 15px;
-      text-align: right;
-      // line-height: 32;
-    }
-
-    .resi-cell-input {
-      width: 180px;
-    }
-  }
-}
-
-.div_btn {
-  margin-top: 20px;
-}
-
-.el-row {
-  /* margin-bottom: 20px; */
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10px;
-  margin-right: 50px;
-}
 </style>

src/views/modules/communityParty/elegant/index.vue

@@ -226,7 +226,7 @@ export default {
   data() {
     return {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-      importBtnTitle: '导入人员数据',
+      importBtnTitle: '导入数据',
       importLoading: false,
       exportBtn: false,
       exportBtnTitle: '导出',
@@ -424,7 +424,7 @@ export default {
       //     this.$message.error('导入失败')
       // })
       this.importLoading = false
-      this.importBtnTitle = '导入人员数据'
+      this.importBtnTitle = '导入数据'
       this.$refs.upload.clearFiles()
     },
     async handleExport() {

src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue

@@ -18,6 +18,7 @@
                        placeholder="全部"
                        clearable>
               <el-option v-for="item in gridList"
+                         @click.native="handleChangeGrid"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value">
@@ -33,6 +34,7 @@
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in placeTypeList"
+                         @click.native="handleChangeType"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value">
@@ -205,11 +207,26 @@ export default {
       this.endLoading()
     },
 
+    //改变场所区域
+    handleChangeGrid () {
+      this.formData.placeOrgId = ''
+      this.loadPlaces()
+    },
+
+    //改变场所类型
+    handleChangeType () {
+      this.formData.placeOrgId = ''
+      this.loadPlaces()
+    },
+
+
     //加载场所
     async loadPlaces () {
       const url = '/gov/org/placeorg/getlist'
 
       let params = {
+        gridId: this.formData.gridId,//场所区域【网格Id】	
+        ninePlaceVal: this.formData.ninePlaceVal,//场所类型【九小场所Value值】	
         isPage: false
       }
 
@@ -223,6 +240,7 @@ export default {
       }
     },
 
+
     //加载分队
     async loadTeams () {
       const url = '/gov/org/placepatrolteam/getlist'