b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/20261016-settlement-adjustment-kingdee

Browse Source
This commit is contained in:
刘泉佳
2026-10-18 15:14:38 +08:00
parent 6596722601 6f2383a7e5
commit 912c1169a6
40 changed files with 1511 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/option/settlement/formalSettlementSearch.js
+1 -1
View File
@@ -36,7 +36,7 @@ export const kingdeeSyncStatusOptions = [
export const formalSettlementSearchFields = [
{ label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
{ label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
{ label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
{ label: '项目', prop: 'projectName', type: 'input' },
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
{ label: '合同编号', prop: 'contractNo', type: 'input' },
src/option/settlement/formalSettlementTable.js
+5 -3
View File
@@ -30,7 +30,7 @@ export const formalSettlementTableColumns = [
];
export const sourceColumns = [
{ label: '预结算单号', prop: 'preSettlementNo', minWidth: 160 },
{ label: '预付结算单号', prop: 'preSettlementNo', minWidth: 160 },
{ label: '结算金额', prop: 'settlementAmount', minWidth: 130, money: true },
{ label: '申请预付金额', prop: 'advanceAppliedAmount', minWidth: 140, money: true },
{ label: '已付款金额', prop: 'advancePaidAmount', minWidth: 130, money: true },
@@ -50,6 +50,7 @@ export const detailColumns = [
{ label: '运输总量', prop: 'transportQuantity', minWidth: 120 },
{ label: '里程（KM）', prop: 'mileage', minWidth: 120 },
{ label: '批次号', prop: 'batchNo', minWidth: 120 },
{ label: '计费方式', prop: 'billingType', minWidth: 130 },
{ label: '运输单价', prop: 'unitPrice', minWidth: 120, money: true },
{ label: '运费', prop: 'freightAmount', minWidth: 120, money: true },
{ label: '调整金额', prop: 'adjustAmount', minWidth: 120, money: true },
@@ -68,7 +69,7 @@ export const summaryColumns = [
];
export const candidateColumns = [
{ label: '预结算单号', prop: 'preSettlementNo', minWidth: 170 },
{ label: '预付结算单号', prop: 'preSettlementNo', minWidth: 170 },
{ label: '项目名称', prop: 'projectName', minWidth: 140 },
{ label: '所属组织', prop: 'deptName', minWidth: 140 },
{ label: '合同编号', prop: 'contractNo', minWidth: 150 },
@@ -88,7 +89,7 @@ export const candidateDetailColumns = [
{ label: '合同编号', prop: 'contractNo', minWidth: 150 },
{ label: '合同名称', prop: 'contractName', minWidth: 170 },
{ label: '来源', prop: 'sourceType', minWidth: 110 },
{ label: '预结算单号', prop: 'preSettlementNo', minWidth: 160 },
{ label: '预付结算单号', prop: 'preSettlementNo', minWidth: 160 },
{ label: '正式结算单号', prop: 'formalSettlementNo', minWidth: 160 },
{ label: '运单号', prop: 'waybillNo', minWidth: 150 },
{ label: '车号', prop: 'vehicleNo', minWidth: 130 },
@@ -96,6 +97,7 @@ export const candidateDetailColumns = [
{ label: '货物名称', prop: 'cargoName', minWidth: 140 },
{ label: '货物类型', prop: 'cargoType', minWidth: 130 },
{ label: '批次号', prop: 'batchNo', minWidth: 120 },
{ label: '计费方式', prop: 'billingType', minWidth: 130 },
{ label: '应收应付合计', prop: 'totalAmount', minWidth: 140, money: true },
{ label: '状态', prop: 'settlementStatusName', minWidth: 110 },
];
src/option/settlement/preSettlementForm.js
+1 -1
View File
@@ -4,7 +4,7 @@ export const settlementTypeOptions = [
];
export const preSettlementFormFields = [
{ label: '预结算单号', prop: 'preSettlementNo', readonly: true },
{ label: '预付结算单号', prop: 'preSettlementNo', readonly: true },
{ label: '合同名称', prop: 'contractId', type: 'contract', required: true },
{ label: '合同编号', prop: 'contractNo', readonly: true },
{ label: '项目名称', prop: 'projectName', readonly: true },
src/option/settlement/preSettlementSearch.js
+1 -1
View File
@@ -7,7 +7,7 @@ export const approvalStatusOptions = [
];
export const preSettlementSearchFields = [
{ label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
{ label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
{ label: '预付单号', prop: 'advanceNo', type: 'input' },
{ label: '项目名称', prop: 'projectName', type: 'input' },
{ label: '所属组织', prop: 'deptName', type: 'cascader' },
src/option/settlement/preSettlementTable.js
+1 -1
View File
@@ -1,5 +1,5 @@
export const preSettlementTableColumns = [
{ label: '预结算单号', prop: 'preSettlementNo', minWidth: 150, link: true, fixed: 'left' },
{ label: '预付结算单号', prop: 'preSettlementNo', minWidth: 150, link: true, fixed: 'left' },
{ label: '来源', prop: 'sourceType', minWidth: 100 },
{ label: '付款方', prop: 'payerName', minWidth: 160 },
{ label: '收款方', prop: 'payeeName', minWidth: 160 },
src/option/settlement/receivable-payable-detail.js
+2 -2
View File
@@ -20,7 +20,7 @@ export const searchFields = [
{ label: '货物名称', prop: 'cargoName', type: 'input' },
{ label: '合同编号', prop: 'contractNo', type: 'input' },
{ label: '合同名称', prop: 'contractName', type: 'input' },
{ label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
{ label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
{ label: '正式结算单号', prop: 'formalSettlementNo', type: 'input' },
{ label: '批次号', prop: 'batchNo', type: 'input' },
{ label: '车号', prop: 'vehicleNo', type: 'input' },
@@ -35,7 +35,7 @@ export const tableColumns = [
{ label: '合同编号', prop: 'contractNo', minWidth: 140 },
{ label: '合同名称', prop: 'contractName', minWidth: 140 },
{ label: '来源', prop: 'sourceType', minWidth: 110 },
{ label: '预结算单号', prop: 'preSettlementNo', minWidth: 140, link: true },
{ label: '预付结算单号', prop: 'preSettlementNo', minWidth: 140, link: true },
{ label: '正式结算单号', prop: 'formalSettlementNo', minWidth: 140, link: true },
{ label: '运单号', prop: 'waybillNo', minWidth: 140, link: true },
{ label: '车号', prop: 'vehicleNo', minWidth: 120 },
src/option/settlement/transportReconciliationSearch.js
+1 -1
View File
@@ -13,7 +13,7 @@ export const reconciliationStatusOptions = [
export const transportReconciliationSearchFields = [
{ prop: 'reconciliationNo', label: '对账单号', type: 'input' },
{ prop: 'preSettlementNos', label: '预结算单号', type: 'input' },
{ prop: 'preSettlementNos', label: '预付结算单号', type: 'input' },
{ prop: 'projectName', label: '项目', type: 'input' },
{ prop: 'deptName', label: '所属组织', type: 'cascader' },
{ prop: 'contractNo', label: '合同编号', type: 'input' },