Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer

src/components/Upload/index.vue

@@ -22,34 +22,30 @@
 				</div>
 			</div>
 		</div>
-		<!-- 默认上传组件 -->
+		<!-- 默认上传组件 - 简洁模式 -->
+		<div v-if="props.type === 'default' && !props.disabled" class="upload-file-default">
 			<el-upload
 				ref="fileUpload"
-			v-if="props.type === 'default' && !props.disabled"
 				:action="baseUrl + other.adaptationUrl(props.uploadFileUrl)"
 				:before-upload="handleBeforeUpload"
-			:file-list="fileList"
+				:file-list="[]"
 				:headers="headers"
 				:limit="limit"
 				:on-error="handleUploadError"
-			:on-remove="handleRemove"
-			:on-preview="handlePreview"
 				:on-exceed="handleExceed"
 				:data="formData"
 				:auto-upload="autoUpload"
 				:on-success="handleUploadSuccess"
 				:accept="fileAccept"
-			class="upload-file-uploader"
+				class="upload-file-uploader-simple"
-			drag
 				multiple
 			>
-			<i class="el-icon-upload"></i>
+				<el-button type="primary" size="small">
-			<div class="el-upload__text">
+					<el-icon class="mr-1"><Upload /></el-icon>
-				{{ $t('excel.operationNotice') }}
+					{{ $t('excel.clickUpload') }}
-				<em>{{ $t('excel.clickUpload') }}</em>
+				</el-button>
-			</div>
 				<template #tip>
-				<div class="el-upload__tip" v-if="props.isShowTip">
+					<div class="el-upload__tip" v-if="props.isShowTip" style="margin-top: 8px; font-size: 12px; color: #909399;">
 						{{ $t('excel.pleaseUpload') }}
 						<template v-if="props.fileSize">
 							{{ $t('excel.size') }} <b style="color: #f56c6c">{{ props.fileSize }}MB</b></template
@@ -61,6 +57,39 @@
 					</div>
 				</template>
 			</el-upload>
+			<!-- 已上传文件列表 -->
+			<div v-if="fileList.length > 0" class="uploaded-files-list" style="margin-top: 12px;">
+				<div
+					v-for="(file, index) in fileList"
+					:key="index"
+					class="uploaded-file-item"
+					style="display: flex; align-items: center; padding: 8px 12px; margin-bottom: 8px; background: #f5f7fa; border-radius: 4px;"
+				>
+					<el-icon class="mr-2" style="color: #409eff;"><Document /></el-icon>
+					<span class="file-name" style="flex: 1; font-size: 14px; color: #606266; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+						{{ getFileName(file) }}
+					</span>
+					<el-button
+						type="danger"
+						link
+						size="small"
+						@click="handleRemove(file)"
+						style="margin-left: 8px;"
+					>
+						<el-icon><Delete /></el-icon>
+					</el-button>
+					<el-button
+						type="primary"
+						link
+						size="small"
+						@click="handlePreview(file)"
+						style="margin-left: 4px;"
+					>
+						<el-icon><Download /></el-icon>
+					</el-button>
+				</div>
+			</div>
+		</div>
 		<!-- 简单上传组件 -->
 		<el-upload
 			ref="fileUpload"
@@ -103,7 +132,7 @@ import { Session } from '/@/utils/storage';
 import other from '/@/utils/other';
 import { useI18n } from 'vue-i18n';
 import { ref, computed, watch } from 'vue';
-import { Document, Download } from '@element-plus/icons-vue';
+import { Document, Download, Upload, Delete } from '@element-plus/icons-vue';
 
 // 定义基础URL
 const baseUrl = import.meta.env.VITE_API_URL || '';

src/views/finance/purchasingrequisition/add.vue

@@ -155,7 +155,7 @@
 
                 <!-- 商务洽谈 -->
                 <el-form-item 
-                  v-if="dataForm.purchaseType === PURCHASE_TYPE_IDS.BUSINESS_NEGOTIATION"
+                  v-if="isPurchaseType(PURCHASE_TYPE_IDS.BUSINESS_NEGOTIATION)"
                   label="商务洽谈表" 
                   prop="businessNegotiationTable" 
                   class="mb20">
