Compare commits

..

No commits in common. "77a86f999dde66349c7a84fb54066d36c1f36782" and "91c813e047f0e8d31d14c9983a02a8027bce2999" have entirely different histories.

1 changed files with 15 additions and 21 deletions

View File

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