From c712a42f79c59c115f23df4b497c1cb3484635d4 Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentron.com>
Date: Thu, 30 Apr 2026 23:56:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D#428=E8=B5=B5=E4=BA=91?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF=20-=20lo?=
 =?UTF-8?q?adPackageDetailsForItem=E5=87=BD=E6=95=B0=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复loadPackageDetailsForItem函数被错误插入到loadPackageDetails函数内部的问题
- 格式化模板代码，提高可读性
- 确保套餐明细加载逻辑正确工作
---
 .../examination/examinationApplication.vue    | 49 +++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
index a2db1d4c..a9c07ce5 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -354,8 +354,25 @@
                     <el-icon><Close /></el-icon>
                   </el-button>
                 </div>
-                <!-- Bug #384修复: 展开后显示检查方法勾选框列表 -->
-                <!-- Bug #428修复: 展开后显示套餐明细或检查方法 -->                <div v-if="item.expanded">                  <!-- 显示套餐明细 -->                  <div v-if="item.packageDetails && item.packageDetails.length > 0" class="package-details-list">                    <div class="detail-row" v-for="detail in item.packageDetails" :key="detail.id">                      <span class="detail-name">{{ detail.name }}</span>                      <span class="detail-info">数量: {{ detail.quantity }} 单价: ¥{{ detail.price }}</span>                    </div>                  </div>                  <!-- 显示检查方法 -->                  <div v-else-if="item.methods && item.methods.length > 0" class="method-list">                    <div v-for="method in item.methods" :key="method.id" class="method-option">                      <el-checkbox :model-value="item.selectedMethod?.id === method.id" @change="(val) => selectMethodCheckbox(val, item, method)">                        <span class="method-name">{{ method.name }}</span>                        <span class="method-price">¥{{ method.packagePrice || item.price }}</span>                      </el-checkbox>                    </div>                  </div>                </div>
+                <!-- Bug #428修复: 展开后显示套餐明细或检查方法 -->
+                <div v-if="item.expanded">
+                  <!-- 显示套餐明细 -->
+                  <div v-if="item.packageDetails && item.packageDetails.length > 0" class="package-details-list">
+                    <div class="detail-row" v-for="detail in item.packageDetails" :key="detail.id">
+                      <span class="detail-name">{{ detail.name }}</span>
+                      <span class="detail-info">数量: {{ detail.quantity }} 单价: ¥{{ detail.price }}</span>
+                    </div>
+                  </div>
+                  <!-- 显示检查方法 -->
+                  <div v-else-if="item.methods && item.methods.length > 0" class="method-list">
+                    <div v-for="method in item.methods" :key="method.id" class="method-option">
+                      <el-checkbox :model-value="item.selectedMethod?.id === method.id" @change="(val) => selectMethodCheckbox(val, item, method)">
+                        <span class="method-name">{{ method.name }}</span>
+                        <span class="method-price">¥{{ method.packagePrice || item.price }}</span>
+                      </el-checkbox>
+                    </div>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -412,13 +429,39 @@ async function loadPackageDetails(row, treeNode, resolve) {
       resolve(children);
     } else {
       resolve([]);
-async function loadPackageDetailsForItem(item) { if (!item.isPackage || !item.packageId) { return; } try { const res = await request({ url: `/exam/package/${item.packageId}/details`, method: 'get' }); if (res.code === 200 && res.data) { item.packageDetails = res.data.map(detail => ({ ...detail, name: detail.name || detail.itemName, unit: detail.unit || '次', price: detail.price || detail.itemPrice || 0, quantity: detail.quantity || 1 })); } else { item.packageDetails = []; } } catch (err) { console.error('加载套餐明细失败:', err); item.packageDetails = []; } }
     }
   } catch (err) {
     console.error('加载套餐明细失败:', err);
     resolve([]);
   }
 }
+
+// #428: 为已选择项目加载套餐明细
+async function loadPackageDetailsForItem(item) {
+  if (!item.isPackage || !item.packageId) {
+    return;
+  }
+  try {
+    const res = await request({
+      url: `/exam/package/${item.packageId}/details`,
+      method: 'get'
+    });
+    if (res.code === 200 && res.data) {
+      item.packageDetails = res.data.map(detail => ({
+        ...detail,
+        name: detail.name || detail.itemName,
+        unit: detail.unit || '次',
+        price: detail.price || detail.itemPrice || 0,
+        quantity: detail.quantity || 1
+      }));
+    } else {
+      item.packageDetails = [];
+    }
+  } catch (err) {
+    console.error('加载套餐明细失败:', err);
+    item.packageDetails = [];
+  }
+}
 const detailTableRef = ref(null);
 const formRef = ref(null);