fix(diagnosis): 修复诊断组件中的条件判断和数据类型问题

- 在el-popconfirm中添加条件判断,仅在非常用和非历史节点显示删除确认
- 移除重复的按钮条件判断逻辑,统一删除确认按钮的显示条件
- 将diagSrtNo的默认值从字符串'1'改为数字1,保持数据类型一致性
- 修复订单状态标签的颜色配置,将停止状态从error类型改为danger类型
- 添加保存按钮的禁用条件计算,当没有患者信息或处方列表为空时禁用
- 移除调试用的console.log语句,清理生产环境代码
This commit is contained in:
2026-05-29 13:12:44 +08:00
parent a9ed53a949
commit 774a3bd473
2 changed files with 10 additions and 9 deletions

View File

@@ -46,6 +46,11 @@
</el-button>
</template>
<el-popconfirm
v-if="
node.level === 2 &&
node.parent.data.name != '常用' &&
node.parent.data.name != '历史'
"
width="200"
:hide-after="10"
title="确认删除此常用诊断吗"
@@ -54,11 +59,6 @@
>
<template #reference>
<el-button
v-if="
node.level === 2 &&
node.parent.data.name != '常用' &&
node.parent.data.name != '历史'
"
style="color: #000000"
type="text"
size="small"
@@ -404,7 +404,7 @@ function getList() {
...item,
};
if (obj.diagSrtNo == null) {
obj.diagSrtNo = '1';
obj.diagSrtNo = 1;
}
return obj;
});

View File

@@ -255,7 +255,7 @@
<el-tag v-else-if="scope.row.statusEnum == 10" type="primary">已校对</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 11" type="primary">待接收</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 3" type="success">已完成</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 6" type="error">停止</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 6" type="danger">停止</el-tag>
<el-tag v-else type="info">{{ scope.row.chargeStatus_enumText }}</el-tag>
</template>
</el-table-column>
@@ -489,6 +489,9 @@ const unitMap = ref({
const buttonDisabled = computed(() => {
return !patientInfo.value;
});
const isSaveDisabled = computed(() => {
return !patientInfo.value || prescriptionList.value.length === 0;
});
const props = defineProps({
patientInfo: {
type: Object,
@@ -676,7 +679,6 @@ function getListInfo(addNewRow) {
organization.value = res?.data?.records ?? res?.data ?? [];
});
getPrescriptionList(patientInfo.value.encounterId).then((res) => {
console.log('getListInfo==========>', JSON.stringify(res.data));
// 等待科室树加载完成后再处理处方数据,确保 resolveOrgId 能正确匹配
orgTreePromise.then(() => {
loadingInstance.close();
@@ -684,7 +686,6 @@ function getListInfo(addNewRow) {
.map((item) => {
const parsedContent = JSON.parse(item.contentJson);
// 构造 unitCodeList确保编辑时下拉框有正确的选项
console.log('【DEBUG】unitCode:', parsedContent?.unitCode, typeof parsedContent?.unitCode, 'unitCodeList:', JSON.stringify(parsedContent?.unitCodeList));
const unitCodeListData = parsedContent?.unitCodeList || [
{ value: String(parsedContent?.unitCode ?? item.unitCode ?? ''), label: parsedContent?.unitCode_dictText ?? item.unitCode_dictText ?? '', type: 'unit' },
{ value: String(parsedContent?.doseUnitCode ?? ''), label: parsedContent?.doseUnitCode_dictText ?? '', type: 'dose' },