@@ -171,12 +171,13 @@
                     v-model="dataForm.businessNegotiationTable"
                     :limit="5"
                     :file-type="['doc', 'docx', 'pdf']"
+                    :data="{ fileType: FILE_TYPE_MAP.businessNegotiationTable }"
                     upload-file-url="/purchase/purchasingfiles/upload" />
                 </el-form-item>
 
                 <!-- 市场采购 -->
                 <el-form-item 
-                  v-if="dataForm.purchaseType === PURCHASE_TYPE_IDS.MARKET_PURCHASE"
+                  v-if="isPurchaseType(PURCHASE_TYPE_IDS.MARKET_PURCHASE)"
                   label="市场采购纪要" 
                   prop="marketPurchaseMinutes" 
                   class="mb20">
@@ -192,12 +193,13 @@
                     v-model="dataForm.marketPurchaseMinutes"
                     :limit="5"
                     :file-type="['doc', 'docx', 'pdf']"
+                    :data="{ fileType: FILE_TYPE_MAP.marketPurchaseMinutes }"
                     upload-file-url="/purchase/purchasingfiles/upload" />
                 </el-form-item>
 
                 <!-- 网上商城 -->
                 <el-form-item 
-                  v-if="dataForm.purchaseType === PURCHASE_TYPE_IDS.ONLINE_MALL"
+                  v-if="isPurchaseType(PURCHASE_TYPE_IDS.ONLINE_MALL)"
                   label="网上商城采购相关材料" 
                   prop="onlineMallMaterials" 
                   class="mb20">
@@ -205,11 +207,12 @@
                     v-model="dataForm.onlineMallMaterials"
                     :limit="1"
                     :file-type="['doc', 'docx', 'pdf']"
+                    :data="{ fileType: FILE_TYPE_MAP.onlineMallMaterials }"
                     upload-file-url="/purchase/purchasingfiles/upload" />
                 </el-form-item>
 
                 <!-- 委托采购中心 -->
-                <template v-if="dataForm.purchaseType === PURCHASE_TYPE_IDS.ENTRUST_CENTER">
+                <template v-if="isPurchaseType(PURCHASE_TYPE_IDS.ENTRUST_CENTER)">
                   <el-form-item label="委托采购中心方式" prop="entrustCenterType" class="mb20">
                     <el-radio-group v-model="dataForm.entrustCenterType">
                       <el-radio label="service_online">服务类网上商城</el-radio>
@@ -258,6 +261,7 @@
                           v-model="dataForm.serviceDirectSelect"
                           :limit="5"
                           :file-type="['doc', 'docx', 'pdf']"
+                          :data="{ fileType: FILE_TYPE_MAP.serviceDirectSelect }"
                           upload-file-url="/purchase/purchasingfiles/upload" />
                       </el-form-item>
                     </template>
@@ -278,6 +282,7 @@
                         v-model="dataForm.serviceInviteSelect"
                         :limit="5"
                         :file-type="['doc', 'docx', 'pdf']"
+                        :data="{ fileType: FILE_TYPE_MAP.serviceInviteSelect }"
                         upload-file-url="/purchase/purchasingfiles/upload" />
                     </el-form-item>
                   </template>
@@ -300,6 +305,7 @@
                       v-model="dataForm.purchaseRequirementTemplate"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.purchaseRequirementTemplate }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                 </template>
@@ -342,6 +348,7 @@
                         v-model="dataForm.serviceInviteSelect"
                         :limit="5"
                         :file-type="['doc', 'docx', 'pdf']"
+                        :data="{ fileType: FILE_TYPE_MAP.serviceInviteSelect }"
                         upload-file-url="/purchase/purchasingfiles/upload" />
                     </el-form-item>
                   </template>
@@ -363,6 +370,7 @@
                       v-model="dataForm.servicePublicSelectAuto"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.servicePublicSelectAuto }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                 </template>
