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

src/view/person/index.vue

@@ -120,26 +120,29 @@
               <template v-for="item in tableType.columns">
                 <el-table-column
                   v-if="item.type === 'slot'"
-                  :key="item.label"
                   :label="item.label"
                   :property="item.property"
-                  :show-overflow-tooltip="true"
+                  :align="center"
-                  :align="item.align || 'center'"
                 >
                   <template #default="scope">
-                    <slot
+                    <!-- 医疗保险类型 -->
-                      :name="item.property"
+                    <div v-if="item.property == 'ylbxlx'">
-                      :currentCol="item"
+                      <div v-if="scope.row.ylbxlx == 0">城乡居民基本医疗保险</div>
-                      :currentData="scope.row"
+                      <div v-else>职工基本医疗保险</div>
-                    ></slot>
+                    </div>
+                    <!-- 养老金类型 -->
+                    <div v-if="item.property == 'yljffje'">
+                      <div v-if="scope.row.yljffje == 0">城乡居民养老金</div>
+                      <div v-else>职工养老金</div>
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column
                   v-else
-                  :label="item.label"
+                  :width="item.width"
                   :property="item.property"
-                  :show-overflow-tooltip="true"
+                  :label="item.label"
-                  :align="item.align || 'center'"
+                  :align="center"
                 />
               </template>
             </el-table>
@@ -485,6 +488,11 @@ const columnsList = reactive({
   退休养老: {
     url: "/api/ggfwyth/ysyzt/getRyylxxList",
     column: [
+          {
+        label: "养老金类型",
+        property: "yljlx",
+        type:'slot',
+      },
       {
         label: "养老金发放金额",
         property: "yljffje",
@@ -494,10 +502,7 @@ const columnsList = reactive({
         label: "养老金发放日期",
         property: "yljffrq",
       },
-      {
+  
-        label: "养老金类型",
-        property: "yljlx",
-      },
     ],
   },
   综合: {
@@ -506,6 +511,7 @@ const columnsList = reactive({
       {
         label: "医疗保险类型",
         property: "ylbxlx",
+        type: "slot",
       },
       {
         label: "发放日期",