Merge branch 'feature_bug' into dev

src/assets/scss/pages/resiAdd.scss

@@ -52,18 +52,18 @@ h5 {
      color:#ff5107 ;
     }
 }
-.font-color-blue{
-    ::v-deep .el-form-item__label{
-     color:#3876f2;
-     position: relative;
-     &::before{
-        content: '*';
-        position: absolute;
-        top: 0px;
-        left: 16px;
-     }
-    }
-}
+// .font-color-blue{
+//     ::v-deep .el-form-item__label{
+//      color:#3876f2;
+//      position: relative;
+//      &::before{
+//         content: '*';
+//         position: absolute;
+//         top: 0px;
+//         left: 16px;
+//      }
+//     }
+// }
 .font-color-blue2{
     ::v-deep .el-form-item__label{
      &::before{

src/views/components/addResi.vue

@@ -162,7 +162,6 @@
                                 </el-button>
                                </div>
                                <div  class="flex_box">
-
                                 <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
                                     <el-select v-model.trim="form.resideInfoDtos[index].resiHouseRel" placeholder="请选择"
                                         size="small" class="list_item_width_1"
@@ -611,7 +610,7 @@ export default {
                         },
                         {
                             label: "高龄补助",
-                            check:'fourFont',
+                            // check:'fourFont',
                             itemType: "inputNum",
                             formName: "oldSubsidy",
                         },
@@ -866,7 +865,7 @@ export default {
                         },
                         {//2
                             label: "子女性别",
-                            check:'fourFont',
+                            // check:'fourFont',
                             itemType: "select1",
                             formName: "childGender",
                             opction: [
@@ -882,7 +881,7 @@ export default {
                         },
                         {
                             label: "子女死亡日期",
-                            check:'sixFont',
+                            // check:'sixFont',
                             itemType: "datepicker1",
                             formName: "certificateDate",
                             opction: [],
@@ -898,7 +897,7 @@ export default {
                         },
                         {
                             label: "子女伤残等级",
-                            check:'sixFont',
+                            // check:'sixFont',
                             itemType: "select1",
                             formName: "childDisabilityLevel",
                             opctionUrl: 'sys/dict/data/dictlist',

src/views/components/resiExpand/index.vue

@@ -256,7 +256,20 @@ export default {
             this.$emit('hideExpand', this.formType)
         },
         handleClickSUbmitExpand() {
-            this.$emit('submitExpand', this.form, this.formType)
+            console.log(this.formList);
+            console.log(this.form);
+            this.formList.forEach((group) => {
+                group.children.forEach((item) => {
+                    if (item.check && !this.form[group.id][item.formName] ||this.form[group.id][item.formName].length === 0) {
+                        this.$message.error(`${item.label}不能为空`);
+                        throw new Error(`${item.label}不能为空`);
+                    }
+                });
+            });
+            if (this.formType === 'add') {
+                this.form.id = this.form.partyOrgId;
+            }
+            // this.$emit('submitExpand', this.form, this.formType)
         },
         handlePartyOrgCascadarChange(selectedNode) {
             this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];

src/views/dataBoard/renfang/house/list.vue

@@ -178,7 +178,7 @@ export default {
       // this.displayedHouseId = item.houseId;
       // this.$router.push(`/homeDetails/index?id=${item.neighborHoodId}&buildingId=${item.buildingId}&unitId=${item.unitNumKey}`)
       console.log(item);
-      this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }`)
+      this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }&houseId=${item.houseId}`)
       
     },
 

src/views/modules/home/index.vue

@@ -165,12 +165,6 @@
                   <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="拓展不完整数" align="center" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'extNonIntegrity')">{{scope.row.extNonIntegratedNum}}</span>
-              </template>
-            </el-table-column>
-            
             <el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
               <template slot-scope="scope">
                   <span style="color:#989898;">{{scope.row.userName}}</span>

src/views/modules/portrayal/jumin/index.vue

@@ -26,7 +26,7 @@
           >
             <span>{{ item.name }}</span
             ><span
-            v-if="item.id != 'businessRecord' && item.id != 'updateRecord' "
+            v-if="item.id != 'businessRecord' && item.id != 'updateRecord'&& item.id != 'reside' && item.id != 'ext'"
               :class="{
                 incomplete: item.filledQty != item.totalQty && index != active,
                 full: item.filledQty == item.totalQty,