From 8bc778345b6eb773fe8b7f0f3ba6570392ea96ed 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:13:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(purchase):=20=E5=B1=A5=E7=BA=A6=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=98=AF=E5=90=A6=E7=AD=BE=E8=AE=A2=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除是否签订合同手动选择，由系统自动判断
- 合同信息单独分栏显示，展示合同名称/编号/金额/供应商
- 已签订合同以绿色卡片展示
- 未签订合同显示警告提示
- 合同审批中显示错误提示，禁止操作
- 供应商名称合并到合同信息中展示
- 未签订合同时才显示成交金额和供应商输入
---
 .../accept/AcceptCommonForm.vue               | 296 +++++++++---------
 .../accept/PurchasingAcceptModal.vue          |   5 +-
 2 files changed, 147 insertions(+), 154 deletions(-)

diff --git a/src/views/purchase/purchasingrequisition/accept/AcceptCommonForm.vue b/src/views/purchase/purchasingrequisition/accept/AcceptCommonForm.vue
index cc3c4c3..2561c49 100644
--- a/src/views/purchase/purchasingrequisition/accept/AcceptCommonForm.vue
+++ b/src/views/purchase/purchasingrequisition/accept/AcceptCommonForm.vue
@@ -11,45 +11,70 @@
 					<el-input :model-value="deptName || form.deptName" readonly placeholder="-" disabled />
 				</el-form-item>
 			</el-col>
-			<el-col :span="8" class="mb20">
-				<el-form-item label="是否签订合同" prop="hasContract">
-					<el-radio-group v-model="form.hasContract" :disabled="contractStatus === 'pending'">
-						<el-radio label="0">否</el-radio>
-						<el-radio label="1">是</el-radio>
-					</el-radio-group>
-				</el-form-item>
-			</el-col>
-			<el-col :span="8" class="mb20" v-if="form.hasContract === '1'">
-				<el-form-item label="合同信息">
-					<div v-if="contractLoading" class="contract-info-loading">
-						<el-icon class="is-loading"><Loading /></el-icon>
-						<span>正在查询合同...</span>
+		</el-row>
+
+		<el-divider content-position="left">
+			<span class="divider-title">合同信息</span>
+		</el-divider>
+
+		<div v-if="contractLoading" class="contract-loading">
+			<el-icon class="is-loading"><Loading /></el-icon>
+			<span>正在查询合同...</span>
+		</div>
+
+		<div v-else-if="form.hasContract === '1' && contractFlowStatus === '1'" class="contract-card success">
+			<div class="contract-card-header">
+				<el-icon><CircleCheckFilled /></el-icon>
+				<span>已签订合同</span>
+			</div>
+			<el-row :gutter="24">
+				<el-col :span="8">
+					<div class="info-item">
+						<span class="info-label">合同名称</span>
+						<span class="info-value">{{ form.contractName || form.contractNo || '-' }}</span>
 					</div>
-					<div v-else-if="contractStatus === 'completed' && currentContract" class="contract-info-display">
-						<div class="contract-item">
-							<span class="label">合同名称：</span>
-							<span class="value">{{ currentContract.contractName || currentContract.contractNo || '-' }}</span>
-						</div>
-						<div class="contract-item">
-							<span class="label">合同金额：</span>
-							<span class="value">{{ currentContract.money ? `${currentContract.money}元` : '-' }}</span>
-						</div>
+				</el-col>
+				<el-col :span="8">
+					<div class="info-item">
+						<span class="info-label">合同编号</span>
+						<span class="info-value">{{ form.contractNo || '-' }}</span>
 					</div>
-					<el-alert v-else-if="contractStatus === 'none'" type="warning" :closable="false" show-icon>
-						<template #title>
-							<span>未找到关联合同，无法进行履约操作</span>
-						</template>
-					</el-alert>
-					<el-alert v-else-if="contractStatus === 'pending'" type="error" :closable="false" show-icon>
-						<template #title>
-							<span>合同正在流程审批中，无法进行履约操作</span>
-						</template>
-					</el-alert>
-				</el-form-item>
-			</el-col>
+				</el-col>
+				<el-col :span="8">
+					<div class="info-item">
+						<span class="info-label">合同金额</span>
+						<span class="info-value">{{ form.contractMoney ? `${form.contractMoney}元` : '-' }}</span>
+					</div>
+				</el-col>
+				<el-col :span="8">
+					<div class="info-item">
+						<span class="info-label">供应商名称</span>
+						<span class="info-value">{{ form.supplierName || '-' }}</span>
+					</div>
+				</el-col>
+			</el-row>
+		</div>
+
+		<el-alert v-else-if="form.hasContract === '1' && contractFlowStatus !== '1'" type="error" :closable="false" show-icon class="mb20">
+			<template #title>
+				<span>合同正在流程审批中，无法进行履约操作</span>
+			</template>
+		</el-alert>
+
+		<el-alert v-else type="warning" :closable="false" show-icon class="mb20">
+			<template #title>
+				<span>未签订合同</span>
+			</template>
+		</el-alert>
+
+		<el-divider content-position="left">
+			<span class="divider-title">验收信息</span>
+		</el-divider>
+
+		<el-row :gutter="24">
 			<el-col :span="8" class="mb20">
 				<el-form-item label="是否分期验收" prop="isInstallment">
