Fix Bug #480: [住院护士站-医嘱执行] 非耗材类医嘱执行报"耗材库存"错误且全选逻辑联动异常
根因分析: 1. 耗材库存报错:lotNumberMatch() 按 encounterId 查询 ALL 待发放 DeviceDispense, 不区分是否为本次执行的医嘱。若该就诊存在其他未执行的耗材记录且库存为零, 整个调用就会失败,导致非耗材类医嘱执行也被拦截。 2. 全选联动异常:toggleRowSelection() 程序化选中会触发 @select 事件, handleRowSelect 中调用 selectAllCheckboxesInRow 导致级联全选。 修复方案: - 后端:lotNumberMatch 新增 requestIdList 可选参数,当传入时通过 DeviceRequest.basedOnId 过滤仅校验与本次执行医嘱关联的耗材记录,避免其他未执行医嘱干扰 - 前端:handleExecute 传入 selectedRequestIds(仅诊疗类医嘱的 requestId) - 前端:新增 skipSelectCascade 标志,程序化 toggleRowSelection 时阻止 handleRowSelect 触发 selectAllCheckboxesInRow,消除级联反馈环 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -241,6 +241,8 @@ const loading = ref(false);
|
||||
const chooseAll = ref(false);
|
||||
// 独立维护选中行ID集合,避免el-table内部selection状态异常导致联动全选
|
||||
const selectedRowIds = ref(new Set());
|
||||
// 跳过选中事件级联:程序化调用 toggleRowSelection 时阻止 handleRowSelect 触发 selectAllCheckboxesInRow
|
||||
const skipSelectCascade = ref(false);
|
||||
const props = defineProps({
|
||||
exeStatus: {
|
||||
type: Number,
|
||||
@@ -484,8 +486,13 @@ function handleExecute() {
|
||||
if (hasServiceRequest) {
|
||||
// 仅传入选中医嘱对应的 encounterId,避免其他患者的耗材记录干扰
|
||||
const selectedEncounterIds = [...new Set(list.map((item) => item.encounterId).filter(Boolean))];
|
||||
// 仅传入诊疗类医嘱的 requestId,让后端仅校验与本次执行相关的耗材,避免其他未执行医嘱的耗材记录干扰
|
||||
const selectedRequestIds = list
|
||||
.filter((item) => String(item.adviceTable || '') === 'wor_service_request')
|
||||
.map((item) => item.requestId)
|
||||
.filter(Boolean);
|
||||
if (selectedEncounterIds.length > 0) {
|
||||
lotNumberMatch({ encounterIdList: selectedEncounterIds }, { skipErrorMsg: true })
|
||||
lotNumberMatch({ encounterIdList: selectedEncounterIds, requestIdList: selectedRequestIds }, { skipErrorMsg: true })
|
||||
.then((matchRes) => {
|
||||
if (matchRes && matchRes.code !== 200) {
|
||||
console.warn('lotNumberMatch returned error:', matchRes.msg);
|
||||
@@ -650,6 +657,7 @@ function handleRateChange(value, date, time, row, rateItem) {
|
||||
}
|
||||
|
||||
function handelSwicthChange(value) {
|
||||
skipSelectCascade.value = true;
|
||||
prescriptionList.value.forEach((item, index) => {
|
||||
const tableRef = proxy.$refs['tableRef' + index];
|
||||
if (tableRef && tableRef[0]) {
|
||||
@@ -670,12 +678,15 @@ function handelSwicthChange(value) {
|
||||
}
|
||||
}
|
||||
});
|
||||
skipSelectCascade.value = false;
|
||||
}
|
||||
|
||||
// 默认选中全部行
|
||||
function defaultSelectAllRows() {
|
||||
// 清空并重建选中集合
|
||||
selectedRowIds.value.clear();
|
||||
// 阻止 toggleRowSelection 触发 handleRowSelect 中的 selectAllCheckboxesInRow 级联
|
||||
skipSelectCascade.value = true;
|
||||
prescriptionList.value.forEach((item, index) => {
|
||||
const tableRef = proxy.$refs['tableRef' + index];
|
||||
if (tableRef && tableRef[0]) {
|
||||
@@ -688,6 +699,7 @@ function defaultSelectAllRows() {
|
||||
});
|
||||
}
|
||||
});
|
||||
skipSelectCascade.value = false;
|
||||
// 更新全选开关状态
|
||||
chooseAll.value = true;
|
||||
}
|
||||
@@ -764,6 +776,7 @@ function checkAndToggleRowSelection(row) {
|
||||
const isCurrentlySelected = selectedRowIds.value.has(row.requestId);
|
||||
|
||||
// 根据checkbox状态更新表格行选中状态
|
||||
skipSelectCascade.value = true;
|
||||
if (isAllSelected && !isCurrentlySelected) {
|
||||
selectedRowIds.value.add(row.requestId);
|
||||
tableRef[0].toggleRowSelection(row, true);
|
||||
@@ -771,6 +784,7 @@ function checkAndToggleRowSelection(row) {
|
||||
selectedRowIds.value.delete(row.requestId);
|
||||
tableRef[0].toggleRowSelection(row, false);
|
||||
}
|
||||
skipSelectCascade.value = false;
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -782,8 +796,10 @@ function handleRowSelect(selection, row, tableIndex) {
|
||||
|
||||
if (isSelected) {
|
||||
selectedRowIds.value.add(row.requestId);
|
||||
// 选中行时,选中该行内部的所有checkbox
|
||||
selectAllCheckboxesInRow(row);
|
||||
// 仅在非程序化选中时,联动选中该行内部的所有checkbox
|
||||
if (!skipSelectCascade.value) {
|
||||
selectAllCheckboxesInRow(row);
|
||||
}
|
||||
} else {
|
||||
selectedRowIds.value.delete(row.requestId);
|
||||
// 取消选中行时,取消选中该行内部的所有checkbox
|
||||
|
||||
Reference in New Issue
Block a user