diff --git a/src/option/settlement/formalSettlement.js b/src/option/settlement/formalSettlement.js index 022dd38..e297129 100644 --- a/src/option/settlement/formalSettlement.js +++ b/src/option/settlement/formalSettlement.js @@ -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), ], }); diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue index bf65b0c..bf279bb 100644 --- a/src/views/settlement/components/formal-settlement-editor.vue +++ b/src/views/settlement/components/formal-settlement-editor.vue @@ -494,7 +494,12 @@ {{ formatMoney(row.matchedAmount) }} - +