Merge remote-tracking branch 'origin/develop' into guanyu

This commit is contained in:
2026-06-19 15:49:28 +08:00

View File

@@ -96,9 +96,14 @@
<!-- <el-tab-pane label="皮试管理" name="I"> 皮试管理 </el-tab-pane> <!-- <el-tab-pane label="皮试管理" name="I"> 皮试管理 </el-tab-pane>
<el-tab-pane label="出院管理" name="J"> <el-tab-pane label="出院管理" name="J">
<DischargedManagement></DischargedManagement> <DischargedManagement></DischargedManagement>
</el-tab-pane> -->
<el-tab-pane
label="退药管理"
name="MedicineReturn"
>
<MedicineReturn v-if="activeTabName === 'MedicineReturn'" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="退药管理" name="K"> 退药管理 </el-tab-pane> <!-- <el-tab-pane label="手术记录" name="L"> 手术记录 </el-tab-pane> -->
<el-tab-pane label="手术记录" name="L"> 手术记录 </el-tab-pane> -->
</el-tabs> </el-tabs>
</el-main> </el-main>
</el-container> </el-container>
@@ -122,6 +127,7 @@ import {
MedicalOrderProofread, MedicalOrderProofread,
RollFee, RollFee,
TprChart, TprChart,
MedicineReturn,
} from './index.js'; } from './index.js';
const activeTabName = ref('InOut'); const activeTabName = ref('InOut');