Merge branch 'feature_bug' into dev

src/views/components/addResi.vue

@@ -250,7 +250,9 @@
                                     placeholder="请输入内容" size="small" clearable></el-input>
                             </el-form-item>
                   
-                            <el-form-item label="失业证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                            <el-form-item label="失业证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus" :rules="[
+                                    { required: true, message: '请填写失业证号', trigger: 'blur' },
+                                ]" prop="unemployedDto.unemploymentNum">
                                 <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.unemploymentNum"
                                     placeholder="请输入内容" size="small" clearable></el-input>
                             </el-form-item>
@@ -290,7 +292,9 @@
                                 </el-radio-group>
                             </el-form-item>
                        
-                            <el-form-item label="劳动就业愿望" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
+                            <el-form-item label="劳动就业愿望" class="flex_item_width1"  v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"  :rules="[
+                                    { required: true, message: '请选择劳动就业愿望', trigger: 'blur' },
+                                ]" prop="workInfoDto.employmentWish">
                                 <el-select v-model.trim="form.workInfoDto.employmentWish" placeholder="请选择" size="small"
                                     class="list_item_width_1" clearable>
                                     <el-option v-for="(item, index) in dicts.employmentWishList" :key="index"

src/views/components/editResi.vue

@@ -608,6 +608,7 @@
                 form.workInfoDto.careerStatus == 6) &&
               form.workInfoDto.careerStatus
             "
+            :rules="[{ required: true, message: '请填写失业证号', trigger: 'blur' }]" 
               >
                 <el-input
                   class="list_item_width_1"
@@ -724,6 +725,9 @@
               class="flex_item_width1"
                 label="劳动就业愿望"
                 prop="workInfoDto.employmentWish"
+                :rules="[
+                                    { required: true, message: '请选择劳动就业愿望', trigger: 'blur' },
+                                ]" 
               >
                 <el-select
                   v-model.trim="form.workInfoDto.employmentWish"

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

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