@@ -373,6 +381,7 @@
                     v-model="dataForm.otherMaterials"
                     :limit="5"
                     :file-type="['zip']"
+                    :data="{ fileType: FILE_TYPE_MAP.otherMaterials }"
                     upload-file-url="/purchase/purchasingfiles/upload" />
                   <div class="template-note">支持上传zip格式的压缩包文件</div>
                 </el-form-item>
@@ -461,6 +470,7 @@
                       v-model="dataForm.feasibilityReport"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.feasibilityReport }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                   <el-form-item label="会议纪要" prop="meetingMinutes" class="mb20">
@@ -468,6 +478,7 @@
                       v-model="dataForm.meetingMinutes"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.meetingMinutes }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                 </template>
@@ -479,12 +490,13 @@
                       v-model="dataForm.meetingMinutesUrgent"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.meetingMinutesUrgent }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                 </template>
 
                 <!-- 特殊情况：单一来源 -->
-                <template v-if="dataForm.isSpecial === '2'">
+                <template v-if="isSpecialType('2')">
                   <el-form-item 
                     label="单一来源论专家证附件" 
                     prop="singleSourceProof" 
@@ -501,6 +513,7 @@
                       v-model="dataForm.singleSourceProof"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.singleSourceProof }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                   <el-form-item label="会议纪要" prop="meetingMinutesSingle" class="mb20">
@@ -508,12 +521,13 @@
                       v-model="dataForm.meetingMinutesSingle"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.meetingMinutesSingle }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                 </template>
 
                 <!-- 特殊情况：进口 -->
-                <template v-if="dataForm.isSpecial === '3'">
+                <template v-if="isSpecialType('3')">
                   <el-form-item 
                     label="进口产品申请及专家论证意见表" 
                     prop="importApplication" 
@@ -530,6 +544,7 @@
                       v-model="dataForm.importApplication"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.importApplication }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                   <el-form-item label="会议纪要" prop="meetingMinutesImport" class="mb20">
@@ -537,6 +552,7 @@
                       v-model="dataForm.meetingMinutesImport"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.meetingMinutesImport }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </el-form-item>
                 </template>
@@ -587,6 +603,7 @@
                         v-model="dataForm.serviceInviteSelectSchool"
                         :limit="5"
                         :file-type="['doc', 'docx', 'pdf']"
+                        :data="{ fileType: FILE_TYPE_MAP.serviceInviteSelectSchool }"
                         upload-file-url="/purchase/purchasingfiles/upload" />
                     </template>
                     <!-- 无推荐供应商：显示公开比选模板 -->
@@ -605,6 +622,7 @@
                         v-model="dataForm.servicePublicSelectSchoolAuto"
                         :limit="5"
                         :file-type="['doc', 'docx', 'pdf']"
+                        :data="{ fileType: FILE_TYPE_MAP.servicePublicSelectSchoolAuto }"
                         upload-file-url="/purchase/purchasingfiles/upload" />
                     </template>
                   </template>
@@ -625,6 +643,7 @@
                       v-model="dataForm.servicePublicSelectSchool"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.servicePublicSelectSchool }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </template>
                   
@@ -644,6 +663,7 @@
                       v-model="dataForm.purchaseRequirement"
                       :limit="5"
                       :file-type="['doc', 'docx', 'pdf']"
+                      :data="{ fileType: FILE_TYPE_MAP.purchaseRequirement }"
                       upload-file-url="/purchase/purchasingfiles/upload" />
                   </template>
                 </el-form-item>
@@ -658,6 +678,7 @@
                     v-model="dataForm.governmentPurchaseIntent"
                     :limit="5"
                     :file-type="['doc', 'docx', 'pdf']"
+                    :data="{ fileType: FILE_TYPE_MAP.governmentPurchaseIntent }"
                     upload-file-url="/purchase/purchasingfiles/upload" />
                 </el-form-item>
 
@@ -667,6 +688,7 @@
                     v-model="dataForm.otherMaterials"
                     :limit="5"
                     :file-type="['zip']"
