提交

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

@@ -11,7 +11,12 @@
     @update:model-value="emit('update:modelValue', $event)"
     @closed="handleClosed"
   >
-    <div class="protocol-view-body" :class="{ 'is-detail-loading': detailLoading && !bundle }">
+    <div
+      class="protocol-view-body"
+      :class="{ 'is-detail-loading': detailLoading && !bundle }"
+      v-loading="detailLoading && !bundle"
+      element-loading-text="加载中…"
+    >
       <div class="detail-tabs">
         <div
           v-for="tab in formTabs"
@@ -25,7 +30,7 @@
       </div>
 
       <template v-if="bundle">
-        <div v-loading="detailLoading && !bundle">
+        <div>
           <!-- KPI 摘要条 -->
           <div class="kpi-strip">
             <div class="kpi-card">
@@ -891,19 +896,32 @@
                               </div>
                             </template>
                             <template v-else-if="step.key === 'receipt-finance'">
-                              <!-- 财务确认 -->
+                              <!-- 财务确认：jfqrz 为待财务确认，updateTime 为提交财务时间非确认时间 -->
                               <div class="flow-detail-card__kv">
                                 <span class="flow-detail-card__label">确认状态</span>
-                                <span class="flow-detail-card__value"
-                                  ><el-tag type="success" size="small">已确认</el-tag></span
-                                >
+                                <span class="flow-detail-card__value">
+                                  <el-tag
+                                    v-if="isReceiptFinanceConfirmed(detail)"
+                                    type="success"
+                                    size="small"
+                                    >已确认</el-tag
+                                  >
+                                  <el-tag v-else type="warning" size="small">待确认</el-tag>
+                                </span>
                               </div>
-                              <div v-if="detail.updateTime" class="flow-detail-card__kv">
+                              <div
+                                v-if="isReceiptFinanceConfirmed(detail) && detail.updateTime"
+                                class="flow-detail-card__kv"
+                              >
                                 <span class="flow-detail-card__label">确认时间</span>
                                 <span class="flow-detail-card__value">{{ detail.updateTime }}</span>
                               </div>
                               <div
-                                v-if="detail.financeRemark && String(detail.financeRemark).trim()"
+                                v-if="
+                                  isReceiptFinanceConfirmed(detail) &&
+                                  detail.financeRemark &&
+                                  String(detail.financeRemark).trim()
+                                "
                                 class="flow-detail-card__kv"
                               >
                                 <span class="flow-detail-card__label">财务备注</span>
@@ -912,7 +930,10 @@
                                 }}</span>
                               </div>
                               <div
-                                v-if="financeConfirmAttachmentFiles(detail).length"
+                                v-if="
+                                  isReceiptFinanceConfirmed(detail) &&
+                                  financeConfirmAttachmentFiles(detail).length
+                                "
                                 class="flow-detail-card__kv"
                               >
                                 <span class="flow-detail-card__label">财务附件</span>
@@ -1437,6 +1458,12 @@
     return 'green'
   }
 
+  /** 缴费明细是否已完成财务收款确认（jfqrz 仅已提交待财务处理） */
+  function isReceiptFinanceConfirmed(detail: Record<string, any>) {
+    const s = String(detail.payStatus || '')
+    return s !== 'jfqrz' && s !== 'dfj'
+  }
+
   interface MiniFlowStep {
     key: string
     label: string