-					<el-radio-group v-model="form.isInstallment" :disabled="contractStatus === 'pending'">
+					<el-radio-group v-model="form.isInstallment" :disabled="!canEdit">
 						<el-radio label="0">否</el-radio>
 						<el-radio label="1">是</el-radio>
 					</el-radio-group>
@@ -57,17 +82,7 @@
 			</el-col>
 			<el-col :span="8" class="mb20" v-if="form.isInstallment === '1'">
 				<el-form-item label="分期次数" prop="totalPhases">
-					<el-input-number v-model="form.totalPhases" :min="1" :max="99" placeholder="请输入" style="width: 100%" :disabled="contractStatus === 'pending'" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="8" class="mb20">
-				<el-form-item label="供应商名称" prop="supplierName">
-					<el-input 
-						v-model="form.supplierName" 
-						:placeholder="form.hasContract === '1' ? '自动带出' : '请输入供应商名称'" 
-						:readonly="form.hasContract === '1'"
-						:disabled="contractStatus === 'pending'"
-					/>
+					<el-input-number v-model="form.totalPhases" :min="1" :max="99" placeholder="请输入" style="width: 100%" :disabled="!canEdit" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="8" class="mb20">
@@ -82,7 +97,7 @@
 						:remote-method="searchAssetAdmin"
 						:loading="assetAdminLoading"
 						style="width: 100%"
-						:disabled="contractStatus === 'pending'"
+						:disabled="!canEdit"
 						@change="onAssetAdminChange"
 					>
 						<el-option
@@ -110,7 +125,7 @@
 						:remote-method="searchPurchaser"
 						:loading="purchaserLoading"
 						style="width: 100%"
-						:disabled="contractStatus === 'pending'"
+						:disabled="!canEdit"
 						@change="onPurchaserChange"
 					>
 						<el-option
@@ -127,27 +142,27 @@
 			</el-col>
 
 			<el-col :span="8" class="mb20" v-if="form.hasContract === '0'">
-				<el-form-item label="成交金额" prop="transactionAmount" :required="form.hasContract === '0'">
+				<el-form-item label="成交金额" prop="transactionAmount" required>
 					<el-input-number v-model="form.transactionAmount" :min="0" :precision="2" placeholder="请输入成交金额" style="width: 100%" />
 				</el-form-item>
 			</el-col>
+
+			<el-col :span="8" class="mb20" v-if="form.hasContract === '0'">
+				<el-form-item label="供应商名称" prop="supplierName">
+					<el-input v-model="form.supplierName" placeholder="请输入供应商名称" clearable />
+				</el-form-item>
+			</el-col>
 		</el-row>
 	</el-form>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, watch, onMounted } from 'vue';
+import { ref, reactive, watch, computed } from 'vue';
 import type { FormInstance, FormRules } from 'element-plus';
-import { Loading } from '@element-plus/icons-vue';
-import { getContracts, searchTeachers } from '/@/api/purchase/purchasingrequisition';
+import { Loading, CircleCheckFilled } from '@element-plus/icons-vue';
+import { searchTeachers } from '/@/api/purchase/purchasingrequisition';
 import { useMessage } from '/@/hooks/message';
 
