Merge branch 'master' into shibei_master

src/views/modules/cabaseinfo/caloudong.vue

@@ -2,6 +2,14 @@
   <div class="mod-axis__caLoudong}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属网格" prop="gridId">
+          <el-cascader
+            :options="caLouDongOptions"
+            :props="{ checkStrictly: true }"
+            clearable
+            @change="handlePartyChange">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="楼宇名称" prop="buildingName">
           <el-input
             v-model="dataForm.buildingName"
@@ -41,6 +49,27 @@
           align="center"
           width="50"
         ></el-table-column>
+        <el-table-column
+         :show-overflow-tooltip="true"
+          prop="streetName"
+          label="街道"
+          header-align="center"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="comName"
+          label="社区"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="gridName"
+          label="网格"
+          header-align="center"
+          align="center"
+           :show-overflow-tooltip="true">
+        </el-table-column>
         <el-table-column
           prop="buildingName"
           label="楼宇名称"
@@ -145,9 +174,41 @@ export default {
       dataForm: {
         buildingName: "",
         communityName: "",
+         gridId:""
       },
+      caLouDongOptions:[]
     };
   },
+  methods:{
+    getloudongOptions(){
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
+        if(resp.data.code === 0){
+          this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+        }
+      }).catch(error => {
+        this.$message.error(error)
+      })     
+  },
+  removeEmptySubOrgList (orgArray) {
+      orgArray.forEach((orgInfo) => {
+        if (orgInfo && orgInfo.children) {
+          if (orgInfo.children.length === 0) {
+              orgInfo.children = undefined
+          } else {
+              this.removeEmptySubOrgList(orgInfo.children)
+          }
+        }
+      })
+      return orgArray;
+    },
+  handlePartyChange(val) {
+      console.log('val------pp', val)
+      this.dataForm.gridId = val[val.length - 1]
+    },
+  },
+created(){
+    this.getloudongOptions()
+  },
   components: {
     AddOrUpdate,
   },

src/views/modules/cabaseinfo/capingfang.vue

@@ -2,6 +2,14 @@
   <div class="mod-axis__caPingfang}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属网格" prop="gridId">
+          <el-cascader
+            :options="caLouDongOptions"
+            :props="{ checkStrictly: true }"
+            clearable
+            @change="handlePartyChange">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="楼宇名称" prop="buildingName">
           <el-input
             v-model="dataForm.buildingName"
@@ -41,6 +49,27 @@
           align="center"
           width="50"
         ></el-table-column>
+        <el-table-column
+          prop="streetName"
+          label="街道"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="comName"
+          label="社区"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="gridName"
+          label="网格"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
         <el-table-column
           prop="buildingName"
           label="楼宇名称"
@@ -145,9 +174,41 @@ export default {
       dataForm: {
         buildingName: "",
         communityName: "",
+        gridId:""
       },
+      caLouDongOptions:[]
     };
   },
+  methods:{
+    getloudongOptions(){
+      this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
+        if(resp.data.code === 0){
+          this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+        }
+      }).catch(error => {
+        this.$message.error(error)
+      })     
+  },
+  removeEmptySubOrgList (orgArray) {
+      orgArray.forEach((orgInfo) => {
+        if (orgInfo && orgInfo.children) {
+          if (orgInfo.children.length === 0) {
+              orgInfo.children = undefined
+          } else {
+              this.removeEmptySubOrgList(orgInfo.children)
+          }
+        }
+      })
+      return orgArray;
+    },
+  handlePartyChange(val) {
+      console.log('val------pp', val)
+      this.dataForm.gridId = val[val.length - 1]
+    },
+  },
+created(){
+    this.getloudongOptions()
+  },
   components: {
     AddOrUpdate,
   },

src/views/modules/cabaseinfo/carental.vue

@@ -2,6 +2,14 @@
   <div class="mod-axis__caRental}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属网格" prop="gridId">
+          <el-cascader
+            :options="caLouDongOptions"
+            :props="{ checkStrictly: true }"
+            clearable
+            @change="handlePartyChange">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="房屋编号" prop="houseName">
           <el-input
             v-model="dataForm.houseName"
@@ -48,6 +56,27 @@
           align="center"
           width="50"
         ></el-table-column>
+        <el-table-column
+          prop="streetName"
+          label="街道"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="comName"
+          label="社区"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="gridName"
+          label="网格"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
         <el-table-column
           prop="houseName"
           label="房屋编号"
