Merge branch 'long-0509'

This commit is contained in:
2026-05-09 17:14:13 +08:00
3 changed files with 173 additions and 7 deletions
@@ -740,7 +740,7 @@
改患者信息
</el-button>
<el-button
v-if="detailData.prescription_id && showPrescriptionAuditFilter"
v-if="detailData.prescription_id && canViewPrescriptionDetail"
type="primary"
size="small"
link
@@ -749,7 +749,7 @@
详细
</el-button>
<el-button
v-if="detailData.id && showPrescriptionAuditFilter"
v-if="detailData.id && canViewPrescriptionDetail"
type="warning"
size="small"
link
@@ -802,7 +802,7 @@
<el-descriptions-item label="临床诊断" :span="2" >
{{ detailPrescription.clinical_diagnosis || '—' }}
</el-descriptions-item>
<el-descriptions-item label="剂数 / 用法" :span="2" v-if="showPrescriptionAuditFilter">
<el-descriptions-item label="剂数 / 用法" :span="2" v-if="canViewPrescriptionDetail">
{{ detailData.dose_count ?? detailPrescription.dose_count ?? '—' }} {{ detailData.dose_unit || '剂' }} ·
{{ detailPrescription.usage_instruction || detailPrescription.usage_method || '—' }}
</el-descriptions-item>
@@ -858,7 +858,7 @@
</el-descriptions-item>
</el-descriptions>
<div v-if="detailHerbsVisible" class="mt-4">
<div v-if="canViewPrescriptionDetail && detailHerbsVisible" class="mt-4">
<div class="text-xs font-medium text-gray-500 mb-2 px-1">药材明细</div>
<el-table v-if="detailRxHerbs.length" :data="detailRxHerbs" size="small" border stripe max-height="260">
<el-table-column type="index" label="#" width="48" align="center" />
@@ -1364,7 +1364,7 @@
</div>
<div v-show="editOrderStep === 1" class="create-order-step-panel">
<el-row v-if="showPrescriptionAuditFilter" :gutter="20" class="mb-1">
<el-row v-if="canViewPrescriptionDetail" :gutter="20" class="mb-1">
<el-col :span="24">
<div class="flex flex-wrap items-center gap-2 pb-2 border-b border-gray-100">
<span class="text-sm font-medium text-gray-700 mr-1">处方</span>
@@ -2408,10 +2408,12 @@ import feedback from '@/utils/feedback'
import { ElMessageBox } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import useUserStore from '@/stores/modules/user'
import { hasPermission } from '@/utils/perm'
const TcmDiagnosisEditView = defineAsyncComponent(() => import('@/views/tcm/diagnosis/edit.vue'))
const userStore = useUserStore()
const canViewPrescriptionDetail = computed(() => hasPermission(['tcm.prescriptionOrder/detail']))
const route = useRoute()
const diagnosisViewRef = ref<{