From 0e2ada26ddb7ff26155860ecbef22bb2d205648e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= <huatuo@gentronhealth.com>
Date: Sat, 13 Jun 2026 00:57:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(#762):=20=E6=B1=87=E6=80=BB=E9=A2=86?=
 =?UTF-8?q?=E8=8D=AF=E7=AD=9B=E9=80=89=E6=A0=87=E7=AD=BE=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E4=B8=94=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因：
- el-radio-button 使用自闭合标签，Element Plus 需要 slot 传入文字才能渲染
- drugType 未通过 prop 传递给子组件，西药/中药筛选功能断裂
- 子组件 API 调用缺少 tcmFlag 参数，后端无法区分西药/中药
- provide 未从 vue 导入

修复：
- index.vue: 4个 radio-button 补充中文标签（西药/中药/明细/汇总）
- index.vue: drugType radio-group 添加 @change 触发刷新
- index.vue: 子组件添加 :drug-type prop 传递
- index.vue: 补全 provide 到 vue import
- prescriptionList.vue: defineProps 新增 drugType prop，API 添加 tcmFlag
- summaryMedicineList.vue: defineProps 新增 drugType prop，API 添加 tcmFlag
- 清理三个文件的 UTF-8 BOM 字符
---
 .../components/prescriptionList.vue           |  7 ++++-
 .../components/summaryMedicineList.vue        |  7 ++++-
 .../inpatientNurse/drugDistribution/index.vue | 31 ++++++++++---------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
index a804f9fd9..46868303c 100755
--- a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
+++ b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div style="height: calc(100vh - 176px)">
     <div
       v-loading="loading"
@@ -272,6 +272,10 @@ const props = defineProps({
     type: Number,
     default: undefined,
   },
+  drugType: {
+    type: String,
+    default: '1',
+  },
 });
 
 function handleGetPrescription() {
@@ -285,6 +289,7 @@ function handleGetPrescription() {
       therapyEnum: props.therapyEnum,
       exeStatus: props.exeStatus,
       requestStatus: props.requestStatus,
+      tcmFlag: props.drugType === '1' ? 0 : 1,
     })
       .then((res) => {
         // try {
diff --git a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue
index e263674c7..5f6b8011f 100755
--- a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue
+++ b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div style="height: calc(100vh - 176px)">
     <div
       v-loading="loading"
@@ -178,6 +178,10 @@ const props = defineProps({
     type: Number,
     default: undefined,
   },
+  drugType: {
+    type: String,
+    default: '1',
+  },
 });
 
 handleGetPrescription();
@@ -190,6 +194,7 @@ function handleGetPrescription() {
   if (props.therapyEnum !== undefined) {
     params.therapyEnum = props.therapyEnum;
   }
+  params.tcmFlag = props.drugType === '1' ? 0 : 1;
   getMedicineSummary(params).then((res) => {
     medicineSummaryFormList.value = res.data.records;
     loading.value = false;
diff --git a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/index.vue b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/index.vue
index 2e5f0734c..dbdcd4cd6 100755
--- a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/index.vue
+++ b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div style="display: flex; justify-content: space-between">
     <div style="width: 20%; height: 90vh; border-right: solid 2px #e4e7ed">
       <div
@@ -56,25 +56,26 @@
           <el-radio-group
             v-model="drugType"
             class="ml10"
+            @change="handleGetPrescription"
           >
-            <el-radio-button
-              value="1"
-            />
-            <el-radio-button
-              value="2"
-            />
+            <el-radio-button value="1">
+              西药
+            </el-radio-button>
+            <el-radio-button value="2">
+              中药
+            </el-radio-button>
           </el-radio-group>
           <el-radio-group
             v-model="isDetails"
             class="ml20"
             @change="handleRadioChange"
           >
-            <el-radio-button
-              value="1"
-            />
-            <el-radio-button
-              value="2"
-            />
+            <el-radio-button value="1">
+              明细
+            </el-radio-button>
+            <el-radio-button value="2">
+              汇总
+            </el-radio-button>
           </el-radio-group>
           <span class="descriptions-item-label">截止时间：</span>
           <el-date-picker
@@ -132,11 +133,13 @@
         :request-status="requestStatus"
         :deadline="deadline"
         :therapy-enum="therapyEnum"
+        :drug-type="drugType"
       />
       <SummaryMedicineList
         v-else
         ref="summaryMedicineRefs"
         :therapy-enum="therapyEnum"
+        :drug-type="drugType"
       />
       <!-- <el-tabs v-model="activeName" class="demo-tabs centered-tabs" @tab-change="handleClick">
         <el-tab-pane
@@ -158,7 +161,7 @@
 </template>
 
 <script setup>
-import {getCurrentInstance, nextTick, ref} from 'vue';
+import {getCurrentInstance, nextTick, provide, ref} from 'vue';
 import {useRouter} from 'vue-router';
 import PatientList from '../components/patientList.vue';
 import PrescriptionList from './components/prescriptionList.vue';