From 22a9a5fe525fb893ecaa8d4a8bfb65169ce02fc4 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 四月 2025 14:52:27 +0800
Subject: [PATCH] update & refactor
---
src/views/ecg/doctor/components/RoutinePanel.vue | 2
src/views/ecg/appointment/index.vue | 2
src/api/ecg/devmanage/index.ts | 22 +++---
src/views/ecg/checktype/index.vue | 4
src/views/ecg/room/index.vue | 2
src/views/ecg/room/RoomSetting.vue | 2
src/api/ecg/devrent/index.ts | 36 ++++++------
src/views/ecg/callingscreen/bigscreen.vue | 3
src/views/ecg/callingscreen/roomscreen.vue | 9 +-
src/views/ecg/devrent/index.vue | 2
src/views/ecg/doctor/components/DevInstallPanel.vue | 2
src/utils/checkTypeFormatter.ts | 9 +++
src/views/ecg/doctor/components/DevReadyPanel.vue | 42 +++++++------
src/views/ecg/doctor/components/TitlePanel.vue | 2
src/views/ecg/appointment/CheckItemPanel.vue | 4
src/views/ecg/appointment/AppointmentConfirm.vue | 4
src/views/ecg/appointment/AppointmentForm.vue | 2
src/components/RoomBedSelect/src/RoomBedSelect.vue | 2
src/views/ecg/doctor/components/QueuePanel.vue | 5 +
src/components/RoomStatus/src/RoomStatus.vue | 2
src/views/ecg/queue/index.vue | 2
21 files changed, 88 insertions(+), 72 deletions(-)
diff --git a/src/api/ecg/devmanage/index.ts b/src/api/ecg/devmanage/index.ts
index ed7380d..f71f887 100644
--- a/src/api/ecg/devmanage/index.ts
+++ b/src/api/ecg/devmanage/index.ts
@@ -9,17 +9,17 @@
// 璁惧 VO
export interface DeviceVO {
- id: number // id
- devCodeIntrinsic: string
- devCodeHosp: string
- devCodeDept: string
- devId: string // 璁惧缂栧彿
- category: string // 鍒嗙被鍚�
- brand: string // 鍝佺墝
- model: string // 鍨嬪彿
- purchaseDate: number // 閲囪喘鏃ユ湡
- state: number //鐘舵��
- comment: string // 澶囨敞
+ id?: number // id
+ devCodeIntrinsic?: string
+ devCodeHosp?: string
+ devCodeDept?: string
+ devId?: string // 璁惧缂栧彿
+ category?: string // 鍒嗙被鍚�
+ brand?: string // 鍝佺墝
+ model?: string // 鍨嬪彿
+ purchaseDate?: number // 閲囪喘鏃ユ湡
+ state?: number //鐘舵��
+ comment?: string // 澶囨敞
}
// 璁惧缁熻 VO
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 1503a3e..b6fa8d6 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -3,24 +3,24 @@
// 瑁呮満鎷嗘満 VO
export interface DevRentVO {
- id: number | undefined // id
- applyNo: string | undefined // 棰勭害鐢宠鍙�
- episodeId: string | undefined // 灏辫瘖娴佹按鍙�
- devId: string | undefined // 璁惧缂栧彿
- patId: string | undefined// 鎮ｈ�呯紪鍙�
- patName: string | undefined // 鎮ｈ�呭悕绉�
- patDetails: PatDetailsVO | undefined
- checkType: number | undefined
- rentTime: number | undefined // 瑁呮満鏃堕棿
- returnTime: number | undefined // 鎷嗘満鏃堕棿
- interference: number | undefined // 骞叉壈鏁�
- baseline: string | undefined // 鍩虹嚎绮�
- detachment: string | undefined // 鑴辫惤
- remark: string | undefined // 澶囨敞
- state: number | undefined // 鐘舵��
- paid: number | undefined
- roomId: number | undefined | null
- bedNo: string | undefined | null
+ id?: number | undefined | null // id
+ applyNo?: string | undefined | null // 棰勭害鐢宠鍙�
+ episodeId?: string | undefined | null // 灏辫瘖娴佹按鍙�
+ devId?: string | undefined | null // 璁惧缂栧彿
+ patId?: string | undefined | null// 鎮ｈ�呯紪鍙�
+ patName?: string | undefined | null // 鎮ｈ�呭悕绉�
+ patDetails?: PatDetailsVO | undefined | null
+ checkType?: number | undefined | null
+ rentTime?: number | undefined | null // 瑁呮満鏃堕棿
+ returnTime?: number | undefined | null // 鎷嗘満鏃堕棿
+ interference?: number | undefined | null // 骞叉壈鏁�
+ baseline?: string | undefined | null // 鍩虹嚎绮�
+ detachment?: string | undefined | null // 鑴辫惤
+ remark?: string | undefined | null // 澶囨敞
+ state?: number | undefined | null // 鐘舵��
+ paid?: number | undefined | null
+ roomId?: number | undefined | null
+ bedNo?: string | undefined | null
}
// 瑁呮満鎷嗘満 API
diff --git a/src/components/RoomBedSelect/src/RoomBedSelect.vue b/src/components/RoomBedSelect/src/RoomBedSelect.vue
index e6318d3..12dacc8 100644
--- a/src/components/RoomBedSelect/src/RoomBedSelect.vue
+++ b/src/components/RoomBedSelect/src/RoomBedSelect.vue
@@ -56,7 +56,7 @@
<div class="deskwarp">
<div v-for="(checkType, subIndex) in bedItem.checkTypes" :key="subIndex">
- {{checkTypeStore.getCheckTypeName(checkType)}}
+ {{getCheckTypeName(checkType)}}
</div>
<div>
{{bedItem.opType === 1?"棰嗙敤":""}}
diff --git a/src/components/RoomStatus/src/RoomStatus.vue b/src/components/RoomStatus/src/RoomStatus.vue
index 82820bc..7bc8dec 100644
--- a/src/components/RoomStatus/src/RoomStatus.vue
+++ b/src/components/RoomStatus/src/RoomStatus.vue
@@ -64,7 +64,7 @@
/>
{{bedItem.bedNo}} {{bedItem.docName}} {{bedItem.status === 30?"-鏆傚仠":""}}
<div v-for="(checkType, subIndex) in bedItem.checkTypes" :key="subIndex">
- {{checkTypeStore.getCheckTypeName(checkType)}}
+ {{getCheckTypeName(checkType)}}
</div>
<div>
{{bedItem.opType === 1?"棰嗙敤":""}}
diff --git a/src/utils/checkTypeFormatter.ts b/src/utils/checkTypeFormatter.ts
new file mode 100644
index 0000000..64f3767
--- /dev/null
+++ b/src/utils/checkTypeFormatter.ts
@@ -0,0 +1,9 @@
+import {useCheckTypeStore} from "@/store/modules/checkType";
+
+const checkTypeStore = useCheckTypeStore();
+
+export const getCheckTypeName = (checkType) => checkTypeStore.getCheckTypeName(checkType)
+
+export const getCheckTypeSeqPrefix = (checkType) => checkTypeStore.getCheckTypeSeqPrefix(checkType)
+
+
diff --git a/src/views/ecg/appointment/AppointmentConfirm.vue b/src/views/ecg/appointment/AppointmentConfirm.vue
index f6e3664..9ddf270 100644
--- a/src/views/ecg/appointment/AppointmentConfirm.vue
+++ b/src/views/ecg/appointment/AppointmentConfirm.vue
@@ -122,7 +122,7 @@
bookTime: new Date(),
bookDate: new Date(),
bookTimeslot: 9301030,
- bookCheckType: checkTypeStore.getCheckTypeName(100),
+ bookCheckType: getCheckTypeName(100),
paid: 0,
})
const formRef = ref() // 琛ㄥ崟 Ref
@@ -176,7 +176,7 @@
bookTime: new Date(),
bookDate: new Date(),
bookTimeslot: 9301030,
- bookCheckType: checkTypeStore.getCheckTypeName(100),
+ bookCheckType: getCheckTypeName(100),
paid: 0,
bookSeqNum: 0
}
diff --git a/src/views/ecg/appointment/AppointmentForm.vue b/src/views/ecg/appointment/AppointmentForm.vue
index 864f5a3..8ea4219 100644
--- a/src/views/ecg/appointment/AppointmentForm.vue
+++ b/src/views/ecg/appointment/AppointmentForm.vue
@@ -282,7 +282,7 @@
bookTime: undefined,
bookDate: new Date().getTime(),
bookTimeslot: 9000930,
- bookCheckType: checkTypeStore.getCheckTypeName(100),
+ bookCheckType: getCheckTypeName(100),
paid: 0,
}
formRef.value?.resetFields()
diff --git a/src/views/ecg/appointment/CheckItemPanel.vue b/src/views/ecg/appointment/CheckItemPanel.vue
index d841bda..98fbd46 100644
--- a/src/views/ecg/appointment/CheckItemPanel.vue
+++ b/src/views/ecg/appointment/CheckItemPanel.vue
@@ -129,7 +129,7 @@
//var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); 瀵艰嚧璧颁笁椤�
var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
//鏂囨湰
- const checkTypeName = checkTypeStore.getCheckTypeName(props.appointment.bookCheckType)
+ const checkTypeName = getCheckTypeName(props.appointment.bookCheckType)
panel.addPrintText({ options: { width: 150, height: 15, top: 2, left: 10, title: checkTypeName, textAlign: 'center', fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const patientBaisc = props.appointment.patName + " " + calGender(props.appointment.patGender) + " " + calculateAge(props.appointment.patBirthday) + "宀�"
panel.addPrintText({ options: { width: 150, height: 15, top: 27, left: 10, title: patientBaisc, textAlign: 'center' , fontSize: 15, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
@@ -168,7 +168,7 @@
<template>
<el-card style="width: 200px" shadow="hover" >
- <template #header>{{checkTypeStore.getCheckTypeName(appointment.bookCheckType)}}</template>
+ <template #header>{{getCheckTypeName(appointment.bookCheckType)}}</template>
<div>{{formatDate(appointment.bookDate, 'YYYY-MM-DD')}}</div>
<div>{{formatTimeslot(appointment.bookTimeslot)}}</div>
diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index 2cdc8e1..3ccaa16 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -147,7 +147,7 @@
</el-table-column>
<el-table-column label="棰勭害妫�鏌ョ被鍨�" align="center" prop="bookCheckType" min-width="120px">
<template #default="scope">
- {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
+ {{getCheckTypeName(scope.row.bookCheckType)}}
</template>
</el-table-column>
<el-table-column label="鐢熸棩" align="center" prop="patBirthday" :formatter="dateFormatter2" width="110px"/>
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index df12138..10768d4 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -4,6 +4,7 @@
import {CallApi, CallVO} from "@/api/ecg/call";
import {queueStatusConvert} from "@/utils/statusFormatter";
import {useCheckTypeStore} from "@/store/modules/checkType";
+import {getCheckTypeSeqPrefix} from "../../../utils/checkTypeFormatter";
defineOptions({ name: 'bigscreen' })
@@ -114,7 +115,7 @@
<div style="display:flex; justify-content:space-around; align-items: flex-start; flex-grow: 1; border: solid 2px var(--el-color-primary-light-7); font-size: 20px">
<div v-for="[disColId2, columnPatientList] of Object.entries(mapColumnVsPatients)" :key="disColId2" style="flex: 1; flex-basis: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
<div v-for="(item, index) in columnPatientList" :key="index" :class="getItemCssClass(item)">
- <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}}</span>
+ <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}}</span>
<span style="display:inline-block; width:80px;">{{ nameDesensitize(item.patName) }} </span>
<span style="display:inline-block; width:80px;">{{queueStatusConvert(item.status)}} </span>
{{item.roomName}} {{item.bedNo}}
diff --git a/src/views/ecg/callingscreen/roomscreen.vue b/src/views/ecg/callingscreen/roomscreen.vue
index aa10eac..0a47d5c 100644
--- a/src/views/ecg/callingscreen/roomscreen.vue
+++ b/src/views/ecg/callingscreen/roomscreen.vue
@@ -6,6 +6,7 @@
import {CallApi, CallVO} from "@/api/ecg/call";
import {queueStatusConvert} from "../../../utils/statusFormatter";
import {useCheckTypeStore} from "@/store/modules/checkType";
+import {getCheckTypeSeqPrefix} from "../../../utils/checkTypeFormatter";
defineOptions({ name: 'roomscreen' })
let roomId = ref<number>(0)
@@ -123,7 +124,7 @@
label="棰勭害搴忓彿"
width="60px">
<template #default="scope">
- <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span>
+ <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span>
</template>
</el-table-column>
<el-table-column
@@ -139,7 +140,7 @@
label="妫�鏌ラ」鐩�"
width="80px">
<template #default="scope">
- <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}} </span>
+ <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && getCheckTypeName(scope.row.bookCheckType)}} </span>
</template>
</el-table-column>
<el-table-column label="鐘舵��" align="center" width="200px">
@@ -162,7 +163,7 @@
label="棰勭害搴忓彿"
width="60px">
<template #default="scope">
- <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span>
+ <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span>
</template>
</el-table-column>
<el-table-column
@@ -178,7 +179,7 @@
label="妫�鏌ラ」鐩�"
width="80px">
<template #default="scope">
- <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}} </span>
+ <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && getCheckTypeName(scope.row.bookCheckType)}} </span>
</template>
</el-table-column>
<el-table-column label="鐘舵��" align="center" width="200px">
diff --git a/src/views/ecg/checktype/index.vue b/src/views/ecg/checktype/index.vue
index 61bc8d1..e32028f 100644
--- a/src/views/ecg/checktype/index.vue
+++ b/src/views/ecg/checktype/index.vue
@@ -147,7 +147,7 @@
<el-table-column label="浜插拰鐨勬鏌ョ被鍨�" align="center" prop="affinityCheckTypes" >
<template #default="scope">
<div v-for="(checkType, subIndex) in scope.row.affinityCheckTypes" :key="subIndex">
- {{checkTypeStore.getCheckTypeName(checkType)}}
+ {{getCheckTypeName(checkType)}}
</div>
</template>
</el-table-column>
@@ -283,4 +283,4 @@
onMounted(() => {
getList()
})
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/ecg/devrent/index.vue b/src/views/ecg/devrent/index.vue
index 5bcedd1..3e9a1db 100644
--- a/src/views/ecg/devrent/index.vue
+++ b/src/views/ecg/devrent/index.vue
@@ -104,7 +104,7 @@
<el-table-column label="鎮ｈ�呭悕绉�" align="center" prop="patName" />
<el-table-column label="妫�鏌ョ被鍨�" align="center" prop="checkType" width="100px">
<template #default="scope">
- <span>{{checkTypeStore.getCheckTypeName(scope.row.checkType)}}</span>
+ <span>{{getCheckTypeName(scope.row.checkType)}}</span>
</template>
</el-table-column>
<el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="state" width="90px">
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index b81c3de..6a63211 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -7,7 +7,7 @@
v-loading="formLoading"
>
<el-form-item label="妫�鏌ラ」鐩�" prop="">
- {{formData?.checkType && checkTypeStore.getCheckTypeName(formData?.checkType)}}
+ {{formData?.checkType && getCheckTypeName(formData?.checkType)}}
</el-form-item>
<el-row :gutter="20">
<el-col :span="12">
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 043a91f..8c190ff 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -11,7 +11,7 @@
v-loading="formLoading"
>
<el-form-item label="妫�鏌ラ」鐩�" prop="">
- {{formData?.checkType && checkTypeStore.getCheckTypeName(formData?.checkType)}}
+ {{formData?.checkType && getCheckTypeName(formData?.checkType)}}
</el-form-item>
<el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
<el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
@@ -57,8 +57,8 @@
<el-button @click="printBill(formData.patId!, formData.checkType!)">鎵撳嵃灏忕エ</el-button>
<el-button @click="cancelReady" :disabled="formLoading">鏀惧純棰嗙敤</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
- <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
- <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</el-button>
+ <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeConfirm" :disabled="formLoading">纭垂</el-button>
+ <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeCancel" :disabled="formLoading">鍙栨秷纭垂</el-button>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
<ContentWrap>
@@ -149,6 +149,7 @@
import {calGender, getBookBeginTime} from "@/utils";
import {DICT_TYPE} from "@/utils/dict";
import {tranlateDevState} from "@/utils/statusFormatter";
+import {getCheckTypeName} from "../../../../utils/checkTypeFormatter";
/** 璁惧棰嗙敤 琛ㄥ崟 */
defineComponent({ name: 'DevReadyPanel' })
@@ -174,6 +175,7 @@
const checkTypeStore = useCheckTypeStore()
const formData = ref<Partial<DevRentVO>>({
+ id: undefined,
devId: undefined,
patId: undefined,
patName: undefined,
@@ -183,8 +185,6 @@
returnTime: undefined,
remark: undefined,
paid: undefined,
- roomId: props.room.roomId,
- bedNo: props.room.bedNo
})
const formRules = reactive({
@@ -203,6 +203,13 @@
})
const displayBarCode = ref<string> ()
+
+const needAutoFeeConfirm = (checkType: number | null | undefined) => {
+ if (checkType == null)
+ return false
+
+ return checkTypeStore.getExpenseRecognition(checkType)
+}
const getRentInfoByPatId = () => {
const tempPatId = formData.value.patId;
@@ -237,17 +244,16 @@
try {
formData.value.roomId = props.room.roomId
formData.value.bedNo = props.room.bedNo
- const data = formData.value
- console.info( data )
+ await DevRentApi.devReady(formData.value)
- await DevRentApi.devReady(data)
-
- if (autoPrint.value && data.patId && data.checkType) {
- printBill(data.patId, data.checkType)
+ if (autoPrint.value && formData.value.patId && formData.value.checkType) {
+ printBill(formData.value.patId, formData.value.checkType)
}
// 鑷姩纭垂
- feeConfirm()
+ if (needAutoFeeConfirm(formData.value.checkType)) {
+ feeConfirm()
+ }
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -288,8 +294,6 @@
remark: undefined,
patDetails: undefined,
paid: undefined,
- roomId: props.room.roomId,
- bedNo: props.room.bedNo
}
formRef.value?.resetFields()
@@ -376,7 +380,7 @@
//var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); 瀵艰嚧璧颁笁椤�
var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
//鏂囨湰
- const checkTypeName = checkTypeStore.getCheckTypeName(curAppointment.bookCheckType)
+ const checkTypeName = getCheckTypeName(curAppointment.bookCheckType)
panel.addPrintText({ options: { width: 140, height: 12, top: 2, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
const patientBaisc = curAppointment.patName + " " + calGender(curAppointment.patGender) + " " + calculateAge(curAppointment.patBirthday) + "宀�"
panel.addPrintText({ options: { width: 140, height: 12, top: 16, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 10, fontFamily: '寰蒋闆呴粦', fontWeight: '700', } });
@@ -447,24 +451,24 @@
}
const feeConfirm = async () => {
- if (formData.value?.id === undefined) {
+ if (formData.value.id == null) {
message.error(t('璇峰厛棰嗙敤'))
return
}
const result = await DevRentApi.feeConfirm(formData.value.id)
- if (0 == result)
+ if (0 === result)
message.success(t('纭垂鎿嶄綔鎴愬姛'))
}
const feeCancel = async () => {
- if (formData.value?.id === undefined) {
+ if (formData.value.id == null) {
message.error(t('璇峰厛棰嗙敤'))
return
}
const result = await DevRentApi.feeCancel(formData.value.id)
- if (0 == result)
+ if (0 === result)
message.success(t('鎿嶄綔鎴愬姛'))
}
diff --git a/src/views/ecg/doctor/components/QueuePanel.vue b/src/views/ecg/doctor/components/QueuePanel.vue
index 6aa8759..25bcf17 100644
--- a/src/views/ecg/doctor/components/QueuePanel.vue
+++ b/src/views/ecg/doctor/components/QueuePanel.vue
@@ -4,6 +4,7 @@
import {DICT_TYPE} from "@/utils/dict";
import {PatientVO, DoctorApi, RoomBedVO} from "@/api/ecg/doctor";
import {useCheckTypeStore} from "@/store/modules/checkType";
+import {getCheckTypeName, getCheckTypeSeqPrefix} from "../../../../utils/checkTypeFormatter";
defineComponent({
name: 'QueuePanel'
@@ -52,11 +53,11 @@
<template>
<div v-for="(item, index) in queue" :key="index">
<span style="display:inline-block; width:30px;"> {{item.seqNum}} </span>
- <span style="display:inline-block; width:40px;"> {{checkTypeStore.getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}} </span>
+ <span style="display:inline-block; width:40px;"> {{getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}} </span>
<span style="display:inline-block; width:70px;"> {{item.patName}}{{item.passed === 0 ? "":"*"}} </span>
<dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="item.patGender" />
<!-- {{item.roomName}} {{item.bedNo}}-->
- {{checkTypeStore.getCheckTypeName(item.bookCheckType)}}
+ {{getCheckTypeName(item.bookCheckType)}}
<dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="item.status" />
<el-button v-if="item.status === 5 || item.status === 7" @click="recall(item)"> 鍙洖 </el-button>
</div>
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index 32601e8..cc3fcfc 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -33,7 +33,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="妫�鏌ラ」鐩�" prop="">
- {{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
+ {{formData.checkType && getCheckTypeName(formData.checkType)}}
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
diff --git a/src/views/ecg/doctor/components/TitlePanel.vue b/src/views/ecg/doctor/components/TitlePanel.vue
index ace710a..b8c6801 100644
--- a/src/views/ecg/doctor/components/TitlePanel.vue
+++ b/src/views/ecg/doctor/components/TitlePanel.vue
@@ -34,7 +34,7 @@
{{room.roomName || ''}} {{room.bedNo || ''}} {{room.opType === 1?"棰嗙敤":""}} {{room.opType === 2?"瀹夎":""}}
<div>
<span v-for="(checkType, subIndex) in room.checkTypes" :key="subIndex">
- {{checkTypeStore.getCheckTypeName(checkType)}}
+ {{getCheckTypeName(checkType)}}
</span>
</div>
</div>
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index d0c5855..4bf7d8e 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -191,7 +191,7 @@
</el-table-column>
<el-table-column label="妫�鏌ョ被鍨�" align="center" prop="bookCheckType" min-width="100px">
<template #default="scope">
- {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
+ {{getCheckTypeName(scope.row.bookCheckType)}}
</template>
</el-table-column>
<el-table-column label="鎮ｈ�呰鎯�" align="center" prop="patDetails" min-width="300px">
diff --git a/src/views/ecg/room/RoomSetting.vue b/src/views/ecg/room/RoomSetting.vue
index b736add..0772027 100644
--- a/src/views/ecg/room/RoomSetting.vue
+++ b/src/views/ecg/room/RoomSetting.vue
@@ -18,7 +18,7 @@
<div>寮�璇婃椂闂达細{{ openingPeriod }} {{ monitorInfo.openingFlag }} </div>
<div>宸ヤ綅姒傚喌锛� {{monitorInfo.openingBedNum}} {{monitorInfo.docBedNum}} {{monitorInfo.routingBedNum}} </div>
<div v-for="(value, key) in monitorInfo.checkTypeBedInfo" :key="key">
- {{ checkTypeStore.getCheckTypeName(Number(key)) }} {{ value }}
+ {{ getCheckTypeName(Number(key)) }} {{ value }}
</div>
<div>宸ヤ綅姒傚喌锛氬紑鏀剧殑宸ヤ綅 鏈夊尰鐢熷伐浣� 鍙備笌鍒嗘祦宸ヤ綅</div>
<div>妫�鏌ョ被鍨� 寮�鏀剧殑宸ヤ綅 (妫�鏌�/棰嗙敤 | 瀹夎) 鏈夊尰鐢熷伐浣� (妫�鏌�/棰嗙敤 | 瀹夎)</div>
diff --git a/src/views/ecg/room/index.vue b/src/views/ecg/room/index.vue
index b7c4590..4306451 100644
--- a/src/views/ecg/room/index.vue
+++ b/src/views/ecg/room/index.vue
@@ -71,7 +71,7 @@
<el-table-column label="妫�鏌ョ被鍨�" align="center" prop="checkTypes" width="180px">
<template #default="scope">
<div v-for="(checkType, subIndex) in scope.row.checkTypes" :key="subIndex">
- {{checkTypeStore.getCheckTypeName(checkType)}}
+ {{getCheckTypeName(checkType)}}
</div>
</template>
</el-table-column>
--
Gitblit v1.9.3