提交

web-admin/src/views/cell-storage/protocol/ProtocolFormDialog.vue

@@ -738,7 +738,7 @@
 
             <!-- Tab 5: 缴费信息 -->
             <div id="form-section-payment" class="form-tab-pane">
-              <div class="section-card section-card--gray">
+              <div class="section-card">
                 <div class="section-title">
                   <div class="section-title-left"><h3>缴费信息</h3></div>
                 </div>
@@ -1194,6 +1194,7 @@
     type CollectionProtocolRow
   } from '@/api/collection-protocol'
   import { fetchUploadAttachment } from '@/api/business'
+  import { downloadAttachmentFile } from '@/utils/download-attachment'
   import {
     fetchCustomerList,
     fetchUserList,
@@ -2056,7 +2057,7 @@
     if (!isEdit.value && formData.protocolNoId) {
       const picked = protocolNoOptions.value.find((x) => x.id === formData.protocolNoId)
       if (picked?.usedInProtocol) {
-        ElMessage.warning(`协议号「${formData.protocolNo}」已存在协议单，请更换其他协议号`)
+        ElMessage.warning(`协议号「${formData.protocolNo}」已被占用，请更换其他协议号`)
         return
       }
     }
@@ -2066,7 +2067,7 @@
         const sc = sampleCodeOptions.value.find((x) => x.id === sampleRow.sampleCodeId)
         if (sc?.usedInProtocol) {
           ElMessage.warning(
-            `样本编码「${sampleRow.sampleCode || sc.sampleCode}」已被其他协议单使用，请更换`
+            `样本编码「${sampleRow.sampleCode || sc.sampleCode}」已被占用，请更换`
           )
           return
         }
@@ -2660,7 +2661,7 @@
 
   /* ====== 协议号下拉检索 ====== */
   function protocolNoOptionLabel(p: Api.BizCollectionProtocolNo.ProtocolNoItem) {
-    if (p.usedInProtocol) return `${p.protocolNo}（已建单）`
+    if (p.usedInProtocol) return `${p.protocolNo}（已占用）`
     if (p.issued) return `${p.protocolNo}（已下发）`
     return p.protocolNo
   }
@@ -2706,7 +2707,7 @@
 
   /* ====== 样本编码选择 ====== */
   function sampleCodeOptionLabel(sc: Api.BizSampleCode.SampleCodeItem) {
-    if (sc.usedInProtocol) return `${sc.sampleCode}（已建单）`
+    if (sc.usedInProtocol) return `${sc.sampleCode}（已占用）`
     if (sc.issued) return `${sc.sampleCode}（已下发）`
     return sc.sampleCode
   }
@@ -2894,15 +2895,7 @@
   }
 
   function handleDownloadAttachment(file: any) {
-    const url = fullFileUrl(file.fileUrl)
-    if (!url) return
-    const a = document.createElement('a')
-    a.href = url
-    a.download = file.fileName || ''
-    a.target = '_blank'
-    document.body.appendChild(a)
-    a.click()
-    document.body.removeChild(a)
+    downloadAttachmentFile(file, { fullFileUrl })
   }
 
   /* ====== 弹窗打开时自动初始化 ====== */
@@ -2998,10 +2991,6 @@
     &--green {
       background: #f0fdf4;
     }
-
-    &--gray {
-      background: #f8fafc;
-    }
   }
 
   .section-title {