From 1b939ba5b7960125488e337b2f6a64aed382b0c4 Mon Sep 17 00:00:00 2001
From: wzk <2438381872@qq.com>
Date: Fri, 28 Nov 2025 16:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/prescription/prescriptionlist.vue  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 12cfb93e..c9034b14 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -13,20 +13,19 @@
       <div v-for="(prescription, pIndex) in westernPrescriptions" :key="prescription.id" style="margin-bottom: 20px; border: 1px solid #e4e7ed; border-radius: 8px; padding: 10px; min-width: fit-content;">
       <!-- 西药方标题栏 -->
       <div class="prescription-header" style="margin-bottom: 10px; display: flex; align-items: center; justify-content: space-between; background: #f5f7fa; padding: 10px 12px; border-radius: 4px; min-height: 40px; width: 100%; box-sizing: border-box; position: relative;">
-        <span style="font-weight: 600; font-size: 14px; color: #409eff; flex-shrink: 0;">{{ prescription.name }}</span>
+        <span style="font-weight: 600; font-size: 14px; color: #409eff; flex: 0 0 auto;">{{ prescription.name }}</span>
         <el-button 
           type="danger" 
           size="small" 
           @click="handleClosePrescription(prescription.id)"
-          style="flex-shrink: 0; min-width: 90px; z-index: 10; position: relative;"
-          title="删除整个西药方"
+          style="flex: 0 0 auto; margin-left: 10px;"
         >
-          删除西药方
+          删除
         </el-button>
       </div>
       
       <!-- 西药方操作区 -->
-      <div style="margin-bottom: 5px">
+      <div style="margin-bottom: 5px; display: flex; align-items: center; flex-wrap: wrap; gap: 8px;">
         <el-button type="primary" @click="handleAddPrescription(prescription.id)" :disabled="false">
           新增
         </el-button>
@@ -52,6 +51,9 @@
         <el-button type="default" @click="combination(prescription.id)" :disabled="false"> 组合 </el-button>
         <el-button type="default" @click="split(prescription.id)" :disabled="false"> 拆组 </el-button>
         <el-button type="danger" plain @click="handleDelete(prescription.id)" :disabled="false"> 删除 </el-button>
+        <el-button type="primary" @click="refresh(prescription.id)" :disabled="false">
+          刷新
+        </el-button>
         <span class="descriptions-item-label"> 诊断： </span>
         <el-select v-model="prescription.conditionDefinitionId" placeholder="诊断" style="width: 180px" @change="handleDiagnosisChange(prescription.conditionDefinitionId, prescription.id)">
           <el-option
@@ -73,9 +75,6 @@
         <span class="descriptions-item-label">
           合计金额：{{ getPrescriptionTotalAmount(prescription.id) }}元
         </span>
-        <el-button type="primary" style="float: right" @click="refresh(prescription.id)" :disabled="false">
-          刷新
-        </el-button>
       </div>
       <el-table
         max-height="400"