小区，楼栋编码

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

@@ -24,6 +24,21 @@
                     v-model="dataForm.buildingName">
           </el-input>
         </el-form-item>
+        <el-form-item label="楼栋编码"
+                      prop="coding"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    maxlength="50"
+                    placeholder="请输入楼栋编码"
+                    v-model="dataForm.coding">
+          
+          </el-input>
+          <el-button style="margin-left: 10px"
+                       type="primary"
+                       size="small"
+                       @click="handleCode">生成</el-button>
+        </el-form-item>
         <el-form-item label="楼栋类型"
                       prop="type"
                       label-width="150px"
@@ -73,6 +88,16 @@
                            :max="9999"
                            label="总户数"></el-input-number>
         </el-form-item>
+        <el-form-item label="人口数"
+                      style="display: block"
+                      prop="realPerson"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="dataForm.realPerson"
+                           :min="0"
+                           :max="9999"
+                           label="人口数"></el-input-number>
+        </el-form-item>
         <el-form-item label="楼长姓名"
                       prop="buildingLeaderName"
                       label-width="150px"
@@ -128,6 +153,16 @@
           </div>
 
         </el-form-item>
+        <el-form-item label="楼栋地址"
+                      prop="coordinatePosition"
+                      label-width="150px"
+                      style="display: block">
+          <!-- <span>{{ dataForm.coordinatePosition }}</span> -->
+          <el-input class="item_width_1"
+                    placeholder="请选择楼栋地址"
+                    disabled
+                    v-model="dataForm.coordinatePosition" />
+        </el-form-item>
       </el-form>
 
     </div>
@@ -169,9 +204,13 @@ export default {
         totalUnitNum: 1,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//总户数	
+        realPerson: 0, 
         buildingLeaderName: '',//楼长姓名
         buildingLeaderMobile: '',//楼长电话
         type: '',//房屋类型
+        coordinatePosition: '',
+        sysCoding: '',
+        coding: '',
         location: '', //坐标位置
         longitude: '', //经度
         latitude: '' //纬度
@@ -199,7 +238,8 @@ export default {
       if (row) {
         this.dataForm = JSON.parse(JSON.stringify(row))
         this.buildingId = this.dataForm.buildingId
-        this.buildType = this.dataForm.buildingTypeKey
+        // this.buildType = this.dataForm.buildingTypeKey
+        this.buildType = this.dataForm.type
 
         map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
         this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
@@ -226,6 +266,18 @@ export default {
 
       })
     },
+    async handleCode() {
+      const { data, code, msg } = await requestPost(
+        "/gov/org/houseInformation/getBuildingCoding/" + this.dataForm.neighborHoodId);
+      console.log('data----', data)
+      console.log('code----', code)
+      console.log('msg----', msg)
+      if (msg == "success" && code == 0) {
+        this.dataForm.coding = data.coding
+        this.dataForm.sysCoding = data.sysCoding
+        
+      } 
+    },
     async addBuild () {
       if (this.dataForm.buildingLeaderMobile) {
         const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
@@ -328,12 +380,14 @@ export default {
           let { data } = result
           if (Array.isArray(data) && data.length > 0) {
             const {
-              location: { lat, lng }
+              location: { lat, lng },
+              address
             } = data[0]
             map.setCenter(new TMap.LatLng(lat, lng))
             this.setMarker(lat, lng)
             this.dataForm.latitude = lat
             this.dataForm.longitude = lng
+            this.dataForm.coordinatePosition = address
           } else {
             this.$message.error('未检索到相关位置坐标')
           }
@@ -405,6 +459,9 @@ export default {
         totalUnitNum: [
           { required: true, message: '单元数不能为空', trigger: 'blur' }
         ],
+        coding: [
+          { required: true, message: '楼栋编码不能为空', trigger: 'blur' }
+        ]
         // totalFloorNum: [
         //   { required: true, message: '层数不能为空', trigger: 'blur' }
         // ],

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

@@ -360,11 +360,12 @@ export default {
       this.formShow = false
     },
 
-    handleDetail (row) {
+    async handleDetail (row) {
       this.formTitle = '楼栋详情'
       this.formShow = true
+      const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+        this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
       })
     },
 
@@ -376,11 +377,12 @@ export default {
       })
     },
 
-    handleEdit (row) {
+    async handleEdit (row) {
       this.formTitle = '修改楼栋'
       this.formShow = true
+      const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+        this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
       })
     },
 
@@ -508,6 +510,18 @@ export default {
         this.$message.error(msg)
       }
     },
