{{ proj.projName }}
@@ -72,7 +73,8 @@ import {
deleteTube,
updateTubeConfig,
getBloodTypes,
-} from '../../../services/Index/Test-tube/test-tube'
+ updateTubeActivationStatus,
+} from '../../../services/Index/testTube'
// import type { DataItem, TubeSetting } from '../../../types/Index/index'
// import { ConsumableGroupBase } from '../../../websocket/socket'
import {
@@ -106,12 +108,12 @@ onMounted(() => {
const onClickTubeItem = (rackIdx, tubeIdx) => {
console.log(rackIdx, tubeIdx)
}
-const isElemActive = (proj) => {
+const isProjElemActive = (proj) => {
return selectedProjIds.value.includes(proj.projId)
}
-const elemStyle = (proj) => {
- const active = isElemActive(proj)
+const styleOfProjElem = (proj) => {
+ const active = isProjElemActive(proj)
if (active) {
return {
border: 'solid 1px #FFF',
@@ -220,7 +222,6 @@ const getTubeData = async () => {
}
loading.value = false
}
-const selectedProject = ref(null)
//编辑患者信息
const handleChangeUser = async (uuid) => {
@@ -231,15 +232,22 @@ const handleChangeUser = async (uuid) => {
)
if (!selectedTube) return
testTubeStore.setTubeInfo(selectedTube)
- await updateTubeSettingsHandler()
+ await updateTubeSettings()
router.push({
path: '/index/change-user',
})
}
//删除试管架
-const deleteHandle = async (idx) => {
+const deleteTubeRack = async (idx) => {
const rack = tubeRacks.value[idx]
+ if (rack.state !== 'INACTIVE') {
+ ElMessage({
+ message: '试管架处理激活状态，不可删除',
+ type: 'error',
+ })
+ return
+ }
const res = await deleteTube(rack.uuid)
if (res.success) {
tubeRacks.value = tubeRacks.value.filter((v, i) => i !== idx)
@@ -272,106 +280,48 @@ const addTubeRack = async () => {
}
// 处理试管架激活状态变化
-const handleActivateChange = (update) => {
- //: { uuid: string; active: boolean }
- const rack = tubeRacks.value.find((t) => t.uuid === update.uuid)
- if (rack) {
- rack.active = update.active
+const handleActivateChange = async (index) => {
+ const rack = tubeRacks.value[index]
+ if (rack.state === 'LOCKED') {
+ ElMessage({
+ message: '试管已锁定，不能修改',
+ type: 'error',
+ })
+ return
}
-}
-const handleSampleUpdate = async ({
- projectIds, // number[]
- bloodType, // string
-}) => {
- // Promise
- if (selectedSampleIdsInParent.value.length > 0) {
- // 创建 tubeRacks 的深拷贝
- const updatedTubeRacks = JSON.parse(JSON.stringify(tubeRacks.value))
- // 找到对应的 tubeRack
- const targetTubeRack = updatedTubeRacks.find(
- // t: DataItem
- (t) => t.uuid === UUID.value,
- )
- if (targetTubeRack) {
- targetTubeRack.tubeSettings = targetTubeRack.tubeSettings.map(
- //tube; TubeSetting
- (tube) => {
- if (selectedSampleIdsInParent.value.includes(tube.tubeIndex)) {
- return {
- ...tube,
- projId: [...projectIds],
- bloodType: bloodType,
- }
- }
- return tube
- },
- )
-
- // 清空数组再重新赋值，确保响应式更新
- tubeRacks.value = []
- await nextTick()
- tubeRacks.value = updatedTubeRacks // 新赋值触发响应式
- console.log(
- '🚀 ~ handleSampleUpdate ~ updatedTubeRacks:',
- updatedTubeRacks,
- )
- const selectedTube = updatedTubeRacks.find((t) => t.uuid === UUID.value)
- console.log('🚀 ~ handleSampleUpdate ~ selectedTube:', selectedTube)
- testTubeStore.setTubeInfo(selectedTube)
- console.log(
- '🚀 ~ handleSampleUpdate ~ testTubeStore.$state.tubeInfo:',
- testTubeStore.$state.tubeInfo,
- )
- selectedProject.value = null // 选择后清空选中状态
- await nextTick()
-
- ElMessage({
- message: '样本信息已更新',
- type: 'success',
- duration: 2000,
- })
- }
+ let destState = rack.state === 'INACTIVE' ? 'ACTIVE' : 'INACTIVE'
+ const res = await updateTubeActivationStatus({
+ uuid: rack.uuid,
+ active: destState === 'ACTIVE',
+ })
+ if (res.success) {
+ tubeRacks.value = tubeRacks.value.map((rack, idx) => {
+ if (idx === index) {
+ rack.state = destState
+ }
+ return rack
+ })
} else {
ElMessage({
- message: '请先选择样本后再选择项目',
- type: 'warning',
- duration: 2000,
+ message: '更改激活状态失败',
+ type: 'error',
})
}
}
-// 当前选中的样本ID列表
-const selectedSampleIdsInParent = ref([]) //
-
-const showProjectSelector = ref(false)
-
-// 父组件代码
-const handleUpdateSelectedSamples = ({
- sampleIds, //number[]
- uuid,
-}) => {
- // 更新特定试管架的选中状态
- const tubeRack = tubeRacks.value.find((tube) => tube.uuid === uuid)
- if (tubeRack) {
- // 如果是取消选中（sampleIds为空），则关闭弹窗并清空状态
- if (sampleIds.length === 0) {
- showProjectSelector.value = false
- selectedSampleIdsInParent.value = []
- } else {
- selectedSampleIdsInParent.value = sampleIds
-
- showProjectSelector.value = true
- }
- }
-}
-
-// 添加更新试管设置的方法
-const updateTubeSettingsHandler = async (rackIdx, tubeIdx) => {
+const updateTubeSettings = async (rackIdx, tubeIdx) => {
if (!selectedBloodTypeKey.value) {
ElMessage.error('请选择血液类型')
return
}
const rack = tubeRacks.value[rackIdx]
+ if (rack.state !== 'INACTIVE') {
+ ElMessage({
+ message: '试管架已激活，不能修改',
+ type: 'error',
+ })
+ return
+ }
if (tubeIdx < rack.tubeSettings.length) {
const setting = rack.tubeSettings[tubeIdx]
const updSetting = {
diff --git a/src/pages/Index/components/TestTube/TestTubeRack.vue b/src/pages/Index/components/TestTube/TestTubeRack.vue
index bb76c72..d6a8056 100644
--- a/src/pages/Index/components/TestTube/TestTubeRack.vue
+++ b/src/pages/Index/components/TestTube/TestTubeRack.vue
@@ -1,9 +1,13 @@
-
+
-
+
@@ -11,15 +15,29 @@
-
- 
+
+
-
-
修改试管架
+
+
@@ -28,10 +46,10 @@
@@ -41,18 +59,24 @@ const onClickTubeItem = (idx) => {
height: 150px;
display: flex;
align-items: center;
-
+ &.locked {
+ background-color: #C8C8C8;
+ }
.tube-rack-state {
+ align-self: stretch;
width: 100px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.status-icon img {
- width: 56px;
+ width: 56px;
}
}
.split {
width: 1px;
height: 80px;
- background-color: rgb(192,192,192);
+ background-color: rgb(192, 192, 192);
margin-right: 10px;
}
@@ -64,27 +88,38 @@ const onClickTubeItem = (idx) => {
}
@op-bar-height: 68px;
.test-tube-rack-op {
- height: @op-bar-height;
- background-color: rgb(235,235,235);
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 0 40px;
+ height: @op-bar-height;
+ background-color: rgb(235, 235, 235);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 40px;
- font-size: 22px;
- font-weight: 600;
+ font-size: 22px;
+ font-weight: 600;
+ &.active {
+ color: #999;
.rack-op {
- align-self: stretch;
- line-height: @op-bar-height;
- &.rack-del {
- display: flex;
- align-items: center;
- img {
- width: 20px;
- margin-right: 8px;
- }
- color: red;
- }
+ &.rack-del {
+ color: #999;
+ }
+ }
+ }
+ .rack-op {
+ align-self: stretch;
+ line-height: @op-bar-height;
+ &.rack-edit {
+ color: #999;
+ }
+ &.rack-del {
+ display: flex;
+ align-items: center;
+ img {
+ width: 20px;
+ margin-right: 8px;
+ }
+ color: red;
}
+ }
}
diff --git a/src/services/Index/index.ts b/src/services/Index/index.ts
index 05d1926..9f8b8bd 100644
--- a/src/services/Index/index.ts
+++ b/src/services/Index/index.ts
@@ -1,7 +1,7 @@
export * from './regular'
export * from './emergency'
export * from './history'
-export * from './Test-tube/test-tube'
+export * from './testTube'
export * from './user-manage'
export * from './idCard'
export * from './init'
diff --git a/src/services/Index/Test-tube/test-tube.ts b/src/services/Index/testTube.ts
similarity index 94%
rename from src/services/Index/Test-tube/test-tube.ts
rename to src/services/Index/testTube.ts
index 22902eb..8dbdb2a 100644
--- a/src/services/Index/Test-tube/test-tube.ts
+++ b/src/services/Index/testTube.ts
@@ -1,5 +1,5 @@
-import apiClient from '../../../utils/axios'
-import type { TubeActivationStatus, TubeSetting } from '../../../types/Index'
+import apiClient from '../../utils/axios'
+import type { TubeActivationStatus, TubeSetting } from '../../types/Index'
/*
"data": [
{
@@ -88,7 +88,8 @@ export const updateTubeActivationStatus = async (
try {
const res = await apiClient.post(
'/api/v1/app/appTubeSettingMgr/updateActiveState',
- data,
+ null,
+ { params: data },
)
return res.data
} catch (error) {
修改试管架
编辑患者信息
- 
+
+ 
删除试管架
+
+
删除试管架