Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/person/index.vue

@@ -81,7 +81,7 @@
           v-for="(item, index) in dataMyTag.myTag1"
           class="main-tag-item"
           :class="item.name == tableType.title ? 'main-tag-item_active' : ''"
-          @click="onClickTag2(item.name)"
+          @click="onClickTag2(item.name, item.label)"
         >
           <span v-if="item.name == '退休养老'"> 退休<br />养老</span>
           <span v-else>{{ item.name }}</span>
@@ -95,7 +95,7 @@
       <div class="person-side">
         <div v-if="rightType == '1'">
           <div class="my-label">
-            <div class="my-label-title">{{ pdT }}</div>
+            <div class="my-label-title">{{ dataMyTag.title }}</div>
           </div>
           <div class="my-table">
             <el-table
@@ -126,6 +126,9 @@
                   <template #default="scope">
                     <!-- 医疗保险类型 -->
                     <div v-if="item.property == 'ylbxlx'">
+                      <div v-if="scope.row.ylbxlx == 0">
+                        城乡居民基本医疗保险
+                      </div>
                       <div v-if="scope.row.ylbxlx == 0">
                         城乡居民基本医疗保险
                       </div>
@@ -160,7 +163,7 @@
         </div>
         <div v-else>
           <div class="my-label">
-            <div class="my-label-title">{{ pdT }}</div>
+            <div class="my-label-title">{{ dataMyTag.title }}</div>
           </div>
           <div class="my-info">
             <div
@@ -286,30 +289,39 @@ const dataMyTag = reactive({
       show: 0,
     },
   ],
+  title: "出生",
   myTag1: [
     {
       name: "出生",
+      label: "出生",
     },
     {
       name: "学习",
+      label: "学习",
     },
     {
       name: "工作",
+      label: "工作",
     },
     {
       name: "婚育",
+      label: "婚育",
     },
     {
       name: "置业",
+      label: "置业",
     },
     {
       name: "退休养老",
+      label: "养老金发放情况",
     },
     {
       name: "身后事",
+      label: "身后事",
     },
     {
       name: "综合",
+      label: "医疗金发放情况",
     },
   ],
   /**
@@ -533,8 +545,9 @@ const onClickTag = (item) => {
   dialogShow.value = true;
 };
 //圆球弹框
-const onClickTag2 = (name) => {
+const onClickTag2 = (name, label) => {
   tableType.title = name;
+  dataMyTag.title = label;
   tableType.url = columnsList[name].url;
   tableType.columns = columnsList[name].column;
   getTable(tableType.url, true);
@@ -616,7 +629,7 @@ watch(
   (newValue, oldValue) => {
     identNo.value = props.message.identNo;
     getData(props.message.identNo);
-    onClickTag2("出生");
+    onClickTag2("出生", "出生");
     jump.value = "map";
   }
 );