主方服法:{{ rxUsageText }}
辅方服法:{{ rxAuxUsageText }}
医嘱:{{ rxAdviceText }}
+忌口:{{ slipDietaryText }}
备注:{{ rxRemarkText }}
药房备注:{{ rxPharmacyRemarkText }} diff --git a/admin/src/views/consumer/prescription/order_list.vue b/admin/src/views/consumer/prescription/order_list.vue index c04089c0..9e743a70 100644 --- a/admin/src/views/consumer/prescription/order_list.vue +++ b/admin/src/views/consumer/prescription/order_list.vue @@ -1898,6 +1898,7 @@
辅服法:{{ rxAuxUsageText }}
医嘱:{{ rxAdviceText }}
+忌口:{{ slipDietaryText }}
备注:{{ rxRemarkText }}
药房备注:{{ rxPharmacyRemarkText }} @@ -2144,6 +2145,7 @@ import { analyzeLogisticsPayloadUrgent, parseLogisticsTracePayload, canUpdateAmount, + formatDietaryTaboo, type SlipFormulaType, type SlipAuxUsageForm } from './components/prescription-order-utils' @@ -4544,12 +4546,7 @@ const slipAuxHerbs = computed(() => slipHerbsList.value.filter((h: any) => normalizeSlipFormulaType(h?.formula_type) === '辅方') ) -const slipDietaryText = computed(() => { - const d = prescriptionViewData.value?.dietary_taboo - if (Array.isArray(d)) return d.filter(Boolean).join('、') - if (typeof d === 'string' && d.trim()) return d.trim() - return '' -}) +const slipDietaryText = computed(() => formatDietaryTaboo(prescriptionViewData.value?.dietary_taboo)) const slipChuwanVisible = computed(() => { const d = prescriptionViewData.value diff --git a/admin/src/views/consumer/prescription/order_list_h5.vue b/admin/src/views/consumer/prescription/order_list_h5.vue index 414e30df..b2021e4b 100644 --- a/admin/src/views/consumer/prescription/order_list_h5.vue +++ b/admin/src/views/consumer/prescription/order_list_h5.vue @@ -894,6 +894,9 @@
服法:{{ rxUsageText }}
医嘱:{{ rxAdviceText }}
+忌口:{{ slipDietaryText }}
备注:{{ rxRemarkText }}
药房备注:{{ rxPharmacyRemarkText }} @@ -2569,6 +2573,7 @@ import { getDoctors, getAssistants } from '@/api/tcm' +import { formatDietaryTaboo } from './components/prescription-order-utils' import html2canvas from 'html2canvas' import { jsPDF } from 'jspdf' import { getDictData } from '@/api/app' @@ -3579,6 +3584,8 @@ const detailPrescription = computed(() => { return p && typeof p === 'object' ? p : null }) +const detailDietaryText = computed(() => formatDietaryTaboo(detailPrescription.value?.dietary_taboo)) + function normalizeBizPhone(v: unknown): string { if (v === null || v === undefined) return '' return String(v).replace(/\s/g, '').trim() @@ -5185,12 +5192,7 @@ const slipHerbsList = computed(() => { return Array.isArray(h) ? h : [] }) -const slipDietaryText = computed(() => { - const d = prescriptionViewData.value?.dietary_taboo - if (Array.isArray(d)) return d.filter(Boolean).join('、') - if (typeof d === 'string' && d.trim()) return d.trim() - return '' -}) +const slipDietaryText = computed(() => formatDietaryTaboo(prescriptionViewData.value?.dietary_taboo)) const slipChuwanVisible = computed(() => { const d = prescriptionViewData.value