+                    :data="{ fileType: FILE_TYPE_MAP.otherMaterials }"
                     upload-file-url="/purchase/purchasingfiles/upload" />
                   <div class="template-note">支持上传zip格式的压缩包文件</div>
                 </el-form-item>
@@ -808,6 +830,61 @@ const PURCHASE_TYPE_IDS = {
   ENTRUST_CENTER: '981bf052a0b30b028a4a89ae490c9b1d' // 委托采购中心
 };
 
+// 文件类型映射（对应数据库 file_type 字段）
+// 10:商务洽谈纪要 20:市场采购纪要 30:网上商城采购相关材料 40:可行性论证报告 50:会议记录 60:其他材料 70:单一来源专家论证表 80:进口产品申请表 90:进口产品专家论证表 100:政府采购意向表 110:履约验收单
+const FILE_TYPE_MAP: Record<string, string> = {
+  businessNegotiationTable: '10', // 商务洽谈纪要
+  marketPurchaseMinutes: '20', // 市场采购纪要
+  onlineMallMaterials: '30', // 网上商城采购相关材料
+  feasibilityReport: '40', // 可行性论证报告
+  meetingMinutes: '50', // 会议记录
+  meetingMinutesUrgent: '50', // 会议记录
+  meetingMinutesSingle: '50', // 会议记录
+  meetingMinutesImport: '50', // 会议记录
+  otherMaterials: '60', // 其他材料
+  singleSourceProof: '70', // 单一来源专家论证表
+  importApplication: '80', // 进口产品申请表
+  governmentPurchaseIntent: '100', // 政府采购意向表
+  // 需求文件相关（暂时使用默认值，可根据实际需求调整）
+  serviceDirectSelect: '30', // 服务商城项目需求模板（直选）- 归类到网上商城采购相关材料
+  serviceInviteSelect: '30', // 服务商城项目需求模板（邀请比选）
+  servicePublicSelect: '30', // 服务商城项目需求模板（公开比选）
+  servicePublicSelectAuto: '30', // 服务商城项目需求模板（公开比选-自动）
+  purchaseRequirementTemplate: '30', // 采购需求填报模板
+  purchaseRequirement: '30', // 采购需求填报模板
+  serviceInviteSelectSchool: '30', // 服务商城项目需求模板（邀请比选-学校）
+  servicePublicSelectSchoolAuto: '30', // 服务商城项目需求模板（公开比选-学校-自动）
+  servicePublicSelectSchool: '30', // 服务商城项目需求模板（公开比选-学校）
+};
+
+// 辅助函数：判断当前采购方式是否为指定类型（通过 id 或 value 匹配）
+const isPurchaseType = (purchaseTypeId: string) => {
+  if (!dataForm.purchaseType) return false;
+  // 在字典中查找匹配的项
+  const item = purchaseTypeDeptList.value.find(item => 
+    item.id === purchaseTypeId || item.value === purchaseTypeId
+  );
+  if (item) {
+    return dataForm.purchaseType === item.value;
+  }
+  // 如果字典中找不到，直接比较 value（兼容性处理）
+  return dataForm.purchaseType === purchaseTypeId;
+};
+
+// 辅助函数：判断特殊情况是否为指定类型（通过 id 或 value 匹配）
+const isSpecialType = (specialIdOrValue: string) => {
+  if (!dataForm.isSpecial) return false;
+  // 在字典中查找匹配的项
+  const item = isSpecialList.value.find(item => 
+    item.id === specialIdOrValue || item.value === specialIdOrValue
+  );
+  if (item) {
+    return dataForm.isSpecial === item.value;
+  }
+  // 如果字典中找不到，直接比较 value（兼容性处理）
+  return dataForm.isSpecial === specialIdOrValue;
+};
+
 // 判断是否为部门自行采购
 // 条件：特殊情况=否 且 集采=否 且 预算金额<5万 → 部门自行采购
 // 其他情况 → 学校统一采购
