-
{{ o.order_no }}
-
¥{{ o.amount }}
+
+
+ {{ o.order_no }}
+ ¥{{ o.amount }}
+
+
+ {{ formatPoCategory(o.order_type) }} · {{ formatPayOrderSource(o) }}
+
@@ -3980,10 +3995,14 @@ const detailLinkedPayOrders = computed(() => {
return Array.isArray(arr) ? arr : []
})
-/** 需代收:业务订单总金额 − 关联已付总额 */
+/** 需代收:优先用关联时记录的固定快照值;历史单(无快照)回退实时计算 总金额 − 关联已付总额 */
const detailAgencyToCollect = computed(() => {
const d = detailData.value
if (!d) return 0
+ const snap = d.agency_collect_amount
+ if (snap !== null && snap !== undefined && snap !== '') {
+ return Number(snap) || 0
+ }
const total = Number(d.amount) || 0
const paid = Number(d.linked_pay_paid_total) || 0
return Math.round((total - paid) * 100) / 100
@@ -4692,7 +4711,7 @@ const editDiagnosisCreatorDeptBreadcrumbs = computed(() => {
.filter((segs) => segs.length > 0)
})
-const editPaidOrders = ref
>([])
+const editPaidOrders = ref>([])
const editPaidOrdersLoading = ref(false)
const editDepositMin = ref(0)
@@ -4708,6 +4727,24 @@ function formatPoCategory(t: unknown) {
return m[Number(t)] || '未知'
}
+function formatPayOrderSource(row: { payment_method?: unknown; create_type?: unknown }) {
+ const createType = String(row?.create_type || '')
+ if (createType === 'wechat_work') return '企业微信对外收款'
+ if (createType === 'fubei') return '付呗'
+ const paymentMethod = String(row?.payment_method || '')
+ const methodMap: Record = {
+ alipay: '支付宝',
+ wechat: '微信',
+ wechat_work: '企业微信',
+ fubei: '付呗',
+ manual: '手动确认到账'
+ }
+ if (paymentMethod && methodMap[paymentMethod]) {
+ return methodMap[paymentMethod]
+ }
+ return '普通订单'
+}
+
const editLinkedPaidTotal = computed(() => {
const ids = new Set(editForm.pay_order_ids.map((x) => Number(x)))
let s = 0
@@ -5701,7 +5738,7 @@ const addPayOrderAlertTitle = computed(() => {
if (addPayOrderForm.add_mode === 'completion_only') {
return '不创建或关联支付单,仅提交完单申请,由审核人员在支付审核时处理。'
}
- return '可以手动创建新支付单,或关联已存在但未绑定的支付单。'
+ return '可以通过付呗创建新支付单,或关联已存在但未绑定的支付单。'
})
const addPayOrderForm = reactive({
diff --git a/admin/src/views/consumer/prescription/order_list_h5.vue b/admin/src/views/consumer/prescription/order_list_h5.vue
index 0b00dcaa..d68f0a5c 100644
--- a/admin/src/views/consumer/prescription/order_list_h5.vue
+++ b/admin/src/views/consumer/prescription/order_list_h5.vue
@@ -962,6 +962,11 @@
豁免
+
+
+ {{ formatPayOrderSource(row) }}
+
+
@@ -1020,6 +1025,11 @@
豁免
+
+
+ {{ formatPayOrderSource(row) }}
+
+
@@ -1555,7 +1565,7 @@
@@ -1565,7 +1575,7 @@
¥{{ o.amount }}