From 49206ee0689d44367b9f5de3decf0c3ec02bfb51 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 10:56:18 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/components/RoutinePanel.vue | 75 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 22 deletions(-)
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index 5c93abe..2b76667 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -18,9 +18,9 @@
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
</el-form-item>
- <el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
- <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
- 绉戝: {{formData.patDeptDesc}} 鐥呭尯: {{formData.patWardDesc}} 搴婁綅: {{formData.patBedNo}}
+ <el-form-item label="鎮ｈ�呮弿杩�" prop="patDetails">
+ <dict-tag v-if="formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patDetails?.source" />
+ {{formData?.patDetails?.deptDesc}} {{formData?.patDetails?.wardDesc}} {{formData?.patDetails?.bedNo}}
</el-form-item>
<el-form-item label="妫�鏌ユ椂闂�" prop="rentTime">
<el-date-picker
@@ -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="璇疯緭鍏ュ娉�" />
@@ -44,8 +44,8 @@
<el-button @click="submitForm" type="primary" :disabled="formLoading">妫�鏌ュ畬鎴�</el-button>
<el-button @click="cancelInstall" :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>
@@ -79,6 +79,7 @@
:formatter="dateFormatter"
width="180px"
/>
+<!--
<el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template #default="scope">
<el-button
@@ -99,6 +100,7 @@
</el-button>
</template>
</el-table-column>
+-->
</el-table>
<!-- 鍒嗛〉 -->
<Pagination
@@ -122,6 +124,7 @@
import {Barcode} from "@/components/Barcode";
import {useCheckTypeStore} from "@/store/modules/checkType";
import {DICT_TYPE} from "@/utils/dict";
+import {getCheckTypeName, needAutoFeeConfirm} from "../../../../utils/checkTypeFormatter";
/** 璁惧瑁呮満 琛ㄥ崟 */
defineComponent({ name: 'RoutinePanel' })
@@ -144,7 +147,6 @@
formData.value.patId = queueVO?.patId
formData.value.patName = queueVO?.patName
formData.value.checkType = queueVO?.bookCheckType
- formData.value.patSrc = queueVO?.patDetails.source
getFreeRentInfo(formData.value)
copyBarcode()
}
@@ -157,7 +159,18 @@
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
-const formData = ref({})
+const formData = ref<Partial<DevRentVO>>({
+ id: undefined,
+ devId: undefined,
+ patId: undefined,
+ patName: undefined,
+ patDetails: undefined,
+ checkType: undefined,
+ rentTime: new Date().getTime(),
+ returnTime: undefined,
+ remark: undefined,
+ paid: undefined,
+})
const formRules = reactive({
// devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
@@ -178,6 +191,12 @@
formData.value.bedNo = props.room.bedNo
const data = formData.value as unknown as DevRentVO
await DevRentApi.routineFinish(data)
+
+ // 鑷姩纭垂
+ if (needAutoFeeConfirm(formData.value.checkType)) {
+ feeConfirm()
+ }
+
message.success(t('鎿嶄綔鎴愬姛'))
dialogVisible.value = false
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -196,20 +215,17 @@
devId: undefined,
patId: undefined,
patName: undefined,
- patDeptCode: undefined,
- patDeptDesc: undefined,
- patWardCode: undefined,
- patWardDesc: undefined,
- patBedNo: undefined,
+ checkType: undefined,
rentTime: new Date().getTime(),
returnTime: undefined,
interference: undefined,
baseline: undefined,
detachment: undefined,
remark: undefined,
- category: '',
- brand: '',
- model: '',
+ patDetails: undefined,
+ paid: undefined,
+ roomId: props.room.roomId,
+ bedNo: props.room.bedNo
}
formRef.value?.resetFields()
}
@@ -232,7 +248,7 @@
// formDate 瀵瑰簲 DevRent
// formData.value = data //涓嶈兘鏁翠釜璧嬪�硷紝 榛樿棰嗙敤鏃堕棿琚竻绌�
- formData.value.id = data.id;
+ formData.value.id = data.id; //rent id
formData.value.applyNo = data.applyNo;
formData.value.episodeId = data.episodeId;
formData.value.patDetails = data.patDetails
@@ -292,35 +308,50 @@
}
const feeConfirm = async () => {
+ if (formData.value.id == null) {
+ message.error(t('璇峰厛妫�鏌�'))
+ return
+ }
+
const result = await DevRentApi.feeConfirm(formData.value.id)
if (0 == result)
message.success(t('鎿嶄綔鎴愬姛'))
}
const feeCancel = async () => {
+ if (formData.value.id == null) {
+ message.error(t('璇峰厛妫�鏌�'))
+ return
+ }
+
const result = await DevRentApi.feeCancel(formData.value.id)
if (0 == result)
message.success(t('鎿嶄綔鎴愬姛'))
}
const getDisplayBarcode = (): string => {
- if (!formData.value.checkType)
+ if (formData.value.checkType == null)
return ""
const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
- if (!displayBarcode.includes( formData.value.patSrc ))
+ if (formData.value.patDetails == null || formData.value.patDetails.source == null ||
+ !displayBarcode.includes( formData.value.patDetails.source ))
return ""
return getBarcode()
}
const getBarcode = (): string => {
- if (!formData.value.checkType)
+ if (formData.value.checkType == null)
return ""
- if (1 === formData.value.patSrc || 2 === formData.value.patSrc)
+ const patSource = formData.value.patDetails?.source
+ if (patSource == null)
+ return ""
+
+ if (1 === patSource || 2 === patSource)
return formData.value.applyNo??""
- else if (3 === formData.value.patSrc || 4 === formData.value.patSrc)
+ else if (3 === patSource || 4 === patSource)
return formData.value.episodeId??""
return ""
--
Gitblit v1.9.3