fix: 收款结算单不展示已指定应付列
This commit is contained in:
@@ -91,21 +91,24 @@ const COLUMN_EXTRA = {
|
||||
createTime: { width: 180 },
|
||||
};
|
||||
|
||||
const buildTableColumns = () =>
|
||||
formalSettlementTableColumns.map(column => {
|
||||
const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
|
||||
if (column.money) {
|
||||
extra.formatter = moneyFormatter;
|
||||
extra.align = 'right';
|
||||
}
|
||||
// link / status 标记的列统一走单元格插槽
|
||||
if (column.link || column.status) extra.slot = true;
|
||||
// 插槽列不挂兜底 formatter:avue 中 formatter 会覆盖单元格插槽渲染
|
||||
if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
|
||||
return { ...column, ...extra };
|
||||
});
|
||||
// 已指定应付仅付款结算单(先票后款 A302-6)有,收款结算单不展示
|
||||
const buildTableColumns = settlementType =>
|
||||
formalSettlementTableColumns
|
||||
.filter(column => !(settlementType === 'receivable' && column.prop === 'kingdeeAssignStatus'))
|
||||
.map(column => {
|
||||
const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
|
||||
if (column.money) {
|
||||
extra.formatter = moneyFormatter;
|
||||
extra.align = 'right';
|
||||
}
|
||||
// link / status 标记的列统一走单元格插槽
|
||||
if (column.link || column.status) extra.slot = true;
|
||||
// 插槽列不挂兜底 formatter:avue 中 formatter 会覆盖单元格插槽渲染
|
||||
if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
|
||||
return { ...column, ...extra };
|
||||
});
|
||||
|
||||
export const formalSettlementOption = () => ({
|
||||
export const formalSettlementOption = (settlementType = '') => ({
|
||||
height: 'auto',
|
||||
calcHeight: 32,
|
||||
tip: false,
|
||||
@@ -167,7 +170,7 @@ export const formalSettlementOption = () => ({
|
||||
type: 'daterange',
|
||||
}),
|
||||
// ---------- 表格列(部分兼搜索项) ----------
|
||||
...buildTableColumns(),
|
||||
...buildTableColumns(settlementType),
|
||||
],
|
||||
});
|
||||
|
||||
|
||||
@@ -494,7 +494,12 @@
|
||||
<span v-else>{{ formatMoney(row.matchedAmount) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否已指定应付" min-width="130" align="center">
|
||||
<el-table-column
|
||||
v-if="form.settlementType !== 'receivable'"
|
||||
label="是否已指定应付"
|
||||
min-width="130"
|
||||
align="center"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<el-tooltip
|
||||
:disabled="row.kingdeePushStatus !== 'failed'"
|
||||
|
||||
@@ -255,7 +255,6 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
option: formalSettlementOption(),
|
||||
query: {},
|
||||
activeSettlementType: 'payable',
|
||||
rows: [],
|
||||
@@ -289,6 +288,10 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['permission', 'userInfo']),
|
||||
// 列随结算类型切换重建:收款结算单不展示「已指定应付」
|
||||
option() {
|
||||
return formalSettlementOption(this.activeSettlementType);
|
||||
},
|
||||
isAdmin() {
|
||||
return isAdministrator(this.userInfo);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user