@@ -146,9 +175,41 @@ export default {
         houseName: "",
         residentName: "",
         renterName: "",
+        gridId:""
       },
+      caLouDongOptions:[]
     };
   },
+  methods:{
+    getloudongOptions(){
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
+        if(resp.data.code === 0){
+          this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+        }
+      }).catch(error => {
+        this.$message.error(error)
+      })     
+  },
+  removeEmptySubOrgList (orgArray) {
+      orgArray.forEach((orgInfo) => {
+        if (orgInfo && orgInfo.children) {
+          if (orgInfo.children.length === 0) {
+              orgInfo.children = undefined
+          } else {
+              this.removeEmptySubOrgList(orgInfo.children)
+          }
+        }
+      })
+      return orgArray;
+    },
+  handlePartyChange(val) {
+      console.log('val------pp', val)
+      this.dataForm.gridId = val[val.length - 1]
+    },
+  },
+created(){
+    this.getloudongOptions()
+  },
   components: {
     AddOrUpdate,
   },

src/views/modules/cabaseinfo/caresident.vue

@@ -2,6 +2,14 @@
   <div class="mod-axis__caResident}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属网格" prop="gridId">
+          <el-cascader
+            :options="caLouDongOptions"
+            :props="{ checkStrictly: true }"
+            clearable
+            @change="handlePartyChange">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="身份证号" prop="idCard">
           <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
         </el-form-item>
@@ -44,6 +52,27 @@
           align="center"
           width="50"
         ></el-table-column>
+        <el-table-column
+          prop="streetName"
+          label="街道"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="comName"
+          label="社区"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="gridName"
+          label="网格"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
         <el-table-column
           prop="idCard"
           label="证件号码（公民身份证号）"
@@ -137,9 +166,41 @@ export default {
         idCard: "",
         residentName: "",
         telephone: "",
+        gridId:""
       },
+      caLouDongOptions:[]
     };
   },
+  methods:{
+    getloudongOptions(){
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
+        if(resp.data.code === 0){
+          this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+        }
+      }).catch(error => {
+        this.$message.error(error)
+      })     
+  },
+  removeEmptySubOrgList (orgArray) {
+      orgArray.forEach((orgInfo) => {
+        if (orgInfo && orgInfo.children) {
+          if (orgInfo.children.length === 0) {
+              orgInfo.children = undefined
+          } else {
+              this.removeEmptySubOrgList(orgInfo.children)
+          }
+        }
+      })
+      return orgArray;
+    },
+  handlePartyChange(val) {
+      console.log('val------pp', val)
+      this.dataForm.gridId = val[val.length - 1]
+    },
+  },
+created(){
+    this.getloudongOptions()
+  },
   components: {
     AddOrUpdate,
   },

src/views/modules/cabaseinfo/carotators.vue

@@ -2,6 +2,14 @@
   <div class="mod-axis__caRotators}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属网格" prop="gridId">
+          <el-cascader
+            :options="caLouDongOptions"
+            :props="{ checkStrictly: true }"
+            clearable
+            @change="handlePartyChange">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="身份证号" prop="idCard">
           <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
         </el-form-item>
@@ -44,6 +52,27 @@
           align="center"
           width="50"
         ></el-table-column>
+        <el-table-column
+          prop="streetName"
+          label="街道"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="comName"
+          label="社区"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="gridName"
+          label="网格"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
         <el-table-column
           prop="idCard"
           label="公民身份证号"
@@ -131,9 +160,41 @@ export default {
         idCard: "",
         residentName: "",
         telephone: "",
+        gridId:""
       },
+       caLouDongOptions:[]
     };
   },
+  methods:{
+    getloudongOptions(){
+      this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
+        if(resp.data.code === 0){
+          this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+        }
+      }).catch(error => {
+        this.$message.error(error)
+      })     
+  },
+  removeEmptySubOrgList (orgArray) {
+      orgArray.forEach((orgInfo) => {
+        if (orgInfo && orgInfo.children) {
+          if (orgInfo.children.length === 0) {
+              orgInfo.children = undefined
+          } else {
+              this.removeEmptySubOrgList(orgInfo.children)
+          }
+        }
+      })
+      return orgArray;
+    },
+  handlePartyChange(val) {
+      console.log('val------pp', val)
+      this.dataForm.gridId = val[val.length - 1]
+    },
+  },
+created(){
+    this.getloudongOptions()
+  },
   components: {
     AddOrUpdate,
   },