From 0fb3ee50e3e58bd3ca8090a42166d56b807ef1d6 Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Wed, 21 Oct 2026 19:31:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E8=B4=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E9=87=91=E9=A2=9D=E6=A0=BC=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E7=A9=BA=E9=A1=BA=E4=B8=B0=E8=BF=90=E8=B4=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9C=88=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../protocol/ProtocolViewDialog.vue           | 90 +++++++++----------
 .../cell-storage/sample-freight/index.vue     | 15 ++--
 .../list/DonationViewDialog.vue               | 35 ++------
 3 files changed, 59 insertions(+), 81 deletions(-)

diff --git a/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue b/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue
index fb229fbf..cf1ab753 100644
--- a/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue
+++ b/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue
@@ -175,7 +175,11 @@
                     </div>
                   </div>
                   <div
-                    v-if="row.freight?.id || row.freight?.transportMode || row.transport?.etaTime"
+                    v-if="
+                      row.freight?.id ||
+                      row.freight?.transportMode ||
+                      row.transport?.etaTime
+                    "
                     class="sample-card__section sample-card__section--transport"
                   >
                     <div class="sample-card__section-label">运输与运费</div>
@@ -190,10 +194,8 @@
                         <div class="data-label">运费(元)</div>
                         <div class="data-value"
                           >{{
-                            freightAmountText(
-                              row.freight?.transportMode,
-                              row.freight?.freightAmount
-                            ) === '月结'
+                            String(row.freight?.transportMode || '').trim() === 'sfkd' &&
+                            (row.freight?.freightAmount == null || row.freight?.freightAmount === '')
                               ? '月结'
                               : row.freight?.freightAmount != null
                                 ? '¥' + formatMoneyDisplay(row.freight.freightAmount)
@@ -524,7 +526,12 @@
                     <span v-else class="muted-dash">—</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" min-width="140" align="center" show-overflow-tooltip>
+                <el-table-column
+                  label="备注"
+                  min-width="140"
+                  align="center"
+                  show-overflow-tooltip
+                >
                   <template #default="{ row }">{{ row.remark || '—' }}</template>
                 </el-table-column>
                 <el-table-column
@@ -583,7 +590,9 @@
 
                   <div
                     class="data-grid"
-                    :class="String(sp.payMode) === 'fq' ? 'data-grid--6' : 'data-grid--3'"
+                    :class="
+                      String(sp.payMode) === 'fq' ? 'data-grid--6' : 'data-grid--3'
+                    "
                   >
                     <div class="data-item">
                       <div class="data-label">缴费模式</div>
@@ -654,9 +663,7 @@
 
                     <div class="sample-pay-readonly__tr-title">
                       转账记录
-                      <span
-                        v-if="(sch.transfers || []).length"
-                        class="sample-pay-readonly__tr-count"
+                      <span v-if="(sch.transfers || []).length" class="sample-pay-readonly__tr-count"
                         >（{{ (sch.transfers || []).length }} 笔）</span
                       >
                     </div>
@@ -786,7 +793,12 @@
                   align="center"
                   show-overflow-tooltip
                 />
-                <el-table-column label="附件" min-width="280" align="left" header-align="center">
+                <el-table-column
+                  label="附件"
+                  min-width="280"
+                  align="left"
+                  header-align="center"
+                >
                   <template #default="{ row }">
                     <ProtocolAttachmentReadonly
                       v-if="refundRecordAttachments(row).length"
@@ -870,7 +882,9 @@
                       </div>
                       <div class="data-item">
                         <div class="data-label">每期间隔(月)</div>
-                        <div class="data-value">{{ dash(payment?.installmentIntervalMonths) }}</div>
+                        <div class="data-value">{{
+                          dash(payment?.installmentIntervalMonths)
+                        }}</div>
                       </div>
                       <div class="data-item">
                         <div class="data-label">分期开始时间</div>
@@ -1124,32 +1138,17 @@
                   align="center"
                   header-align="center"
                 />
-                <el-table-column
-                  label="变更类型"
-                  min-width="110"
-                  align="center"
-                  header-align="center"
-                >
+                <el-table-column label="变更类型" min-width="110" align="center" header-align="center">
                   <template #default="{ row }">
                     <el-tag :type="statusChangeTagType(String(row.changeType || ''))" size="small">
                       {{ statusChangeTypeLabel(String(row.changeType || '')) }}
                     </el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="变更时间"
-                  min-width="170"
-                  align="center"
-                  header-align="center"
-                >
+                <el-table-column label="变更时间" min-width="170" align="center" header-align="center">
                   <template #default="{ row }">{{ dash(row.changeTime) }}</template>
                 </el-table-column>
-                <el-table-column
-                  label="状态流转"
-                  min-width="160"
-                  align="center"
-                  header-align="center"
-                >
+                <el-table-column label="状态流转" min-width="160" align="center" header-align="center">
                   <template #default="{ row }">{{ statusChangeFlow(row) }}</template>
                 </el-table-column>
                 <el-table-column
@@ -1161,12 +1160,7 @@
                 >
                   <template #default="{ row }">{{ statusChangeDesc(row) }}</template>
                 </el-table-column>
-                <el-table-column
-                  label="操作人"
-                  min-width="120"
-                  align="center"
-                  header-align="center"
-                >
+                <el-table-column label="操作人" min-width="120" align="center" header-align="center">
                   <template #default="{ row }">{{ dash(row.operatorUserName) }}</template>
                 </el-table-column>
               </el-table>
@@ -1237,7 +1231,6 @@
   } from '@/api/admin'
   import { downloadAttachmentFile } from '@/utils/download-attachment'
   import { formatMoneyDisplay } from '@/utils/money-format'
-  import { freightAmountText } from '@/utils/sf-express-freight'
   import {
     protocolStatusDisplayLabel,
     protocolStatusTagType,
@@ -1442,14 +1435,13 @@
    */
   const v1PayPeriods = computed(() => {
     const details = paymentDetails.value
-    if (!details.length)
-      return [] as Array<{
-        scheduleNo: number
-        dueAmount: number | null
-        dueDate: string
-        paidAmount: number
-        transfers: Array<Record<string, any>>
-      }>
+    if (!details.length) return [] as Array<{
+      scheduleNo: number
+      dueAmount: number | null
+      dueDate: string
+      paidAmount: number
+      transfers: Array<Record<string, any>>
+    }>
 
     const paidOf = (rows: Array<Record<string, any>>) =>
       rows
@@ -1467,7 +1459,9 @@
               : payment.value?.contractAmount != null
                 ? Number(payment.value.contractAmount)
                 : null,
-          dueDate: String(payment.value?.lumpSumDeadline || details[0]?.installmentDueDate || ''),
+          dueDate: String(
+            payment.value?.lumpSumDeadline || details[0]?.installmentDueDate || ''
+          ),
           paidAmount: paidOf(details),
           transfers: details
         }
@@ -1584,7 +1578,9 @@
   }
 
   const basicMotherNameDisplay = computed(() =>
-    dash(partyCustomer.value?.motherName || props.listRow?.motherName || protocol.value?.motherName)
+    dash(
+      partyCustomer.value?.motherName || props.listRow?.motherName || protocol.value?.motherName
+    )
   )
 
   const dialogTitle = computed(() => {
diff --git a/web-admin/src/views/cell-storage/sample-freight/index.vue b/web-admin/src/views/cell-storage/sample-freight/index.vue
index 70baaa52..fe2ee75d 100644
--- a/web-admin/src/views/cell-storage/sample-freight/index.vue
+++ b/web-admin/src/views/cell-storage/sample-freight/index.vue
@@ -145,10 +145,14 @@
             header-align="center"
           >
             <template #default="{ row }">{{
-              freightAmountText(
-                row.transportMode,
-                row.freightAmount ?? row.freightDraft?.freightAmount
-              )
+              isSfExpress(row.transportMode) &&
+              (row.freightAmount == null || row.freightAmount === '')
+                ? '月结'
+                : row.freightAmount != null &&
+                    row.freightAmount !== '' &&
+                    Number.isFinite(Number(row.freightAmount))
+                  ? '¥' + formatMoneyDisplay(row.freightAmount)
+                  : '—'
             }}</template>
           </el-table-column>
           <el-table-column
@@ -303,7 +307,8 @@
     type FreightUnlinkRow
   } from '@/components/business/freight-unlink-dialog/index.vue'
   import { formatDisplayOrDash } from '@/utils/datetime-display'
-  import { freightAmountText } from '@/utils/sf-express-freight'
+  import { formatMoneyDisplay } from '@/utils/money-format'
+  import { isSfExpress } from '@/utils/sf-express-freight'
   import {
     receptionSourceLabel,
     receptionSourceTagType,
diff --git a/web-admin/src/views/research-donation/list/DonationViewDialog.vue b/web-admin/src/views/research-donation/list/DonationViewDialog.vue
index 4425fb61..34363a5d 100644
--- a/web-admin/src/views/research-donation/list/DonationViewDialog.vue
+++ b/web-admin/src/views/research-donation/list/DonationViewDialog.vue
@@ -152,10 +152,8 @@
                         <div class="data-label">运费(元)</div>
                         <div class="data-value"
                           >{{
-                            freightAmountText(
-                              row.freight?.transportMode,
-                              row.freight?.freightAmount
-                            ) === '月结'
+                            String(row.freight?.transportMode || '').trim() === 'sfkd' &&
+                            (row.freight?.freightAmount == null || row.freight?.freightAmount === '')
                               ? '月结'
                               : row.freight?.freightAmount != null
                                 ? '¥' + formatMoneyDisplay(row.freight.freightAmount)
@@ -448,32 +446,17 @@
                   align="center"
                   header-align="center"
                 />
-                <el-table-column
-                  label="变更类型"
-                  min-width="110"
-                  align="center"
-                  header-align="center"
-                >
+                <el-table-column label="变更类型" min-width="110" align="center" header-align="center">
                   <template #default="{ row }">
                     <el-tag :type="statusChangeTagType(String(row.changeType || ''))" size="small">
                       {{ statusChangeTypeLabel(String(row.changeType || '')) }}
                     </el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="变更时间"
-                  min-width="170"
-                  align="center"
-                  header-align="center"
-                >
+                <el-table-column label="变更时间" min-width="170" align="center" header-align="center">
                   <template #default="{ row }">{{ dash(row.changeTime) }}</template>
                 </el-table-column>
-                <el-table-column
-                  label="状态流转"
-                  min-width="160"
-                  align="center"
-                  header-align="center"
-                >
+                <el-table-column label="状态流转" min-width="160" align="center" header-align="center">
                   <template #default="{ row }">{{ statusChangeFlow(row) }}</template>
                 </el-table-column>
                 <el-table-column
@@ -485,12 +468,7 @@
                 >
                   <template #default="{ row }">{{ statusChangeDesc(row) }}</template>
                 </el-table-column>
-                <el-table-column
-                  label="操作人"
-                  min-width="120"
-                  align="center"
-                  header-align="center"
-                >
+                <el-table-column label="操作人" min-width="120" align="center" header-align="center">
                   <template #default="{ row }">{{ dash(row.operatorUserName) }}</template>
                 </el-table-column>
               </el-table>
@@ -537,7 +515,6 @@
   import { formatDisplayOrDash } from '@/utils/datetime-display'
   import { computed, nextTick, ref, watch } from 'vue'
   import { formatMoneyDisplay } from '@/utils/money-format'
-  import { freightAmountText } from '@/utils/sf-express-freight'
   import { Close } from '@element-plus/icons-vue'
   import ProtocolAttachmentReadonly from '@/views/cell-storage/protocol/ProtocolAttachmentReadonly.vue'
   import SampleQcInfoGroupedPanel from '@/components/business/sample-qc-info-grouped-panel/index.vue'