From 482f513cdb0213f762dd51de989833e510c7a4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E7=BA=A2=E5=85=B5?= <374362909@qq.com>
Date: Mon, 9 Mar 2026 23:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=9A=82=E5=AD=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/purchasingrequisition/add.vue    | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/views/purchase/purchasingrequisition/add.vue b/src/views/purchase/purchasingrequisition/add.vue
index 604d285..49b66d7 100644
--- a/src/views/purchase/purchasingrequisition/add.vue
+++ b/src/views/purchase/purchasingrequisition/add.vue
@@ -143,10 +143,11 @@
 								请先填写上方「是否特殊情况」「是否集采」「预算金额」，系统将根据填写结果展示「部门自行采购」或「学校统一采购」表单。
 							</el-alert>
 
-							<!-- 部门采购会议纪要（预算超过2000元必须上传，不区分部门自行采购/学校统一采购） -->
-							<div v-if="showPurchaseDetailBlocks && dataForm.budget != null && dataForm.budget >= BUDGET_DEPT_SELF_MEETING_MINUTES" class="mb20 form-section-compact">
-								<div class="step-title mb12">通用材料</div>
-								<el-row :gutter="16">
+							<!-- 分支一：部门自行采购（三列紧凑，textarea 单独一行） -->
+							<div class="mb20 form-section-compact" v-if="showPurchaseDetailBlocks && isDeptPurchase">
+								<div class="step-title mb12">部门自行采购</div>
+								<!-- 部门采购会议纪要（预算超过2000元必须上传） -->
+								<el-row :gutter="16" v-if="dataForm.budget != null && dataForm.budget >= BUDGET_DEPT_SELF_MEETING_MINUTES">
 									<el-col :span="8" class="mb12">
 										<el-form-item label="部门采购会议纪要" prop="deptSelfMeetingMinutes" required>
 											<upload-file
@@ -160,11 +161,6 @@
 										</el-form-item>
 									</el-col>
 								</el-row>
-							</div>
-
-							<!-- 分支一：部门自行采购（三列紧凑，textarea 单独一行） -->
-							<div class="mb20 form-section-compact" v-if="showPurchaseDetailBlocks && isDeptPurchase">
-								<div class="step-title mb12">部门自行采购</div>
 								<el-col :span="24" class="mb12">
 									<el-form-item label="采购内容" prop="projectContent">
 										<el-input
@@ -382,6 +378,21 @@
 							<!-- 分支二：学校统一采购（三列紧凑） -->
 							<div class="mb20 form-section-compact" v-if="showPurchaseDetailBlocks && !isDeptPurchase">
 								<div class="step-title mb12">学校统一采购</div>
+								<!-- 部门采购会议纪要（预算超过2000元必须上传） -->
+								<el-row :gutter="16" v-if="dataForm.budget != null && dataForm.budget >= BUDGET_DEPT_SELF_MEETING_MINUTES">
+									<el-col :span="8" class="mb12">
+										<el-form-item label="部门采购会议纪要" prop="deptSelfMeetingMinutes" required>
+											<upload-file
+												v-model="dataForm.deptSelfMeetingMinutes"
+												:limit="1"
+												:file-type="['pdf', 'jpg', 'jpeg', 'png']"
+												:data="{ fileType: FILE_TYPE_MAP.deptSelfMeetingMinutes }"
+												upload-file-url="/purchase/purchasingfiles/upload"
+												:disabled="flowFieldDisabled('deptSelfMeetingMinutes')"
+											/>
+										</el-form-item>
+									</el-col>
+								</el-row>
 								<el-row :gutter="16">
 									<el-col :span="8" class="mb12">
 										<el-form-item label="组织采购形式" prop="purchaseSchool" :required="isPurchaseSchoolRequired">