From 451004d84e9fd8c7162959f8dcc0c8ed44048498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E7=BA=A2=E5=85=B5?= <374362909@qq.com>
Date: Sun, 15 Mar 2026 11:26:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(purchase):=20=E4=BF=AE=E5=A4=8D=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E6=9C=AA=E6=AD=A3=E7=A1=AE=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- loadData中始终传递合同相关字段(不再依赖batches是否存在)
- 添加contractFlowStatus、contractName、contractNo、contractMoney字段传递
- 更新DEFAULT_COMMON_FORM包含新字段
---
 .../accept/PurchasingAcceptModal.vue          | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/purchase/purchasingrequisition/accept/PurchasingAcceptModal.vue b/src/views/purchase/purchasingrequisition/accept/PurchasingAcceptModal.vue
index b5353b9..cbd489a 100644
--- a/src/views/purchase/purchasingrequisition/accept/PurchasingAcceptModal.vue
+++ b/src/views/purchase/purchasingrequisition/accept/PurchasingAcceptModal.vue
@@ -147,30 +147,26 @@ const loadData = async () => {
 	loading.value = true;
 	try {
 		const configRes = await getCommonConfigWithBatches(currentId);
-		// 防止快速切换：若已打开其他申请单，忽略本次结果
 		if (String(purchaseId.value) !== currentId) return;
 
 		const config = configRes?.data;
 
 		if (config?.common) {
 			applyInfo.value = config.common;
-			// 采购人员和资产管理员始终回填
 			commonForm.value.purchaserId = config.common.purchaserId || '';
 			commonForm.value.purchaserName = config.common.purchaserName || '';
 			commonForm.value.assetAdminId = config.common.assetAdminId || '';
 			commonForm.value.assetAdminName = config.common.assetAdminName || '';
-
-			// 其他字段仅当存在已保存批次时回填
-			if (config?.batches?.length) {
-				Object.assign(commonForm.value, {
-					hasContract: config.common.hasContract || '0',
-					contractId: config.common.contractId || '',
-					isInstallment: config.common.isInstallment || '0',
-					totalPhases: config.common.totalPhases || 1,
-					supplierName: config.common.supplierName || '',
-					transactionAmount: config.common.transactionAmount || null,
-				});
-			}
+			commonForm.value.hasContract = config.common.hasContract || '0';
+			commonForm.value.contractId = config.common.contractId || '';
+			commonForm.value.contractName = config.common.contractName || '';
+			commonForm.value.contractNo = config.common.contractNo || '';
+			commonForm.value.contractMoney = config.common.contractMoney || null;
+			commonForm.value.contractFlowStatus = config.common.contractFlowStatus || '';
+			commonForm.value.supplierName = config.common.supplierName || '';
+			commonForm.value.isInstallment = config.common.isInstallment || '0';
+			commonForm.value.totalPhases = config.common.totalPhases || 1;
+			commonForm.value.transactionAmount = config.common.transactionAmount || null;
 		}
 
 		if (config?.batches?.length) {
@@ -327,6 +323,10 @@ const handleClose = () => {
 const DEFAULT_COMMON_FORM = {
 	hasContract: '0',
 	contractId: '',
+	contractName: '',
+	contractNo: '',
+	contractMoney: null,
+	contractFlowStatus: '',
 	isInstallment: '0',
 	totalPhases: 1,
 	supplierName: '',