🐛 修复收款流水继续认领预填与付款申请预结算引用提交
部分认领打开时预填历史关联结算单,可认领上限按公告未认领与收款金额取小;付款申请提交前清理误存正式结算单引用。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -3097,6 +3097,8 @@ export default {
|
||||
});
|
||||
},
|
||||
payload() {
|
||||
// 驳回重提前再清一次:避免历史误存的正式结算单 ID 盖过预结算引用
|
||||
this.clearFormalReferenceWhenPreOnly();
|
||||
const {
|
||||
id,
|
||||
paymentType,
|
||||
@@ -3133,13 +3135,25 @@ export default {
|
||||
paymentType === 'progress_advance' ||
|
||||
(this.referenceRows.length > 0 &&
|
||||
this.referenceRows.every(item => item.referenceType === 'pre'));
|
||||
// 进度预付 / 仅预结算引用:强制不传正式结算单 ID,并兜底恢复预结算单 ID
|
||||
const resolvedPreSettlementId =
|
||||
preSettlementId ||
|
||||
preSettlementIds?.[0] ||
|
||||
(usePreSettlementOnly ? settlementId : null) ||
|
||||
null;
|
||||
const resolvedPreSettlementIds =
|
||||
preSettlementIds?.length > 0
|
||||
? preSettlementIds
|
||||
: resolvedPreSettlementId
|
||||
? [resolvedPreSettlementId]
|
||||
: [];
|
||||
return {
|
||||
id,
|
||||
paymentType,
|
||||
settlementId: usePreSettlementOnly ? null : settlementId,
|
||||
settlementIds: usePreSettlementOnly ? [] : settlementIds,
|
||||
preSettlementId,
|
||||
preSettlementIds,
|
||||
preSettlementId: usePreSettlementOnly ? resolvedPreSettlementId : preSettlementId,
|
||||
preSettlementIds: usePreSettlementOnly ? resolvedPreSettlementIds : preSettlementIds,
|
||||
projectId,
|
||||
projectName,
|
||||
deptId,
|
||||
|
||||
Reference in New Issue
Block a user