-const CONTRACT_FLOW_STATUS = {
-	RUNNING: '0',
-	COMPLETED: '1',
-	CANCELLED: '2',
-};
-
 const props = defineProps<{
 	modelValue: Record<string, any>;
 	projectName?: string;
@@ -160,8 +175,7 @@ const emit = defineEmits(['update:modelValue']);
 
 const formRef = ref<FormInstance>();
 const contractLoading = ref(false);
-const currentContract = ref<any>(null);
-const contractStatus = ref<'none' | 'pending' | 'completed' | ''>('');
+const contractFlowStatus = ref('');
 
 const purchaserOptions = ref<any[]>([]);
 const purchaserLoading = ref(false);
@@ -172,6 +186,9 @@ const assetAdminLoading = ref(false);
 const form = reactive({
 	hasContract: '0',
 	contractId: '',
+	contractName: '',
+	contractNo: '',
+	contractMoney: null as number | null,
 	isInstallment: '0',
 	totalPhases: 1,
 	projectName: '',
@@ -182,11 +199,29 @@ const form = reactive({
 	assetAdminId: '',
 	assetAdminName: '',
 	transactionAmount: null as number | null,
-	...props.modelValue,
+});
+
+const canEdit = computed(() => {
+	return form.hasContract !== '1' || contractFlowStatus.value === '1';
 });
 
 const syncFormFromModel = (val: Record<string, any> | undefined) => {
-	Object.assign(form, val || {});
+	if (!val) return;
+	form.hasContract = val.hasContract || '0';
+	form.contractId = val.contractId || '';
+	form.contractName = val.contractName || '';
+	form.contractNo = val.contractNo || '';
+	form.contractMoney = val.contractMoney || null;
+	contractFlowStatus.value = val.contractFlowStatus || '';
+	form.isInstallment = val.isInstallment || '0';
+	form.totalPhases = val.totalPhases || 1;
+	form.supplierName = val.supplierName || '';
+	form.purchaserId = val.purchaserId || '';
+	form.purchaserName = val.purchaserName || '';
+	form.assetAdminId = val.assetAdminId || '';
+	form.assetAdminName = val.assetAdminName || '';
+	form.transactionAmount = val.transactionAmount || null;
+
 	if (form.purchaserId && form.purchaserName) {
 		purchaserOptions.value = [{ teacherNo: form.purchaserId, realName: form.purchaserName, name: form.purchaserName }];
 	}
@@ -195,52 +230,6 @@ const syncFormFromModel = (val: Record<string, any> | undefined) => {
 	}
 };
 
-const loadContractInfo = async () => {
-	if (!props.purchaseId) {
-		contractStatus.value = '';
-		currentContract.value = null;
-		return;
-	}
-	
-	contractLoading.value = true;
-	contractStatus.value = '';
-	currentContract.value = null;
-	
-	try {
-		const res = await getContracts({ id: props.purchaseId });
-		const list = res?.data;
-		
-		if (Array.isArray(list) && list.length > 0) {
-			const contract = list[0];
-			currentContract.value = contract;
-			form.contractId = contract.id;
-			
-			if (contract.flowStatus === CONTRACT_FLOW_STATUS.COMPLETED) {
-				contractStatus.value = 'completed';
-				form.supplierName = contract.supplierName || '';
-			} else if (contract.flowStatus === CONTRACT_FLOW_STATUS.RUNNING) {
-				contractStatus.value = 'pending';
-				form.supplierName = '';
-			} else {
-				contractStatus.value = 'pending';
-				form.supplierName = '';
-			}
-		} else {
-			contractStatus.value = 'none';
-			currentContract.value = null;
-			form.contractId = '';
-			form.supplierName = '';
-		}
-	} catch (e: any) {
-		contractStatus.value = 'none';
-		currentContract.value = null;
-		form.contractId = '';
-		form.supplierName = '';
-	} finally {
-		contractLoading.value = false;
-	}
-};
-
 const searchPurchaser = async (query: string) => {
 	if (!query) {
 		purchaserOptions.value = [];
@@ -311,35 +300,12 @@ watch(
 	() => props.resetKey,
 	() => {
 		syncFormFromModel(props.modelValue);
-		contractStatus.value = '';
-		currentContract.value = null;
 	}
 );
 
 watch(form, () => emit('update:modelValue', { ...form }), { deep: true });
 
-watch(
-	() => form.hasContract,
-	(val) => {
-		if (val === '1') {
-			loadContractInfo();
-		} else {
-			contractStatus.value = '';
-			currentContract.value = null;
-			form.contractId = '';
-		}
-		formRef.value?.validateField('transactionAmount');
-	}
-);
-
-onMounted(() => {
-	if (form.hasContract === '1') {
-		loadContractInfo();
-	}
-});
-
 const rules: FormRules = {
-	hasContract: [{ required: true, message: '请选择是否签订合同', trigger: 'change' }],
 	isInstallment: [{ required: true, message: '请选择是否分期验收', trigger: 'change' }],
 	totalPhases: [{ required: true, message: '请输入分期次数', trigger: 'blur' }],
 	transactionAmount: [
@@ -357,14 +323,10 @@ const rules: FormRules = {
 };
 
 const validate = async () => {
-	if (form.hasContract === '1' && contractStatus.value === 'pending') {
+	if (form.hasContract === '1' && contractFlowStatus.value !== '1') {
 		useMessage().error('合同正在流程审批中，无法进行履约操作');
 		return false;
 	}
-	if (form.hasContract === '1' && contractStatus.value === 'none') {
-		useMessage().error('未找到关联合同，无法进行履约操作');
-		return false;
-	}
 	return formRef.value?.validate();
 };
 
@@ -380,28 +342,62 @@ defineExpose({ validate, form });
 	color: #999;
 	margin-top: 4px;
 }
-.contract-info-loading {
+.divider-title {
+	font-weight: 600;
+	color: #303133;
+}
+.contract-loading {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 8px;
+	padding: 40px 0;
+	color: #409eff;
+}
+.contract-card {
+	border-radius: 8px;
+	padding: 16px 20px;
+	margin-bottom: 20px;
+}
+.contract-card.success {
+	background: linear-gradient(135deg, #f0f9eb 0%, #e1f3d8 100%);
+	border: 1px solid #c2e7b0;
+}
+.contract-card-header {
 	display: flex;
 	align-items: center;
 	gap: 8px;
-	color: #409eff;
+	margin-bottom: 16px;
+	font-size: 16px;
+	font-weight: 600;
+	color: #67c23a;
 }
-.contract-info-display {
-	background: #f5f7fa;
-	border-radius: 4px;
-	padding: 12px;
+.contract-card-header .el-icon {
+	font-size: 20px;
 }
-.contract-item {
-	display: flex;
-	align-items: center;
-	line-height: 1.8;
+.info-item {
+	margin-bottom: 12px;
 }
-.contract-item .label {
-	color: #606266;
-	min-width: 80px;
+.info-item:last-child {
+	margin-bottom: 0;
 }
-.contract-item .value {
+.info-label {
+	display: block;
+	font-size: 12px;
+	color: #909399;
+	margin-bottom: 4px;
+}
+.info-value {
+	display: block;
+	font-size: 14px;
 	color: #303133;
 	font-weight: 500;
 }
+:deep(.el-divider__text) {
+	background-color: #fff;
+	padding: 0 10px;
+}
+:deep(.el-divider) {
+	margin: 24px 0;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/purchase/purchasingrequisition/accept/PurchasingAcceptModal.vue b/src/views/purchase/purchasingrequisition/accept/PurchasingAcceptModal.vue
index 8d2f21a..b5353b9 100644
--- a/src/views/purchase/purchasingrequisition/accept/PurchasingAcceptModal.vue
+++ b/src/views/purchase/purchasingrequisition/accept/PurchasingAcceptModal.vue
@@ -237,7 +237,6 @@ const saveCommonConfig = async () => {
 	const formRef = commonFormRef.value;
 	const valid = await formRef?.validate?.().catch(() => false);
 	if (!valid) return;
-	// 直接从子组件 form 读取，确保拿到用户填写的最新值（避免 v-model 同步延迟）
 	const form = formRef?.form || commonForm.value;
 	const isInstallment = form.isInstallment === '1' || form.isInstallment === 1;
 	if (isInstallment && (!form.totalPhases || form.totalPhases < 1)) {
@@ -248,16 +247,14 @@ const saveCommonConfig = async () => {
 	try {
 		await apiSaveCommonConfig({
 			purchaseId: String(purchaseId.value),
-			hasContract: form.hasContract ?? '0',
-			contractId: form.contractId ?? '',
 			isInstallment: form.isInstallment ?? '0',
 			totalPhases: isInstallment ? Number(form.totalPhases) || 1 : 1,
-			supplierName: String(form.supplierName ?? ''),
 			purchaserId: String(form.purchaserId ?? ''),
 			purchaserName: String(form.purchaserName ?? ''),
 			assetAdminId: String(form.assetAdminId ?? ''),
 			assetAdminName: String(form.assetAdminName ?? ''),
 			transactionAmount: form.transactionAmount ?? null,
+			supplierName: String(form.supplierName ?? ''),
 		});
 		useMessage().success('保存成功');
 		await loadData();