Merge branch 'bug_mk' into preview

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

@@ -76,6 +76,13 @@
                 value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
               </el-date-picker>
             </el-form-item>
+            <el-form-item label="居住人数" prop="resiNumber">
+              <el-select v-model.trim="resiNumber" class="u-item-width-normal" placeholder="请选择" size="small" clearable>
+                <el-option v-for="(item,index) in 7" :key="index" :label="index"
+                  :value="index">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="remark" class="u-item-width-normal" size="small" clearable placeholder="请输入备注">
               </el-input>
@@ -190,7 +197,7 @@
         <room-table v-if="showRoomTable || selTreeObj.level === 'building'" :staffAgencyId="staffAgencyId"
           :showImportBtn="showImportBtn" :ownerName="ownerName" :ownerPhone="ownerPhone" :rentFlag="rentFlag"
           :purpose="purpose" :neighborHoodId="neighborHoodId" :buildingId="buildingId" :buildingUnitId="buildingUnitId"
-          :houseId="houseId" :remark="remark" :updateStartDate="updateStartDate" :updateEndDate="updateEndDate"
+          :houseId="houseId" :remark="remark" :updateStartDate="updateStartDate" :updateEndDate="updateEndDate" :resiNumber="resiNumber"
           ref="ref_buildingTable" @refreshTree="refreshTree"></room-table>
 
         <community-table v-if="selTreeObj.level !== 'building' &&
@@ -306,6 +313,7 @@ export default {
       remark: "",
       updateStartDate: "",
       updateEndDate: "",
+      resiNumber:"",
       showRoomTable: false,
       selObj: {},
       purposeArr: [
@@ -616,7 +624,7 @@ export default {
       this.buildingId = "";
       this.buildingUnitId = "";
       this.houseId = "";
-
+      this.resiNumber ="";
       this.pageSize = 10;
       this.pageNo = 1;
 

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

@@ -104,6 +104,8 @@
         </el-table-column>
         <el-table-column prop="ownerIdCard" label="证件号" header-align="left" align="left" width="170">
         </el-table-column>
+        <el-table-column prop="resiNumber" label="居住人数" header-align="left" align="left" width="100">
+        </el-table-column>
         <el-table-column prop="remark" label="备注" header-align="left" align="left" width="170">
         </el-table-column>
 
@@ -385,7 +387,6 @@ export default {
       //   this.agencyObj = treeObj
       // }
       // 接口在这里
-      console.log(this.buildingId, '1111');
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -403,6 +404,7 @@ export default {
         buildingId: this.buildingId,
         buildingUnitId: this.buildingUnitId,
         houseId: this.houseId,
+        resiNumber:this.resiNumber
       };
       const url = "/actual/base/communityHouse/listHouses";
 
@@ -997,6 +999,10 @@ export default {
       type: String,
       default: "",
     },
+    resiNumber:{
+      type: Number,
+      default: "",
+    }
   },
 };
 </script>