@@ -978,7 +1055,7 @@ const isAutoSelectPurchaseTypeUnion = computed(() => {
 watch([() => dataForm.categoryCode, () => dataForm.budget], () => {
   // 部门自行采购：自动设置网上商城
   if (isAutoSelectPurchaseType.value && isDeptPurchase.value) {
-    // 查找网上商城选项（通过 id 或 label 匹配）
+    // 查找网上商城选项（通过 id、value 或 label 匹配）
     const onlineMallOption = purchaseTypeDeptList.value.find(item => {
       const label = item.label || item.dictLabel || item.name || '';
       return item.id === PURCHASE_TYPE_IDS.ONLINE_MALL || 
@@ -1360,6 +1437,7 @@ const handleSchoolLeaderChange = (value: string) => {
 };
 
 // 处理文件ID字符串转数组
+// 从上传返回的URL中提取文件ID，拼成数组格式：["id1", "id2"]
 const getFileIdsArray = (fileIds: string | string[]): string[] => {
   if (!fileIds) return [];
   if (Array.isArray(fileIds)) return fileIds;
@@ -1369,20 +1447,42 @@ const getFileIdsArray = (fileIds: string | string[]): string[] => {
   
   urls.forEach(url => {
     try {
+      // 尝试解析为URL
       const urlObj = new URL(url, window.location.origin);
-      const id = urlObj.searchParams.get('id') || urlObj.searchParams.get('fileName');
+      // 优先从URL参数中获取id
+      let id = urlObj.searchParams.get('id');
+      
+      // 如果没有id参数，尝试从路径中提取（可能是直接的文件ID）
+      if (!id) {
+        const pathParts = urlObj.pathname.split('/').filter(p => p);
+        // 检查最后一个路径段是否是32位十六进制字符串（文件ID格式）
+        const lastPart = pathParts[pathParts.length - 1];
+        if (lastPart && /^[a-f0-9]{32}$/i.test(lastPart)) {
+          id = lastPart;
+        } else if (lastPart) {
+          id = lastPart;
+        }
+      }
+      
       if (id) {
         ids.push(id);
       } else {
-        const pathParts = urlObj.pathname.split('/');
+        // 如果URL解析失败，检查原始字符串是否是ID格式
-        const lastPart = pathParts[pathParts.length - 1];
+        if (/^[a-f0-9]{32}$/i.test(url.trim())) {
-        if (lastPart) {
+          ids.push(url.trim());
-          ids.push(lastPart);
+        } else {
+          ids.push(url);
         }
       }
     } catch {
+      // URL解析失败，检查是否是直接的ID格式（32位十六进制）
+      if (/^[a-f0-9]{32}$/i.test(url.trim())) {
+        ids.push(url.trim());
+      } else {
+        // 否则直接使用原始字符串
         ids.push(url);
       }
+    }
   });
   
   return ids;
@@ -1411,7 +1511,8 @@ const handleSubmit = async () => {
       'serviceInviteSelect', 'servicePublicSelectAuto', 'purchaseRequirement',
       'meetingMinutes', 'feasibilityReport', 'meetingMinutesUrgent',
       'meetingMinutesSingle', 'meetingMinutesImport', 'singleSourceProof', 'importApplication',
-      'governmentPurchaseIntent', 'servicePublicSelectSchool', 'otherMaterials'
+      'governmentPurchaseIntent', 'servicePublicSelectSchool', 'serviceInviteSelectSchool',
+      'servicePublicSelectSchoolAuto', 'otherMaterials'
     ];
     
     fileFields.forEach(field => {
@@ -1460,7 +1561,8 @@ const handleTempStore = async () => {
       'serviceInviteSelect', 'servicePublicSelectAuto', 'purchaseRequirement',
       'meetingMinutes', 'feasibilityReport', 'meetingMinutesUrgent',
       'meetingMinutesSingle', 'meetingMinutesImport', 'singleSourceProof', 'importApplication',
-      'governmentPurchaseIntent', 'servicePublicSelectSchool', 'otherMaterials'
+      'governmentPurchaseIntent', 'servicePublicSelectSchool', 'serviceInviteSelectSchool',
+      'servicePublicSelectSchoolAuto', 'otherMaterials'
     ];
     
     fileFields.forEach(field => {