diff --git a/src/pages/Index/Regular/TestTube.vue b/src/pages/Index/Regular/TestTube.vue index f213555..6016d88 100644 --- a/src/pages/Index/Regular/TestTube.vue +++ b/src/pages/Index/Regular/TestTube.vue @@ -153,7 +153,7 @@ const clickBloodTypeItem = (type) => { } const projIdCntMap = computed(() => { - return R.reduce( + let projMap = R.reduce( (acc, curr) => { const projIdCntRack = R.reduce( (ac, cur) => { @@ -174,6 +174,8 @@ const projIdCntMap = computed(() => { {}, testTubeStore.tubeRacks, ) + console.log('projMap===', projMap) + return projMap; }) //编辑患者信息 @@ -277,22 +279,26 @@ const updateTubeSettings = async (rackIdx: number, tubeIdx: number) => { return } - console.log('rack.tubeSettings---', rack.tubeSettings) - - //检查耗材 - // if(consumablesStore.consumableData && consumablesStore.consumableData.reactionPlateGroup){ - // let reactionPlateGroup = consumablesStore.consumableData.reactionPlateGroup - // let list:reactionPlateGroupItem[] = [] - // reactionPlateGroup.forEach((item:any) => { - // if(item.projId && selectedProjIds.value.includes(item.projId) && item.num <=0){ - // list.push(item.projName) + // console.log('tubeRack---', testTubeStore.tubeRacks) + // console.log('rack---', rack.tubeSettings) + // let hasExistProject = existValidProject(rack) + // if(!hasExistProject){ + // //检查耗材 + // if(consumablesStore.consumableData && consumablesStore.consumableData.reactionPlateGroup){ + // let reactionPlateGroup = consumablesStore.consumableData.reactionPlateGroup + // let list:reactionPlateGroupItem[] = [] + // reactionPlateGroup.forEach((item:any) => { + // if(item.projId && selectedProjIds.value.includes(item.projId) && item.num <=0){ + // list.push(item.projName) + // } + // }) + // if(list.length){ + // eMessage.error(`项目${list.join(',')}耗材不足,请添加耗材`) + // return; // } - // }) - // if(list.length){ - // eMessage.error(`项目${list.join(',')}耗材不足,请添加耗材`) - // return; // } // } + //超出现有数量 // if(consumablesStore.projectsAvailable){ diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue index 8482ea1..12a26fe 100644 --- a/src/pages/Login/Login.vue +++ b/src/pages/Login/Login.vue @@ -47,10 +47,12 @@