From dd72e85b38b71f79383ec489923a20306db3b251 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 15 Apr 2024 16:13:58 +0800
Subject: [PATCH] =?UTF-8?q?bug#1103=E5=8A=A0bug=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/addResi.vue              | 33 ++++++++++--
 src/views/components/editResi.vue             | 33 ++++++++++--
 .../components/resiExpand/editExpand.vue      | 50 +++++++++++++++++-
 src/views/components/resiExpand/index.vue     | 52 ++++++++++++++++++-
 src/views/modules/portrayal/jumin/index.vue   | 24 +++++++--
 5 files changed, 179 insertions(+), 13 deletions(-)

diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue
index dbd7f7666..d51d3f3d4 100644
--- a/src/views/components/addResi.vue
+++ b/src/views/components/addResi.vue
@@ -487,11 +487,13 @@ export default {
                             itemType: "select1",
                             formName: "disabilityCategoryCode",
                             opctionUrl: 'sys/dict/data/dictlist',
+                            check:'fourFont',
                             opctionParams: { dictType: 'disability_category_code' },
                             opction: []
                         },
                         {
                             label: "残疾等级",
+                            check:'fourFont',
                             itemType: "select1",
                             formName: "disabilityLevel",
                             opctionUrl: 'sys/dict/data/dictlist',
@@ -500,6 +502,7 @@ export default {
                         },
                         {
                             label: "残疾证号",
+                            check:'fourFont',
                             itemType: "input1",
                             formName: "disabilityNum",
                         },
@@ -554,6 +557,7 @@ export default {
                             label: "所患大病",
                             itemType: "checkbox",
                             formName: "illnessCodes",
+                            check:'fourFont',
                             opctionUrl: 'sys/dict/data/dictlist',
                             opctionParams: { dictType: 'illness_code' },
                             opction: []
@@ -564,6 +568,7 @@ export default {
                     children: [
                         {
                             label: "所患慢病",
+                            check:'fourFont',
                             itemType: "checkbox",
                             formName: "chronicDiseaseCodes",
                             opctionUrl: 'sys/dict/data/dictlist',
@@ -579,6 +584,7 @@ export default {
                             label: "死亡时间",
                             itemType: "datepicker1",
                             formName: "deathTime",
+                            check:'fourFont'
                         },
                     ]
                 },
@@ -588,6 +594,7 @@ export default {
                         {
                             label: "老年人分类",
                             itemType: "checkbox",
+                            check:'fiveFont',
                             formName: "oldPeopleCategories",
                             opctionUrl: 'sys/dict/data/dictlist',
                             opctionParams: { dictType: 'oldPeople_categories' },
@@ -597,12 +604,14 @@ export default {
                         {
                             label: "居住情况",
                             itemType: "select1",
+                            check:'fourFont',
                             formName: "resideSituation",
                             opctionUrl: 'sys/dict/data/dictlist',
                             opctionParams: { dictType: 'reside_situation' },
                         },
                         {
                             label: "高龄补助",
+                            check:'fourFont',
                             itemType: "inputNum",
                             formName: "oldSubsidy",
                         },
@@ -614,6 +623,7 @@ export default {
                         {
                             label: "低保类别",
                             itemType: "select1",
+                            check:'fourFont',
                             formName: "category",
                             opctionUrl: 'sys/dict/data/dictlist',
                             opctionParams: { dictType: 'subsistence_allowance_category' },
@@ -621,6 +631,7 @@ export default {
                         {
                             label: "低保享受原因",
                             itemType: "checkbox",
+                            check:'sixFont',
                             formName: "reasons",
                             opctionUrl: 'sys/dict/data/dictlist',
                             opctionParams: { dictType: 'subsistence_allowance_reasons' },
@@ -636,6 +647,7 @@ export default {
                             label: "入党时间",
                             itemType: "datepicker1",
                             formName: "joinTime",
+                            check:'fourFont',
                             opction: [
                             ]
                         },
@@ -649,6 +661,7 @@ export default {
                         {
                             label: "所属党组织",
                             itemType: "cascader1",
+                            check:'fiveFont',
                             formName: "partyOrgId",
                             opction: [
                             ]
@@ -668,8 +681,9 @@ export default {
                             formName: "flowActNum",
                         },
                         {
-                            label: "职务",
+                            label: "党组织职务",
                             itemType: "select1",
+                            check:'fiveFont',
                             formName: "partyJob",
                             opctionUrl: 'sys/dict/data/dictlist',
                             opctionParams: { dictType: 'party_job' },
@@ -693,6 +707,7 @@ export default {
                             label: "党员中心户",
                             itemType: "radio1",
                             formName: "centerFlag",
+                            check:'fiveFont',
                             opction: [
                                 { label: '是', value: 1 },
                                 { label: '否', value: 0 },
@@ -723,11 +738,13 @@ export default {
                     children: [
                         {
                             label: "所在社区",
+                            check:'fourFont',
                             itemType: "input1",
                             formName: "liveCommunity",
                         },
                         {
                             label: "住房性质",
+                            check:'fourFont',
                             itemType: "select1",
                             formName: "housingNature",
                             opctionUrl: 'sys/dict/data/house',
@@ -741,14 +758,16 @@ export default {
                     id: 'veteranDto',
                     children: [
                         {
-                            label: "入伍时间",
+                            label: "入伍日期",
                             itemType: "datepicker1",
                             formName: "joinArmyTime",
+                            check:'fourFont',
                             opction: [
                             ]
                         },
                         {
-                            label: "退伍时间",
+                            label: "退伍日期",
+                            check:'fourFont',
                             itemType: "datepicker1",
                             formName: "leaveArmyTime",
                             opction: [
@@ -785,6 +804,7 @@ export default {
                         {
                             label: "是否办理公益性岗位",
                             itemType: "radio1",
+                            check:'nineFont',
                             formName: "pubWelfareJobFlag",
                             opction: [
                                 { label: '是', value: 1 },
@@ -797,6 +817,7 @@ export default {
                     id: 'unitedFrontDto',
                     children: [{
                         label: "统战类型",
+                        check:'fourFont',
                         itemType: "input1",
                         formName: "unitedFrontType",
                     }]
@@ -821,6 +842,7 @@ export default {
 
                         {//0
                             label: "特扶类别",
+                            check:'fourFont',
                             itemType: "select1",
                             formName: "specialSupportType",
                             opction: [
@@ -836,6 +858,7 @@ export default {
                         },
                         {//1
                             label: "子女姓名",
+                            check:'fourFont',
                             itemType: "input1",
                             formName: "childName",
                             opction: [
@@ -843,6 +866,7 @@ export default {
                         },
                         {//2
                             label: "子女性别",
+                            check:'fourFont',
                             itemType: "select1",
                             formName: "childGender",
                             opction: [
@@ -858,12 +882,14 @@ export default {
                         },
                         {
                             label: "子女死亡日期",
+                            check:'sixFont',
                             itemType: "datepicker1",
                             formName: "certificateDate",
                             opction: [],
                         },
                         {
                             label: "子女伤残类别",
+                            check:'sixFont',
                             itemType: "select1",
                             formName: "childDisabilityCategoryCode",
                             opctionUrl: 'sys/dict/data/dictlist',
@@ -872,6 +898,7 @@ export default {
                         },
                         {
                             label: "子女伤残等级",
+                            check:'sixFont',
                             itemType: "select1",
                             formName: "childDisabilityLevel",
                             opctionUrl: 'sys/dict/data/dictlist',
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index b4673c8ee..10e4975e9 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -979,6 +979,7 @@ export default {
           children: [
             {
               label: "残疾类别",
+              check:'fourFont',
               itemType: "select1",
               pformName: "healthDto",
               formName: "disabilityCategoryCode",
@@ -989,6 +990,7 @@ export default {
             {
               label: "残疾等级",
               itemType: "select1",
+              check:'fourFont',
               pformName: "healthDto",
               formName: "disabilityLevel",
               opctionUrl: "sys/dict/data/dictlist",
@@ -999,6 +1001,7 @@ export default {
               label: "残疾证号",
               pformName: "healthDto",
               itemType: "input1",
+              check:'fourFont',
               formName: "disabilityNum",
             },
             {
@@ -1057,6 +1060,7 @@ export default {
             {
               label: "所患大病",
               itemType: "checkbox",
+              check:'fourFont',
               formName: "illnessCodes",
               opctionUrl: "sys/dict/data/dictlist",
               opctionParams: { dictType: "illness_code" },
@@ -1071,6 +1075,7 @@ export default {
             {
               label: "所患慢病",
               itemType: "checkbox",
+              check:'fourFont',
               formName: "chronicDiseaseCodes",
               opctionUrl: "sys/dict/data/dictlist",
               opctionParams: { dictType: "chronic_disease_code" },
@@ -1086,6 +1091,7 @@ export default {
               label: "死亡时间",
               itemType: "datepicker1",
               formName: "deathTime",
+              check:'fourFont',
               pformName: "deathDto",
             },
           ],
@@ -1096,6 +1102,7 @@ export default {
             {
               label: "老年人分类",
               itemType: "checkbox",
+              check:'fiveFont',
               formName: "oldPeopleCategories",
               opctionUrl: "sys/dict/data/dictlist",
               opctionParams: { dictType: "oldPeople_categories" },
@@ -1105,6 +1112,7 @@ export default {
             {
               label: "居住情况",
               itemType: "select1",
+              check:'fourFont',
               formName: "resideSituation",
               opctionUrl: "sys/dict/data/dictlist",
               opctionParams: { dictType: "reside_situation" },
@@ -1114,6 +1122,7 @@ export default {
               label: "高龄补助",
               itemType: "inputNum",
               formName: "oldSubsidy",
+              check:'fourFont',
               pformName: "oldPeopleDto",
             },
           ],
@@ -1124,6 +1133,7 @@ export default {
             {
               label: "低保类别",
               itemType: "select1",
+              check:'fourFont',
               formName: "category",
               opctionUrl: "sys/dict/data/dictlist",
               opctionParams: { dictType: "subsistence_allowance_category" },
@@ -1132,6 +1142,7 @@ export default {
             {
               label: "低保享受原因",
               itemType: "checkbox",
+              check:'sixFont',
               formName: "reasons",
               opctionUrl: "sys/dict/data/dictlist",
               opctionParams: { dictType: "subsistence_allowance_reasons" },
@@ -1144,6 +1155,7 @@ export default {
           id: "parymemberInfoDto",
           children: [
             {
+              check:'fourFont',
               label: "入党时间",
               itemType: "datepicker1",
               formName: "joinTime",
@@ -1158,6 +1170,7 @@ export default {
               opction: [],
             },
             {
+              check:'fiveFont',
               label: "所属党组织",
               itemType: "cascader1",
               formName: "partyOrgId",
@@ -1181,9 +1194,10 @@ export default {
               pformName: "parymemberInfoDto",
             },
             {
-              label: "职务",
+              label: "党组织职务",
               itemType: "select1",
               formName: "partyJob",
+              check:'fiveFont',
               opctionUrl: "sys/dict/data/dictlist",
               opctionParams: { dictType: "party_job" },
               pformName: "parymemberInfoDto",
@@ -1208,6 +1222,7 @@ export default {
             {
               label: "党员中心户",
               itemType: "radio1",
+              check:'fiveFont',
               formName: "centerFlag",
               pformName: "parymemberInfoDto",
               opction: [
@@ -1246,12 +1261,14 @@ export default {
             {
               label: "所在社区",
               itemType: "input1",
+              check:'fourFont',
               formName: "liveCommunity",
               pformName: "ensureHouseDto",
             },
             {
               label: "住房性质",
               itemType: "select1",
+              check:'fourFont',
               formName: "housingNature",
               opctionUrl: "sys/dict/data/house",
               opctionParams: { formCode: "resi_base_info" },
@@ -1264,14 +1281,16 @@ export default {
           id: "veteranDto",
           children: [
             {
-              label: "入伍时间",
+              label: "入伍日期",
               itemType: "datepicker1",
+              check:'fourFont',
               formName: "joinArmyTime",
               pformName: "veteranDto",
               opction: [],
             },
             {
-              label: "退伍时间",
+              label: "退伍日期",
+              check:'fourFont',
               itemType: "datepicker1",
               formName: "leaveArmyTime",
               pformName: "veteranDto",
@@ -1310,6 +1329,7 @@ export default {
             },
             {
               label: "是否办理公益性岗位",
+              check:'nineFont',
               itemType: "radio1",
               formName: "pubWelfareJobFlag",
               pformName: "veteranDto",
@@ -1325,6 +1345,7 @@ export default {
           children: [
             {
               label: "统战类型",
+              check:'fourFont',
               itemType: "input1",
               pformName: "unitedFrontDto",
               formName: "unitedFrontType",
@@ -1350,6 +1371,7 @@ export default {
           children: [
             {
               label: "特扶类别",
+              check:'fourFont',
               itemType: "select1",
               formName: "specialSupportType",
               pformName: "specialSupportDto",
@@ -1367,6 +1389,7 @@ export default {
             {
               //1
               label: "子女姓名",
+              check:'fourFont',
               itemType: "input1",
               formName: "childName",
               pformName: "specialSupportDto",
@@ -1376,6 +1399,7 @@ export default {
               //2
               label: "子女性别",
               itemType: "select1",
+              check:'fourFont',
               formName: "childGender",
               pformName: "specialSupportDto",
               opction: [
@@ -1392,6 +1416,7 @@ export default {
             {
               label: "子女死亡日期",
               itemType: "datepicker1",
+              check:'sixFont',
               formName: "childDeathDate",
               pformName: "specialSupportDto",
               opction: [],
@@ -1399,6 +1424,7 @@ export default {
             {
               label: "子女伤残类别",
               itemType: "select1",
+              check:'sixFont',
               formName: "childDisabilityCategoryCode",
               opctionUrl: "sys/dict/data/dictlist",
               pformName: "specialSupportDto",
@@ -1408,6 +1434,7 @@ export default {
             {
               label: "子女伤残等级",
               itemType: "select1",
+              check:'sixFont',
               pformName: "specialSupportDto",
               formName: "childDisabilityLevel",
               opctionUrl: "sys/dict/data/dictlist",
diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue
index d6133d473..97128f50b 100644
--- a/src/views/components/resiExpand/editExpand.vue
+++ b/src/views/components/resiExpand/editExpand.vue
@@ -6,7 +6,7 @@
                 <template v-for="itemj in itemH.form">
                     <section class="f-flex" style="flex-wrap: wrap;">
                         <el-form-item v-for="(itemk, index) in itemj.children" :key="index" label-width="160px"
-                            :label="itemk.label" :class="itemk.itemType == 'textarea' ? 'textareaDidth' : ''">
+                            :label="itemk.label" :class="[itemk.itemType == 'textarea' ? 'textareaDidth' : '' ,itemk.check?itemk.check:'']">
                             <template v-if="itemk.itemType == 'radio1'">
                                 <section class="list_item_width_1">
                                     <el-radio v-for="ns in itemk.opction" :key="ns.value" size="small"
@@ -356,4 +356,52 @@ h5 {
         background-color: #0056d6;
     }
 }
+.fourFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 73px;
+        top: 7px;
+    }
+}
+.fiveFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 62px;
+        top: 7px;
+    }
+}
+.sixFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 49px;
+        top: 7px;
+    }
+}
+.nineFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 6px;
+        top: 7px;
+    }
+}
 </style>
diff --git a/src/views/components/resiExpand/index.vue b/src/views/components/resiExpand/index.vue
index bf5a00b83..a04e777db 100644
--- a/src/views/components/resiExpand/index.vue
+++ b/src/views/components/resiExpand/index.vue
@@ -3,8 +3,8 @@
         <el-form :model="form">
             <template v-for="itemj in formList">
                 <section class="f-flex" style="flex-wrap: wrap;">
-                    <el-form-item v-for="(itemk, index) in itemj.children" :key="index" label-width="160px"
-                        :label="itemk.label" :class="itemk.itemType == 'textarea' ? 'textareaDidth' : ''">
+                    <el-form-item v-for="(itemk, index) in itemj.children"  :key="index" label-width="160px"
+                        :label="itemk.label" :class="[itemk.itemType == 'textarea' ? 'textareaDidth' : '' ,itemk.check?itemk.check:'']">
                         <template v-if="itemk.itemType == 'radio1'">
                             <section class="list_item_width_1">
                                 <el-radio v-for="ns in itemk.opction" :key="ns.value" size="small"
@@ -308,4 +308,52 @@ export default {
 
 <style lang='scss' scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
+.fourFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 73px;
+        top: 7px;
+    }
+}
+.fiveFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 62px;
+        top: 7px;
+    }
+}
+.sixFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 49px;
+        top: 7px;
+    }
+}
+.nineFont{
+    position: relative;
+    &::after{
+        content: '*';
+        width: 10px;
+        height: 10px;
+        color: #ff5107;
+        position: absolute;
+        left: 6px;
+        top: 7px;
+    }
+}
 </style>
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 6be08f0d6..f9619d9fa 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -1183,7 +1183,7 @@ export default {
                 totalQty: value.totalQty,
               }))
               .reverse();
-              console.log(this.menuList,"this.menuList");
+             
             for(let i in keysWithValueOneName){
               for(let k in this.originalExpandList){
                 if(keysWithValueOneName[i] === this.originalExpandList[k].title){
@@ -1199,7 +1199,7 @@ export default {
               }
             }
             this.menuList = this.menuList.filter((itemA) => {
-              return  itemA.name === '基本信息' || itemA.name === '拓展信息' || itemA.name === '居住信息'|| keysWithValueOneName.some((itemB) => itemB === itemA.name);
+              return  keysWithValueOneName.some((itemB) => itemB === itemA.name)|| itemA.name === '基本信息' || itemA.name === '拓展信息' || itemA.name === '居住信息';
             });
             this.menuList.push(
               {
@@ -1211,11 +1211,27 @@ export default {
                 id: "updateRecord",
               }
             );
+            const orderIds = ["base", "reside", "ext"];
+            // 新建一个数组存放按顺序排列的项
+            let sortedData = [];
+            // 遍历 orderIds 数组，将对应的项从 data 中取出并放入 sortedData
+            orderIds.forEach(id => {
+                const item = this.menuList.find(item => item.id === id);
+                if (item) {
+                    sortedData.push(item);
+                }
+            });
+            console.log(sortedData);
+            // 将 data 中剩余的项放入 sortedData
+            this.menuList.forEach(item => {
+                if (!orderIds.includes(item.id)) {
+                    sortedData.push(item);
+                }
+            });
+            this.menuList = sortedData;
             this.expandList = this.originalExpandList.filter((itemA) => {
               return keysWithValueOne.some((itemB) => itemB === itemA.id);
             });
-            console.log(keysWithValueOne,'keysWithValueOne');
-            console.log(this.resiDetailObj,'this.resiDetailObj');
             await Promise.all(
               this.expandList.map(async (item) => {
                 await Promise.all(