diff --git a/src/api/oa/erp/finAccountInstallmentDetail/types.ts b/src/api/oa/erp/finAccountInstallmentDetail/types.ts index c2b12cd..1d1f36a 100644 --- a/src/api/oa/erp/finAccountInstallmentDetail/types.ts +++ b/src/api/oa/erp/finAccountInstallmentDetail/types.ts @@ -59,6 +59,15 @@ export interface FinAccountInstallmentDetailVO { */ remark: string; + /** 合同总价(列表/详情 join erp_contract_info) */ + contractTotalPrice?: number; + + /** 当前节点支付比例 %(join erp_contract_payment_method) */ + contractPaymentPercentage?: number; + + /** 当前节点合同约定支付金额(join erp_contract_payment_method) */ + contractPaymentAmount?: number; + } export interface FinAccountInstallmentDetailForm extends BaseEntity { @@ -117,11 +126,25 @@ export interface FinAccountInstallmentDetailForm extends BaseEntity { */ detailAmount?: number; + /** + * 回款分款状态(提交时回写主表,与字典 installment_status 一致) + */ + installmentStatus?: string; + /** * 备注 */ remark?: string; + /** 仅展示/校验:合同总价(来自 join,勿依赖提交) */ + contractTotalPrice?: number; + + /** 仅展示/校验:节点支付比例 % */ + contractPaymentPercentage?: number; + + /** 仅展示/校验:节点合同约定支付金额 */ + contractPaymentAmount?: number; + } export interface FinAccountInstallmentDetailQuery extends PageQuery { diff --git a/src/views/oa/erp/finAccountInstallment/index.vue b/src/views/oa/erp/finAccountInstallment/index.vue index 7ded2e9..21e86cd 100644 --- a/src/views/oa/erp/finAccountInstallment/index.vue +++ b/src/views/oa/erp/finAccountInstallment/index.vue @@ -147,12 +147,12 @@ + ¥{{ formatMoney(row.detailAmount) }} - @@ -236,8 +236,8 @@ - - + + @@ -250,10 +250,23 @@ + + {{ contractTotalPriceDisplay }} + - - - + + + + + + + 回款比例 {{ selectedStagePaymentRatioText }} + + + 金额 ¥{{ formatMoneyOrDash(selectedStageContractShareAmount) }} + + + @@ -297,10 +309,9 @@