diff --git a/web-admin/src/components/business/sample-freight-pick-table/index.vue b/web-admin/src/components/business/sample-freight-pick-table/index.vue index d5af7ca8..9fd553d1 100644 --- a/web-admin/src/components/business/sample-freight-pick-table/index.vue +++ b/web-admin/src/components/business/sample-freight-pick-table/index.vue @@ -51,7 +51,9 @@ align="right" header-align="center" > - + import type { SampleFreight } from '@/api/sample-freight' - import { formatMoneyDisplay } from '@/utils/money-format' + import { freightAmountText } from '@/utils/sf-express-freight' import { flattenSampleFreights, sampleFreightSpanMethod, diff --git a/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue b/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue index 8186765d..fb229fbf 100644 --- a/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue +++ b/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue @@ -175,11 +175,7 @@
@@ -194,9 +190,14 @@
运费(元)
{{ - row.freight?.freightAmount != null - ? '¥' + formatMoneyDisplay(row.freight.freightAmount) - : '—' + freightAmountText( + row.freight?.transportMode, + row.freight?.freightAmount + ) === '月结' + ? '月结' + : row.freight?.freightAmount != null + ? '¥' + formatMoneyDisplay(row.freight.freightAmount) + : '—' }}{{ Number(row.freight?.linkedSampleCount || 0) > 1 ? '(共用)' : '' }}
— - +
缴费模式
@@ -660,7 +654,9 @@
转账记录 - ({{ (sch.transfers || []).length }} 笔)
@@ -790,12 +786,7 @@ align="center" show-overflow-tooltip /> - +