+    async detail (row) {
+      const url = "/gov/org/houseInformation/getBuildingDetail/" + row.buildingId
+
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        return data
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
     //导出表格
     async handleExport () {

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

@@ -41,6 +41,21 @@
                       v-model="dataForm.neighborHoodName">
             </el-input>
           </el-form-item>
+          <el-form-item label="小区编码"
+                      prop="coding"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    maxlength="50"
+                    placeholder="请输入楼栋编码"
+                    v-model="dataForm.coding">
+          
+          </el-input>
+          <el-button style="margin-left: 10px"
+                       type="primary"
+                       size="small"
+                       @click="handleCode">生成</el-button>
+        </el-form-item>
           <el-form-item label="关联物业"
                         prop="propertyId"
                         label-width="150px"
@@ -62,6 +77,16 @@
                        size="small"
                        @click="handleAddProperty">添加物业</el-button>
           </el-form-item>
+          <el-form-item label="实有楼栋"
+                      style="display: block"
+                      prop="realBuilding"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="dataForm.realBuilding"
+                           :min="0"
+                           :max="9999"
+                           label="总户数"></el-input-number>
+        </el-form-item>
           <el-form-item label="详细地址"
                         prop="address"
                         label-width="150px"
@@ -181,7 +206,10 @@ export default {
         remark: '', //备注【最大500字】
         location: '', //坐标位置
         longitude: '', //经度
-        latitude: '' //纬度
+        latitude: '', //纬度
+        realBuilding: 0,
+        coding: '',
+        sysCoding: ''
       },
 
       propertyFormShow: false,
@@ -285,6 +313,7 @@ export default {
       this.formType = type
       if (row) {
         this.dataForm = JSON.parse(JSON.stringify(row))
+        this.dataForm.neighborHoodId = this.dataForm.id
         this.neighborHoodId = this.dataForm.neighborHoodId
         map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
         this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
@@ -298,7 +327,16 @@ export default {
       await this.loadGrid()
       await this.loadProperty()
     },
-
+    async handleCode() {
+      if (!this.dataForm.gridId) return this.$message.error('请选择网格')
+      const { data, code, msg } = await requestPost(
+        "/gov/org/houseInformation/getNeighborHoodCoding/" + this.dataForm.gridId);
+      if (msg == "success" && code == 0) {
+        this.dataForm.coding = data.coding
+        this.dataForm.sysCoding = data.sysCoding
+        
+      } 
+    },
     //加载组织
     async loadAgency () {
       const url = '/epmetuser/customerstaff/staffbasicinfo'
@@ -489,6 +527,9 @@ export default {
         gridId: [
           { required: true, message: '所属网格不能为空', trigger: 'blur' }
         ],
+        coding: [
+          { required: true, message: '小区编码不能为空', trigger: 'blur' }
+        ],
         address: [
           { required: true, message: '详细地址不能为空', trigger: 'blur' }
         ],

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

@@ -356,11 +356,12 @@ export default {
       this.formShow = false
     },
 
-    handleDetail (row) {
+    async handleDetail (row) {
       this.formTitle = '小区详情'
       this.formShow = true
+      const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+        this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
       })
     },
 
@@ -371,7 +372,18 @@ export default {
         this.$refs.ref_form.initForm('add', null, this.agencyObj)
       })
     },
+    async detail (row) {
+      const url = "/gov/org/houseInformation/neighborhoodDetail/" + row.neighborHoodId
 
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        return data
+      } else {
+        this.$message.error(msg)
+      }
+    },
     // 补全一房一码点击事件
     async handleYhymInfo () {
       this.yhymLoading = true
@@ -400,11 +412,12 @@ export default {
       }
     },
 
-    handleEdit (row) {
+    async handleEdit (row) {
       this.formTitle = '修改小区'
       this.formShow = true
+      const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+        this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
       })
     },
 

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

@@ -11,7 +11,7 @@
         <el-form-item label="所属楼栋"
                       label-width="150px"
                       style="display: block">
-          <span>{{ dataForm.neighborHoodName }}{{dataForm.buildingName}}</span>
+          <span>{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</span>
         </el-form-item>
 
         <el-form-item label="单元号"
@@ -39,7 +39,21 @@
                     v-model="dataForm.doorName">
           </el-input>
         </el-form-item>
-
+        <el-form-item v-if="formType != 'detail'" label="房屋编码"
+                      prop="coding"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    maxlength="50"
+                    placeholder="请输入楼栋编码"
+                    v-model="dataForm.coding">
+          
+          </el-input>
+          <el-button style="margin-left: 10px"
+                       type="primary"
+                       size="small"
+                       @click="handleCode">生成</el-button>
+        </el-form-item>
         <div v-if="formType === 'detail'">
           <el-form-item label="房屋编码"
                         prop="houseCode"
@@ -59,6 +73,16 @@
                target="_blank">下载</a>
           </div>
         </div>
+        <!-- <el-form-item label="居住人数"
+                      style="display: block"
+                      prop="realPerson"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="dataForm.realPerson"
+                           :min="0"
+                           :max="9999"
+                           label="居住人数"></el-input-number>
+        </el-form-item> -->
         <el-form-item label="房屋类型"
                       prop="houseType"
                       label-width="150px"
@@ -184,7 +208,10 @@ export default {
         ownerPhone: '', //联系方式
         ownerName: '', //房主名字
         ownerIdCard: '', //房主身份证
-        remark: ''
+        remark: '',
+        // realPerson: 0,
+        coding: '',
+        sysCoding: ''
       },
 
       keyWords: '',
@@ -203,6 +230,7 @@ export default {
       this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
       this.formType = type
+      console.log('agencyObj-----', agencyObj)
       if (row) {
 
         this.houseId = row.houseId
@@ -217,7 +245,7 @@ export default {
         // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
 
       } else {
-
+        
         this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
         this.dataForm.buildingId = this.agencyObj.id
       }
@@ -264,6 +292,16 @@ export default {
         this.$message.error(msg)
       }
     },
+    async handleCode() {
+      if (!this.dataForm.buildingUnitId) return this.$message.error('请选择单元')
+      const { data, code, msg } = await requestPost(
+        "/gov/org/houseInformation/getHouseCoding/" + this.dataForm.buildingUnitId);
+      if (msg == "success" && code == 0) {
+        this.dataForm.coding = data.coding
+        this.dataForm.sysCoding = data.sysCoding
+        
+      } 
+    },
 
     async handleComfirm () {
       this.btnDisable = true
@@ -382,6 +420,9 @@ export default {
         doorName: [
           { required: true, message: '门牌号不能为空', trigger: 'blur' }
         ],
+        coding: [
+          { required: true, message: '房屋编码不能为空', trigger: 'blur' }
+        ],
         houseType: [
           { required: true, message: '房屋类型不能为空', trigger: 'blur' }
         ],