@@ -1522,7 +1522,9 @@ export default {
availableWriteOffAmount: Number(row.availableWriteOffAmount || 0),
createTime: row.paymentCreateTime || row.createTime,
}));
- this.changeRecords = detail.changeRecords || [];
+ this.changeRecords = (detail.changeRecords || []).filter(
+ row => row.changeContent !== '预结算审批通过'
+ );
this.attachments = this.parseAttachments(detail.attachmentsJson);
this.sortAttachments();
this.selectedAttachmentRows = [];
@@ -2307,6 +2309,17 @@ export default {
},
formatAdjustChangeValue(value) {
if (value === undefined || value === null || value === '') return '空';
+ if (Array.isArray(value)) {
+ if (!value.length) return '空';
+ return value
+ .map(item => {
+ if (!item || typeof item !== 'object') return String(item);
+ return Object.entries(item)
+ .map(([key, itemValue]) => `${key}：${this.formatAdjustChangeValue(itemValue)}`)
+ .join('，');
+ })
+ .join('\n');
+ }
if (typeof value === 'object') return JSON.stringify(value);
return String(value);
},
@@ -2369,12 +2382,60 @@ export default {
ruleFeeName(rule = {}) {
return String(rule.feeItem || rule.feeItemName || rule.name || '').trim();
},
+ isHandlingFeeItem(name) {
+ return String(name || '').includes('装卸');
+ },
feeNamesMatch(left, right) {
const source = String(left || '').trim();
const target = String(right || '').trim();
if (!source || !target) return false;
if (source === target) return true;
- return this.isFreightFeeItem(source) && this.isFreightFeeItem(target);
+ if (this.isFreightFeeItem(source) && this.isFreightFeeItem(target)) return true;
+ return this.isHandlingFeeItem(source) && this.isHandlingFeeItem(target);
+ },
+ detailColumnFeeName(item = {}) {
+ if (item.kind === 'fee') return item.name || '';
+ if (item.column?.prop === 'freightAmount') return '运输费';
+ return '';
+ },
+ showDetailColumnRuleIcon(item) {
+ const feeName = this.detailColumnFeeName(item);
+ if (!feeName) return false;
+ return this.details.some(row => this.rowHasNamedBillingRule(row, feeName));
+ },
+ openDetailColumnRule(item) {
+ const feeName = this.detailColumnFeeName(item);
+ const row =
+ this.details.find(detail => this.rowHasNamedBillingRule(detail, feeName)) ||
+ this.details[0];
+ if (row) this.openDetailBillingRule(row, feeName);
+ },
+ showAdjustFeeRuleIcon(feeName) {
+ return (this.adjustRows || []).some(row => this.sourceHasNamedBillingRule(row, feeName));
+ },
+ openAdjustFeeRule(feeName) {
+ const row =
+ (this.adjustRows || []).find(item => this.sourceHasNamedBillingRule(item, feeName)) ||
+ this.adjustRows[0];
+ if (row) this.openBillingRuleInfo(row, feeName);
+ },
+ rowHasNamedBillingRule(row, feeName) {
+ return [row, ...this.detailFeeRows(row)].some(source =>
+ this.sourceHasNamedBillingRule(source, feeName)
+ );
+ },
+ sourceHasNamedBillingRule(source = {}, feeName) {
+ const rules = [
+ ...this.collectBillingRules(source),
+ ...(Array.isArray(source.billingRule?.rules) ? source.billingRule.rules : []),
+ ];
+ if (rules.some(rule => this.feeNamesMatch(this.ruleFeeName(rule), feeName))) return true;
+ if (!this.hasBillingRule(source)) return false;
+ const named = String(
+ source.billingFeeItem || source.feeItem || this.ruleFeeName(source.billingRule) || ''
+ ).trim();
+ if (!named) return true;
+ return this.feeNamesMatch(named, feeName);
},
collectBillingRules(row = {}) {
const source = row || {};
diff --git a/src/views/settlement/components/settlement-import-page.vue b/src/views/settlement/components/settlement-import-page.vue
index 7c3d6a4..6a45c08 100644
--- a/src/views/settlement/components/settlement-import-page.vue
+++ b/src/views/settlement/components/settlement-import-page.vue
@@ -604,6 +604,38 @@ const dedupeColumns = columns => {
});
};
+const settlementAmountColumn = {
+ prop: 'settlementAmount',
+ label: '结算金额',
+ editor: 'number',
+ minWidth: 120,
+};
+
+/** 模板已去掉结算金额；明细仍展示，并插在费用项之后、日期列之前 */
+const ensureSettlementAmountColumn = columns => {
+ if (columns.some(column => column.prop === 'settlementAmount')) {
+ return columns;
+ }
+ const result = [...columns];
+ let insertAt = result.findIndex(column =>
+ ['actualStartDate', 'actualEndDate', 'planStartDate', 'planEndDate', 'remark', 'waybillIdentifier'].includes(
+ column.prop
+ )
+ );
+ if (insertAt < 0) {
+ const lastFeeIndex = [...result].map((column, index) => (column.isFeeItem ? index : -1)).filter(index => index >= 0).pop();
+ const transportFeeIndex = result.findIndex(column => column.prop === 'transportFee');
+ insertAt =
+ lastFeeIndex !== undefined
+ ? lastFeeIndex + 1
+ : transportFeeIndex >= 0
+ ? transportFeeIndex + 1
+ : result.length;
+ }
+ result.splice(insertAt, 0, { ...settlementAmountColumn });
+ return result;
+};
+
const detailColumns = computed(() => {
const historyColumns =
form.waybillMode === 'history'
@@ -619,16 +651,13 @@ const detailColumns = computed(() => {
const fallback = [
...columnsBeforeFee,
...feeItemNames.value.map(name => feeColumn(name)),
- {
- prop: 'settlementAmount',
- label: '结算金额',
- editor: 'number',
- minWidth: 120,
- },
+ { ...settlementAmountColumn },
...columnsAfterFee,
];
const uploaded = parsedHeaders.value.map(columnFromHeader).filter(Boolean);
- const columns = dedupeColumns(uploaded.length ? uploaded : fallback);
+ const columns = ensureSettlementAmountColumn(
+ dedupeColumns(uploaded.length ? uploaded : fallback)
+ );
return [...historyColumns, ...columns];
});
@@ -717,6 +746,7 @@ const formatCell = (row, column) => {
return value ?? '';
};
+/** 导入解析后自动合计结算金额；编辑运输费/费用项时不再回算 */
const recalcSettlementAmount = row => {
const transportFee = toNumber(row.transportFee ?? row.freight);
row.transportFee = transportFee;
@@ -735,6 +765,18 @@ const recalcSettlementAmount = row => {
row.settlementAmount = settlementAmount;
row.otherFeeTotal = Number(feeSum.toFixed(2));
row.freightTotal = settlementAmount;
+ row['运费合计'] = settlementAmount;
+};
+
+const syncOtherFeeTotal = row => {
+ if (!row.feeItems || typeof row.feeItems !== 'object') {
+ row.feeItems = {};
+ }
+ let feeSum = 0;
+ feeItemNames.value.forEach(name => {
+ feeSum += toNumber(row.feeItems[name] ?? row[name]);
+ });
+ row.otherFeeTotal = Number(feeSum.toFixed(2));
};
const updateNumberCell = (row, column, value) => {
@@ -744,17 +786,16 @@ const updateNumberCell = (row, column, value) => {
if (!row.feeItems) row.feeItems = {};
row.feeItems[column.prop] = '';
row[column.prop] = '';
- } else {
- row[column.prop] = column.editor === 'optionalNumber' ? '' : '';
- if (column.prop === 'transportFee') row.freight = '';
- if (column.prop === 'unitPrice') row.transportUnitPrice = '';
- }
- if (column.prop === 'settlementAmount') {
- row.settlementAmount = '';
- row.freightTotal = '';
+ syncOtherFeeTotal(row);
return;
}
- recalcSettlementAmount(row);
+ row[column.prop] = '';
+ if (column.prop === 'transportFee') row.freight = '';
+ if (column.prop === 'unitPrice') row.transportUnitPrice = '';
+ if (column.prop === 'settlementAmount') {
+ row.freightTotal = '';
+ row['运费合计'] = '';
+ }
return;
}
const [integer = '', decimal = ''] = raw.replace(/[^\d.]/g, '').split('.');
@@ -764,21 +805,20 @@ const updateNumberCell = (row, column, value) => {
if (!row.feeItems) row.feeItems = {};
row.feeItems[column.prop] = normalized;
row[column.prop] = normalized;
- } else {
- row[column.prop] = normalized;
- if (column.prop === 'transportFee') {
- row.freight = normalized;
- }
- if (column.prop === 'unitPrice') {
- row.transportUnitPrice = normalized;
- }
- if (column.prop === 'settlementAmount') {
- row.freightTotal = normalized;
- row['运费合计'] = normalized;
- return;
- }
+ syncOtherFeeTotal(row);
+ return;
+ }
+ row[column.prop] = normalized;
+ if (column.prop === 'transportFee') {
+ row.freight = normalized;
+ }
+ if (column.prop === 'unitPrice') {
+ row.transportUnitPrice = normalized;
+ }
+ if (column.prop === 'settlementAmount') {
+ row.freightTotal = normalized;
+ row['运费合计'] = normalized;
}
- recalcSettlementAmount(row);
};
const importFieldText = value => String(value ?? '').trim();
@@ -854,11 +894,8 @@ const normalizeParsedRow = (item, index) => {
applyVehicleNo(row, vehicleNo);
row.transportUnitPrice = row.unitPrice;
row.freight = row.transportFee;
- if (row.settlementAmount === '' || row.settlementAmount === null || row.settlementAmount === undefined) {
- recalcSettlementAmount(row);
- } else {
- row.freightTotal = row.settlementAmount;
- }
+ // 模板无结算金额列：导入后按运输费+费用项自动合计
+ recalcSettlementAmount(row);
return row;
};
@@ -1341,22 +1378,18 @@ const confirmImport = async () => {
const loadTransportTypeOptions = async () => {
try {
+ // 运输方式取业务字典 transport_type 的字典名称（dictValue），不写死枚举
const response = await getDictionary({ code: 'transport_type' });
const list = unwrapData(response) || [];
transportTypeOptions.value = (Array.isArray(list) ? list : [])
.map(item => {
- const label = item.dictValue || item.label || item.name || '';
- const value = item.dictValue || item.dictKey || item.value || label;
- return label ? { label, value } : null;
+ const label = String(item.dictValue || item.label || item.name || '').trim();
+ if (!label || String(item.dictKey) === '-1') return null;
+ return { label, value: label };
})
.filter(Boolean);
} catch (error) {
- transportTypeOptions.value = [
- { label: '公路运输', value: '公路运输' },
- { label: '铁路运输', value: '铁路运输' },
- { label: '水路运输', value: '水路运输' },
- { label: '航空运输', value: '航空运输' },
- ];
+ transportTypeOptions.value = [];
}
};
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index 6fc1e97..e67a546 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -241,7 +241,12 @@
-
+
{{ feeSourceLabel(row.dataSource) }}
@@ -1115,6 +1120,8 @@ export default {
page: { current: 1, size: 10, total: 0 },
// 底部详情/调整面板打开时压缩主表高度，露出表格滚动条
listTableHeight: undefined,
+ savedListTableHeight: null,
+ listTableLayoutToken: 0,
detailDialog: {
visible: false,
title: '费用明细',
@@ -1129,6 +1136,8 @@ export default {
rule: null,
},
adjustDialog: { visible: false, loading: false, submitting: false, row: null },
+ // 表头 + 最多 3 行费用 + 横向滚动条，超出后表体上下滚动
+ adjustTableMaxHeight: 40 + 49 * 3 + 16,
adjustRows: [],
adjustDynamicFeeColumns: [],
adjustTextProps: ['specification', 'model', 'billingFactor', 'billingType'],
@@ -1330,8 +1339,11 @@ export default {
'$route.fullPath'() {
this.openRouteDetail();
},
- isBottomPanelOpen() {
- this.updateListTableHeight();
+ isBottomPanelOpen: {
+ flush: 'post',
+ handler() {
+ this.updateListTableHeight();
+ },
},
searchVisible() {
this.updateListTableHeight();
@@ -1396,36 +1408,62 @@ export default {
},
/** 表格和分页撑满剩余可视区域；单据详情展开时贴住详情面板，关闭后恢复 */
updateListTableHeight() {
+ this.listTableLayoutToken = (this.listTableLayoutToken || 0) + 1;
+ const token = this.listTableLayoutToken;
this.$nextTick(() => {
- window.requestAnimationFrame(() => this.applyListTableHeight());
+ window.requestAnimationFrame(() => {
+ if (token !== this.listTableLayoutToken) return;
+ this.applyListTableHeight(token);
+ window.requestAnimationFrame(() => {
+ if (token !== this.listTableLayoutToken) return;
+ this.applyListTableHeight(token);
+ });
+ });
});
},
- applyListTableHeight() {
+ applyListTableHeight(token = this.listTableLayoutToken) {
+ if (token !== this.listTableLayoutToken) return;
const tableElement = this.$refs.mainTableRef?.$el;
if (!tableElement) return;
- const pagination = this.$el?.querySelector?.('.settlement-detail-page__pagination');
+ const pagination = this.$el?.querySelector?.(
+ '.settlement-detail-page__table-panel .settlement-detail-page__pagination'
+ );
const paginationHeight = pagination?.offsetHeight || 0;
const tableTop = tableElement.getBoundingClientRect().top;
const view = this.$el?.closest?.('#avue-view');
const viewRect = view?.getBoundingClientRect?.();
- let bottomEdge = viewRect ? viewRect.bottom - 12 : window.innerHeight;
- if (this.isBottomPanelOpen) {
+ // 用滚动容器的可视高度，避免表格被压矮后按内容底部把高度锁死
+ let bottomEdge = view
+ ? viewRect.top + view.clientHeight - 12
+ : window.innerHeight;
+ const panelOpen = this.isBottomPanelOpen;
+ if (panelOpen) {
+ if (!this.savedListTableHeight) {
+ this.savedListTableHeight = this.listTableHeight || null;
+ }
const panelRect = document
.querySelector('.settlement-detail-page__detail-panel')
?.getBoundingClientRect?.();
if (panelRect && panelRect.height > 0) {
- bottomEdge = panelRect.top;
+ bottomEdge = Math.min(bottomEdge, panelRect.top);
this.listTableHeightRetry = 0;
} else if ((this.listTableHeightRetry || 0) < 5) {
this.listTableHeightRetry = (this.listTableHeightRetry || 0) + 1;
- window.requestAnimationFrame(() => this.applyListTableHeight());
+ window.requestAnimationFrame(() => this.applyListTableHeight(token));
return;
}
} else {
this.listTableHeightRetry = 0;
}
- const gap = this.isBottomPanelOpen ? 8 : 0;
- this.listTableHeight = Math.max(180, Math.floor(bottomEdge - tableTop - paginationHeight - gap));
+ const gap = panelOpen ? 8 : 0;
+ let nextHeight = Math.max(180, Math.floor(bottomEdge - tableTop - paginationHeight - gap));
+ if (!panelOpen && this.savedListTableHeight) {
+ if (nextHeight + 24 < this.savedListTableHeight) {
+ nextHeight = this.savedListTableHeight;
+ }
+ this.savedListTableHeight = null;
+ }
+ this.listTableHeight = nextHeight;
this.$nextTick(() => this.$refs.mainTableRef?.doLayout?.());
},
contractCategoryName(value) {
@@ -1858,11 +1896,13 @@ export default {
this.changeRecordsDialog.visible = false;
this.billingRuleDialog.visible = false;
this.billingRuleDialog.rule = null;
+ this.updateListTableHeight();
},
closeAdjustPanel() {
this.clearAdjustCalculations();
this.adjustDialog.visible = false;
this.adjustDialog.row = null;
+ this.updateListTableHeight();
},
handleTableLink(row, column) {
if (column.prop === 'waybillNo') {
@@ -2446,7 +2486,8 @@ export default {
return;
}
const options = this.syncBillingPlanOptions(contractId);
- const selected = options.find(item => item.defaultPlan) || options[0];
+ const defaultOptions = options.filter(item => item.defaultPlan);
+ const selected = defaultOptions[defaultOptions.length - 1] || options[options.length - 1];
this.updateFeeForm.billingPlanId = selected?.id || '';
},
async confirmUpdateFee() {
@@ -3333,6 +3374,7 @@ export default {
.settlement-detail-page__adjust-panel-body {
padding-top: 16px;
+ overflow: hidden;
}
.settlement-detail-page__billing-rule-cell {