提交

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

@@ -43,7 +43,7 @@
                   ><el-tag
                     :type="protocolStatusTagType(String(protocol?.protocolStatus || ''))"
                     size="small"
-                    >{{ protocolStatusLabel(String(protocol?.protocolStatus || '')) }}</el-tag
+                    >{{ protocolStatusDisplayLabel(String(protocol?.protocolStatus || ''), String(protocol?.voidType || '')) }}</el-tag
                   ></div
                 ></div
               >
@@ -89,6 +89,10 @@
                   >
                 </template>
                 <template v-if="protocol?.voidTime">
+                  <div class="data-item"
+                    ><div class="data-label">作废类型</div
+                    ><div class="data-value">{{ voidTypeLabel(String(protocol?.voidType || '')) || '—' }}</div></div
+                  >
                   <div class="data-item"
                     ><div class="data-label">协议作废时间</div
                     ><div class="data-value">{{ dash(protocol.voidTime) }}</div></div
@@ -200,6 +204,10 @@
                 >
               </template>
               <template v-if="protocol?.voidTime">
+                <div class="data-item"
+                  ><div class="data-label">作废类型</div
+                  ><div class="data-value">{{ voidTypeLabel(String(protocol?.voidType || '')) || '—' }}</div></div
+                >
                 <div class="data-item"
                   ><div class="data-label">协议作废时间</div
                   ><div class="data-value">{{ dash(protocol.voidTime) }}</div></div
@@ -283,7 +291,14 @@
                     <div class="data-grid data-grid--4">
                       <div class="data-item">
                         <div class="data-label">样本编码</div>
-                        <div class="data-value data-value--code">{{ dash(row.sampleCode) }}</div>
+                        <div class="data-value data-value--code">
+                          <SampleCodeWithSpecialDisplay
+                            :sample-code="row.sampleCode"
+                            :is-special="!!row.isSpecial"
+                            :special-remark="row.specialRemark"
+                            monospace
+                          />
+                        </div>
                       </div>
                       <div class="data-item">
                         <div class="data-label">原价格(元)</div>
@@ -1059,6 +1074,7 @@
   import ProtocolAttachmentReadonly from './ProtocolAttachmentReadonly.vue'
   import SampleQcInfoGroupedPanel from '@/components/business/sample-qc-info-grouped-panel/index.vue'
   import SampleReceptionDualReadonlyPanel from '@/components/business/sample-reception-dual-readonly-panel/index.vue'
+  import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
   import SampleProductionInfoCards from '@/components/business/sample-production-info-cards/index.vue'
   import SampleStorageReleaseInfo from '@/components/business/sample-storage-release-info/index.vue'
   import {
@@ -1078,7 +1094,7 @@
   import { downloadAttachmentFile } from '@/utils/download-attachment'
   import { formatMoneyDisplay } from '@/utils/money-format'
   import {
-    protocolStatusLabel,
+    protocolStatusDisplayLabel,
     protocolStatusTagType,
     auditStatusLabel,
     payModeLabel,
@@ -1093,6 +1109,7 @@
     acceptConclusionTagType
   } from '@/utils/status-tag-registry'
   import { loadTransferTypeDict, transferTypeLabel } from '@/utils/protocol-payment-labels'
+  import { loadVoidTypeDict, voidTypeLabel } from '@/utils/void-type-dict'
   import { formatProtocolDocSubject } from '@/utils/protocol-doc-label'
 
   const props = withDefaults(
@@ -1827,7 +1844,10 @@
   watch(
     () => [props.modelValue, props.protocolId] as const,
     ([visible, id]) => {
-      if (visible) void loadTransferTypeDict()
+      if (visible) {
+        void loadTransferTypeDict()
+        void loadVoidTypeDict()
+      }
       if (visible && id) loadDetail()
     }
   )
@@ -3005,10 +3025,6 @@
       grid-template-columns: 1fr;
     }
 
-    .data-grid--4 {
-      grid-template-columns: repeat(2, minmax(0, 1fr));
-    }
-
     .storage-cert-info-row.data-grid--3 {
       grid-template-columns: repeat(2, minmax(0, 1fr));