居民分类字段名统一

src/views/business/resi-category-map.js

@@ -1,8 +1,8 @@
 export default {
   PARTY_FLAG: "党员",
-  SUBSISTENCE_ALLOWANCE_FLAG: "低保户",
+  SUBSISTENCE_ALLOWANCE_FLAG: "低保人员",
-  ENSURE_HOUSE_FLAG: "保障房",
+  ENSURE_HOUSE_FLAG: "保障房人员",
-  UNEMPLOYED_FLAG: "失业",
+  UNEMPLOYED_FLAG: "失业人员",
   FERTILE_WOMAN_FLAG: "育龄妇女",
   VETERAN_FLAG: "退役军人",
   UNITED_FRONT_FLAG: "统战人员",

src/views/components/resiForm.vue

@@ -23,7 +23,9 @@
 
               </el-form-item>
               <el-form-item label="所属房屋"
-                            label-width="100px">
+                            label-width="100px"
+                            :required="true"
+                            >
                   <div class="f-flex">
                       <el-form-item prop="villageId" 
                                     class="u-item-width-communitycascader f-bto0" 

src/views/components/resiInfo.vue

@@ -70,7 +70,7 @@
                <el-col :span="24" class="f-flex">
                 <div class="f-label">居民分类:</div> 
                 <section class="f-left15 f-flex  f-flex1" v-if="resiDetailObj.categoryInfo&& resiClass" style="flex: 1;flex-wrap: wrap;">
-                  <span class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.bereavedPersonFlag==1">失独老人  </span> 
+                  <span class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.bereavedPersonFlag==1">特扶人员  </span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.chronicDiseaseFlag==1">慢病</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.dementedFlag==1">失智老人</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.disabilityFlag==1"> 残疾</span>
@@ -85,10 +85,10 @@
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.petitionOfficerFlag==1">信访人员</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.seriousIllnessFlag==1"> 大病</span>
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.specialCrowdFlag==1">特殊人群</span> 
-                   <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.subsistenceAllowanceFlag==1">低保</span> 
+                   <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.subsistenceAllowanceFlag==1">低保人员</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.unitedFrontFlag==1">统战人员</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.tenantFlag==1">租户</span>
-                   <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.unemployedFlag==1">失业</span> 
+                   <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.unemployedFlag==1">失业人员</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16"  v-show="resiDetailObj.categoryInfo.veteranFlag==1">退役军人</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16"  v-show="resiDetailObj.categoryInfo.volunteerFlag==1">志愿者</span> 
                

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

@@ -70,7 +70,7 @@
               >
               </el-input>
             </el-form-item>
-            <el-form-item label="联系方式" prop="ownerPhone">
+            <el-form-item label="联系电话" prop="ownerPhone">
               <el-input
                 v-model="ownerPhone"
                 class="u-item-width-normal"
@@ -694,8 +694,10 @@ export default {
       this.pageSize = 10;
       this.pageNo = 1;
       // this.handleNodeClick(this.selObj)
-      // this.loadTable()
+	this.$nextTick(()=>{
-    },
+		this.$refs.ref_buildingTable.loadTable('search',this.selObj)
+	})
+	},
 
     async loadOpenNode() {
       const url = "/gov/org/building/tree-ids";

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

@@ -481,7 +481,7 @@ export default {
     async loadTable (source, treeObj) {
       this.source = source;
       this.tableLoading = true;
-
+      console.log(treeObj,'see');
       if (source === "tree") {
         //来源于tree，查询数据清空
         this.sortType = "asc";

src/views/modules/base/resi.vue

@@ -241,7 +241,7 @@
 								}}
 								{{
 									scope.row.categoryInfo.ensureHouseFlag == 1
-										? "保障房 "
+										? "保障房人员 "
 										: ""
 								}}
 								{{
@@ -289,7 +289,7 @@
 								{{
 									scope.row.categoryInfo
 										.subsistenceAllowanceFlag == 1
-										? "低保 "
+										? "低保人员 "
 										: ""
 								}}
 								{{

src/views/modules/home/notice.vue

@@ -201,6 +201,7 @@ export default {
 			&:hover {
 				.item-title {
 					color: #0056d6;
+					cursor: pointer;
 				}
 				.item-btn-clear {
 					display: block;