From 60c50b53bfbfc7eba7e59a57ad647eec6a93f3f6 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 31 May 2024 19:37:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E7=BE=A4?=
 =?UTF-8?q?=E4=BC=97,=E5=8A=A0=E6=B5=81=E5=8A=A8=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=B7=9F=E6=96=B0=E9=98=B6=E5=B1=82=E4=BA=BA=E5=A3=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/addResi.vue                    |  6 +++++-
 src/views/components/resiSearch.vue                 | 10 +++++++++-
 src/views/modules/portrayal/jumin/cpts/staffTag.vue |  9 ++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue
index 6864b6f30..2fa2dc1d3 100644
--- a/src/views/components/addResi.vue
+++ b/src/views/components/addResi.vue
@@ -1401,7 +1401,11 @@ export default {
       this.dialogVisible = false;
     },
     hideExpand(formType) {
-      delete this.form[formType];
+        if(formType!= 'baseInfoDto'){
+        delete this.form[formType];
+      }else{
+        this.form['baseInfoDto'].deathFlag = 0;
+      }
       this.dialogVisible = false;
     },
   },
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 713380788..ca9cd879d 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -328,6 +328,14 @@ export default {
         "label": "特扶人员",
         "value": "SPECIAL_SUPPORT_FLAG",
         "children": null
+    },{
+      "label": "新阶层人士",
+        "value": "NEW_STRATUM_FLAG",
+        "children": null
+    },{
+      "label": "流动人员",
+        "value": "FLOATING_FLAG",
+        "children": null
     }
 ],
       itemList,
@@ -419,7 +427,7 @@ export default {
           label: "邪教人员",
           value: "xiejiaorenyuan",
           children: null
-        },
+        }
       ],
       careerStatusList: [],
       form: {
diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue
index b82c7eb7e..f0a896b1b 100644
--- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue
+++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue
@@ -11,7 +11,7 @@
                             <el-radio-group v-model.trim="scope.row.value" v-for="(item, index) in scope.row.option"
                                 :key="index" @change="handeleClickRadio(item.value)">
                                 <el-radio :label="item.value" :disabled="formType == 'detail'"><span
-                                        style="margin-right: 50px;">{{ item.label
+                                        style="margin-right: 50px;" :value="item.value">{{ item.label
                                         }}</span></el-radio>
                             </el-radio-group>
                         </el-form-item>
@@ -104,6 +104,12 @@ export default {
                             {
                                 label: '特扶人员',
                                 value: 'specialSupportFlag'
+                            },{
+                                label: '流动人员',
+                                value: 'floatingFlag'
+                            },{
+                                label: '新阶层人士',
+                                value: 'newstratumflag'
                             }
                         ]
                     },
@@ -165,6 +171,7 @@ export default {
             }
         },
         updatedForm() {
+            this.formData.tableData[0].value = 0;
             if (this.formType == 'add' || !this.userInfo.baseInfoDto.categoryInfo) return;
             const updateValue = (flag, dataIndex) => {
                 const { tableData } = this.formData;