缴费模式
@@ -660,7 +654,9 @@
转账记录
- ({{ (sch.transfers || []).length }} 笔)
@@ -790,12 +786,7 @@
align="center"
show-overflow-tooltip
/>
-
+
每期间隔(月)
-
{{
- dash(payment?.installmentIntervalMonths)
- }}
+
{{ dash(payment?.installmentIntervalMonths) }}
分期开始时间
@@ -1135,17 +1124,32 @@
align="center"
header-align="center"
/>
-
+
{{ statusChangeTypeLabel(String(row.changeType || '')) }}
-
+
{{ dash(row.changeTime) }}
-
+
{{ statusChangeFlow(row) }}
{{ statusChangeDesc(row) }}
-
+
{{ dash(row.operatorUserName) }}
@@ -1228,6 +1237,7 @@
} 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,
@@ -1432,13 +1442,14 @@
*/
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
@@ -1456,9 +1467,7 @@
: 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
}
@@ -1575,9 +1584,7 @@
}
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/research-donation/list/DonationViewDialog.vue b/web-admin/src/views/research-donation/list/DonationViewDialog.vue
index 86b800cd..4425fb61 100644
--- a/web-admin/src/views/research-donation/list/DonationViewDialog.vue
+++ b/web-admin/src/views/research-donation/list/DonationViewDialog.vue
@@ -152,9 +152,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 ? '(共用)' : ''
}}
-
+
{{ statusChangeTypeLabel(String(row.changeType || '')) }}
-
+
{{ dash(row.changeTime) }}
-
+
{{ statusChangeFlow(row) }}
{{ statusChangeDesc(row) }}
-
+
{{ dash(row.operatorUserName) }}
@@ -512,6 +537,7 @@
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'