🐛 补复合并遗漏的金蝶锁状态与附件同步逻辑,修复认领记录页残留重复表格标签
This commit is contained in:
@@ -161,5 +161,7 @@ export const paymentApplicationOption = ({
|
|||||||
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
|
{ label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
|
||||||
{ label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter },
|
{ label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter },
|
||||||
{ label: '金蝶单据状态', prop: 'kingdeeStatusName', minWidth: 130, formatter: textFormatter },
|
{ label: '金蝶单据状态', prop: 'kingdeeStatusName', minWidth: 130, formatter: textFormatter },
|
||||||
|
{ label: '金蝶锁状态', prop: 'kingdeeLockStatus', slot: true, minWidth: 150 },
|
||||||
|
{ label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100, formatter: textFormatter },
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -61,6 +61,13 @@
|
|||||||
}}</el-tag>
|
}}</el-tag>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<template #kingdeeLockStatus="{ row }">
|
||||||
|
<el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
|
||||||
|
<el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
|
||||||
|
</el-tooltip>
|
||||||
|
<span v-else>-</span>
|
||||||
|
</template>
|
||||||
|
|
||||||
<template #menu="{ row }">
|
<template #menu="{ row }">
|
||||||
<el-link
|
<el-link
|
||||||
v-if="hasPermission('payment_application_view')"
|
v-if="hasPermission('payment_application_view')"
|
||||||
@@ -117,7 +124,11 @@
|
|||||||
>驳回</el-link
|
>驳回</el-link
|
||||||
>
|
>
|
||||||
<el-link
|
<el-link
|
||||||
v-if="hasPermission('payment_application_void') && row.approvalStatus === 'approved'"
|
v-if="
|
||||||
|
hasPermission('payment_application_void') &&
|
||||||
|
row.approvalStatus === 'approved' &&
|
||||||
|
row.kingdeeLockStatus !== 'locked'
|
||||||
|
"
|
||||||
type="danger"
|
type="danger"
|
||||||
@click="handleVoid(row)"
|
@click="handleVoid(row)"
|
||||||
>作废</el-link
|
>作废</el-link
|
||||||
|
|||||||
@@ -94,9 +94,6 @@
|
|||||||
<el-button :loading="refreshing" @click="handleRefreshKingdeeResult">
|
<el-button :loading="refreshing" @click="handleRefreshKingdeeResult">
|
||||||
查询金蝶认领结果
|
查询金蝶认领结果
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
|
||||||
<el-table v-loading="loading" :data="rows" border>
|
|
||||||
<div class="claim-record-page__toolbar">
|
|
||||||
<table-header-tools
|
<table-header-tools
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
v-model:visible-column-keys="visibleColumnKeys"
|
v-model:visible-column-keys="visibleColumnKeys"
|
||||||
@@ -331,7 +328,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.claim-record-page__toolbar {
|
.claim-record-page__toolbar {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 12px 0;
|
padding: 12px 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user