wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Revert "Merge remote-tracking branch 'origin/develop' into develop"

Browse Source 
This reverts commit 5946c1ea4b, reversing
changes made to 8d905c9844.
This commit is contained in:
wangjian963
2026-05-15 09:33:35 +08:00
parent 5946c1ea4b
commit 0aa7dd9b82
24 changed files with 172 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
View File

@@ -1,6 +1,5 @@
<template>
<div class="fee-dialog-wrapper">
<el-dialog v-model="dialogVisible" title="补费" width="80%" :close-on-click-modal="false">
<el-dialog v-model="dialogVisible" title="补费" width="80%" :close-on-click-modal="false">
<div style="font-size: 16px; font-weight: bold; margin-bottom: 10px">
患者信息：{{
props.patientInfo.patientName +
@@ -252,7 +251,7 @@
</div>
</el-dialog>
<!-- 划价组套选择对话框 -->
<el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000" destroy-on-close>
<el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000">
<div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
<el-input
v-model="groupSetSearchText"
@@ -303,7 +302,6 @@
<el-button type="primary" @click="applyGroupSet" :disabled="!selectedGroupSet">应用</el-button>
</div>
</el-dialog>
</div>
</template>
<script setup>
@@ -521,28 +519,31 @@ watch(
}
);
// 加载科室选项（递归扁平化树形结构）
// 加载科室选项（支持树形/扁平两种数据结构）
function loadDepartmentOptions() {
getOrgList()
.then((res) => {
if (!res?.data?.records?.length) {
departmentOptions.value = [];
return;
}
// 递归扁平化树形结构，提取所有科室节点
const flattenTree = (nodes) => {
const result = [];
for (const node of nodes) {
if (node?.id && node?.name) {
result.push(node);
if (res.data) {
// 尝试从树形结构中取：records[0].children
if (res.data.records && res.data.records.length > 0) {
if (res.data.records[0].children && res.data.records[0].children.length > 0) {
departmentOptions.value = res.data.records[0].children;
return;
}
if (node?.children?.length) {
result.push(...flattenTree(node.children));
// 如果 records[0] 有 id 和 name（非树根节点），直接用所有 records
if (res.data.records[0].id) {
departmentOptions.value = res.data.records;
return;
}
}
return result;
};
departmentOptions.value = flattenTree(res.data.records);
// 兜底：如果 records 不存在或为空，尝试直接使用 data 本身
if (Array.isArray(res.data)) {
departmentOptions.value = res.data;
return;
}
}
// 所有方式都失败，置空
departmentOptions.value = [];
})
.catch(() => {
console.warn('科室列表加载失败（可能无权限）');
@@ -608,13 +609,13 @@ function getUnitCodeOptions(row) {
const unitCodes = [];
// 大单位：优先用 code，code 缺失时用字典文本兜底
if (row.unitCode != null && String(row.unitCode) !== '') {
unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText || String(row.unitCode) });
unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText });
} else if (row.unitCode_dictText) {
unitCodes.push({ code: row.unitCode_dictText, codeText: row.unitCode_dictText });
}
// 小单位：同上
if (row.minUnitCode != null && String(row.minUnitCode) !== '') {
unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText || String(row.minUnitCode) });
unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText });
} else if (row.minUnitCode_dictText) {
unitCodes.push({ code: row.minUnitCode_dictText, codeText: row.minUnitCode_dictText });
}