每期间隔(月)
-
{{ dash(payment?.installmentIntervalMonths) }}
+
{{
+ dash(payment?.installmentIntervalMonths)
+ }}
分期开始时间
@@ -1124,32 +1138,17 @@
align="center"
header-align="center"
/>
-
+
{{ statusChangeTypeLabel(String(row.changeType || '')) }}
-
+
{{ dash(row.changeTime) }}
-
+
{{ statusChangeFlow(row) }}
{{ statusChangeDesc(row) }}
-
+
{{ dash(row.operatorUserName) }}
@@ -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>
- }>
+ if (!details.length) return [] as Array<{
+ scheduleNo: number
+ dueAmount: number | null
+ dueDate: string
+ paidAmount: number
+ transfers: Array>
+ }>
const paidOf = (rows: Array>) =>
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"
>
{{
- 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)
+ : '—'
}}
运费(元)
{{
- 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"
/>
-
+
{{ statusChangeTypeLabel(String(row.changeType || '')) }}
-
+
{{ dash(row.changeTime) }}
-
+
{{ statusChangeFlow(row) }}
{{ statusChangeDesc(row) }}
-
+
{{ dash(row.operatorUserName) }}
@@ -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'