From 45aa1e5f64ccb91457f94d77730095c677d3ab76 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 8 Mar 2024 16:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue           |  9 +--
 src/views/modules/portrayal/jumin/index.vue | 70 +++++++++++----------
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 07e6ef5ce..658131db1 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -379,7 +379,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="6" v-if="form.familyInfoDto.elderlyFlag == 1">
-                            <el-form-item label="与赡养人关系">
+                            <el-form-item label="与赡养人关系" label-width="105px">
                                 <el-select v-model="form.familyInfoDto.elderlyRelation" placeholder="请选择" size="small"
                                     class="list_item_width_1" clearable>
                                     <el-option v-for="(item, index) in dicts.houseHolderRelList" :key="index"
@@ -997,7 +997,6 @@ export default {
                 },
             ],
             workInfoDtoId:null,
-
             idTypeList,
             genderList,
             hasOptions,
@@ -1147,7 +1146,6 @@ export default {
                             }
                         }
                         this.workInfoDtoId=this.form.workInfoDto.id;
-                        console.log(this.workInfoDtoId);
                         return Promise.all(promises);
                     } else if (res.data.code >= 8000) {
                         this.$message.error(res.data.msg);
@@ -1393,6 +1391,7 @@ export default {
         },
         handelClickMarriage() {
             this.form.familyInfoDto.spouseSituation = null
+            // console.log(this.form.familyInfoDto,'更改婚姻情况');
         },
         handelClickelderly() {
             this.form.familyInfoDto.elderlyRelation = null
@@ -1571,7 +1570,9 @@ export default {
                 if (!this.form[changPid]) {
                     this.$set(this.form, changPid, {});
                 }
-                this.$set(this.form[changPid], changId, _form[changPid][changId]);
+                if(changPid){
+                    this.$set(this.form[changPid], changId, _form[changPid][changId]);
+                }
             }
             for (let i in this.footerInputList) {
                 if (this.footerInputList[i].id === changPid) {
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index fad656dd4..0281697e5 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -321,13 +321,14 @@
           <span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
             {{ careerStatusText() }}
           </span>
+          <span v-else>--</span>
         </el-col>
         <el-col
           :span="6"
           class="f-flex"
-          v-if="
-            resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5
+          v-if=" resiDetailObj.workInfoDto && 
+          ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5)
           "
         >
           <div class="f-label">工作单位：</div>
@@ -342,10 +343,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if="
+          v-if=" 
+            resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) &&
-            resiDetailObj.workInfoDto
+              resiDetailObj.workInfoDto.careerStatus == 6)
           "
         >
           <div class="f-label">原工作单位：</div>
@@ -362,9 +363,9 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if="
-            resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5
+          v-if=" resiDetailObj.workInfoDto && 
+          ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5)
           "
         >
           <div class="f-flex">
@@ -381,10 +382,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if="
+          v-if="resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) &&
-            resiDetailObj.workInfoDto
+              resiDetailObj.workInfoDto.careerStatus == 6) 
+            
           "
         >
           <div class="f-label">失业时间：</div>
@@ -399,9 +400,9 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if="
-            resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5
+          v-if=" resiDetailObj.workInfoDto && 
+          ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5)
           "
         >
           <div class="f-flex">
@@ -418,10 +419,10 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if="
+          v-if="resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) &&
-            resiDetailObj.workInfoDto
+              resiDetailObj.workInfoDto.careerStatus == 6) 
+            
           "
         >
           <div class="f-label">失业证号：</div>
@@ -437,9 +438,10 @@
           :span="6"
           class="f-flex"
           v-if="
+          resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) &&
-            resiDetailObj.workInfoDto
+              resiDetailObj.workInfoDto.careerStatus == 6) 
+            
           "
         >
           <div class="f-label">失业原因：</div>
@@ -454,9 +456,9 @@
         <el-col
           :span="6"
           class="f-flex"
-          v-if="
-            resiDetailObj.workInfoDto.careerStatus >= 1 &&
-            resiDetailObj.workInfoDto.careerStatus <= 5
+          v-if=" resiDetailObj.workInfoDto && 
+          ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
+            resiDetailObj.workInfoDto.careerStatus <= 5)
           "
         >
           <div class="f-label">有无赡养人：</div>
@@ -476,9 +478,10 @@
           :span="6"
           class="f-flex"
           v-if="
+           resiDetailObj.workInfoDto &&
             (resiDetailObj.workInfoDto.careerStatus == 0 ||
-              resiDetailObj.workInfoDto.careerStatus == 6) &&
-            resiDetailObj.workInfoDto
+              resiDetailObj.workInfoDto.careerStatus == 6) 
+           
           "
         >
           <div class="f-label" style="width: 113px">再就业优惠证号：</div>
@@ -495,9 +498,9 @@
         type="flex"
         class="f-m-top23"
         v-if="
+          resiDetailObj.workInfoDto &&
           (resiDetailObj.workInfoDto.careerStatus == 0 ||
-            resiDetailObj.workInfoDto.careerStatus == 6) &&
-          resiDetailObj.workInfoDto
+            resiDetailObj.workInfoDto.careerStatus == 6) 
         "
       >
         <el-col :span="6" class="f-flex">
@@ -512,7 +515,7 @@
         </el-col>
         <el-col :span="6" class="f-flex">
           <div class="f-label" style="width: 113px">是否领取失业金：</div>
-          <span class="f-left8 f-font-color">
+          <span class="f-left8 f-font-color" v-if=" resiDetailObj.unemployedDto">
             {{
               resiDetailObj.unemployedDto.unempCompensationFlag != null
                 ? resiDetailObj.unemployedDto.unempCompensationFlag === 0
@@ -523,10 +526,11 @@
                 : "--"
             }}
           </span>
+          <span v-else>--</span>
         </el-col>
         <el-col :span="6" class="f-flex">
           <div class="f-label" style="width: 113px">是否就业困难对象：</div>
-          <span class="f-left8 f-font-color">
+          <span class="f-left8 f-font-color" v-if=" resiDetailObj.unemployedDto">
             {{
               resiDetailObj.unemployedDto.employmentHardFlag != null
                 ? resiDetailObj.unemployedDto.employmentHardFlag === 0
@@ -537,6 +541,8 @@
                 : "--"
             }}
           </span>
+          <span v-else>--</span>
+
         </el-col>
         <el-col :span="6" class="f-flex">
           <div class="f-label" style="width: 113px">劳动就业愿望：</div>
@@ -552,10 +558,10 @@
           </span>
         </el-col>
       </el-row>
-      <el-row v-if="
+      <el-row v-if=" resiDetailObj.workInfoDto &&
           (resiDetailObj.workInfoDto.careerStatus == 0 ||
-            resiDetailObj.workInfoDto.careerStatus == 6) &&
-          resiDetailObj.workInfoDto
+            resiDetailObj.workInfoDto.careerStatus == 6) 
+          
         "  class="f-m-top23">
         <el-col
           :span="6"