fix

src/option/settlement/formalSettlementForm.js

@@ -11,8 +11,8 @@ export const formalSettlementFormFields = [
   { label: '汇率日期', prop: 'exchangeRateDate', type: 'date', required: true },
   { label: '结算汇率', prop: 'exchangeRate', type: 'number', required: true },
   { label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
-  { label: '申请付款金额（含预付）', prop: 'appliedPaymentAmount', readonly: true, money: true },
-  { label: '已收/已付合计', prop: 'paidAmount', readonly: true, money: true },
+  { label: '创建人', prop: 'createUserName', readonly: true },
+  { label: '创建时间', prop: 'createTime', readonly: true },
 ];
 
 export const createFormalSettlementForm = () => ({
@@ -27,6 +27,8 @@ export const createFormalSettlementForm = () => ({
   sourceDetailIds: [],
   exchangeRateDate: '',
   exchangeRate: 1,
+  createUserName: '',
+  createTime: '',
   attachmentsJson: '[]',
   remark: '',
 });

src/option/settlement/formalSettlementSearch.js

@@ -7,11 +7,21 @@ export const approvalStatusOptions = [
 ];
 
 export const invoiceStatusOptions = [
-  { label: '未收/开票', value: 'unreceived' },
-  { label: '部分收/开票', value: 'partial' },
-  { label: '已收/开票', value: 'completed' },
+  { label: '未开/收票', value: 'unreceived' },
+  { label: '部分开/收票', value: 'partial' },
+  { label: '已开/收票', value: 'completed' },
 ];
 
+export const invoiceStatusName = (value, settlementType) => {
+  const payable = settlementType === 'payable';
+  const labels = {
+    unreceived: payable ? '未收票' : '未开票',
+    partial: payable ? '部分收票' : '部分开票',
+    completed: payable ? '已收票' : '已开票',
+  };
+  return labels[value] || value || '-';
+};
+
 export const paymentStatusOptions = [
   { label: '未收/付款', value: 'unpaid' },
   { label: '部分收/付款', value: 'partial' },

src/option/settlement/settlementAdjustmentForm.js

@@ -1,13 +1,15 @@
 export const settlementAdjustmentFormFields = [
   { label: '单据号', prop: 'adjustmentNo' },
   { label: '关联结算单号', prop: 'formalSettlementId' },
-  { label: '客户/客商名称', prop: 'customerName' },
+  { label: '客户', prop: 'customerName' },
   { label: '结算单类型', prop: 'settlementTypeName' },
   { label: '关联合同名称', prop: 'contractName' },
   { label: '关联项目', prop: 'projectName' },
   { label: '原结算金额', prop: 'originalSettlementAmount', money: true },
   { label: '调整金额', prop: 'adjustmentAmount', money: true },
   { label: '调整后结算金额', prop: 'adjustedSettlementAmount', money: true },
+  { label: '创建日期', prop: 'createTime' },
+  { label: '创建人', prop: 'createUserName' },
 ];
 
 export const createSettlementAdjustmentForm = () => ({
@@ -24,6 +26,8 @@ export const createSettlementAdjustmentForm = () => ({
   adjustmentAmount: 0,
   originalSettlementAmount: 0,
   adjustedSettlementAmount: 0,
+  createTime: '',
+  createUserName: '',
   attachmentsJson: '[]',
   remark: '',
 });

src/option/settlement/settlementAdjustmentTable.js

@@ -8,8 +8,6 @@ export const settlementAdjustmentTableColumns = [
   { label: '合同编号', prop: 'contractNo', minWidth: 150 },
   { label: '合同名称', prop: 'contractName', minWidth: 170 },
   { label: '调整金额', prop: 'adjustmentAmount', minWidth: 130, money: true },
-  { label: '原结算金额', prop: 'originalSettlementAmount', minWidth: 140, money: true },
-  { label: '调整后结算金额', prop: 'adjustedSettlementAmount', minWidth: 160, money: true },
   { label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
   { label: '当前节点', prop: 'currentNode', minWidth: 120 },
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },