From 90de3fa97572d645e9da576f751257c913736e82 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 11:10:10 +0800
Subject: [PATCH] bug fix
---
src/views/ecg/doctor/components/RoutinePanel.vue | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index a25b38d..26d038d 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -10,7 +10,7 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
- <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getAppointmentInfoByPatId" />
+ <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
</el-form-item>
<el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
<el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
@@ -36,7 +36,7 @@
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading">妫�鏌ュ畬鎴�</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
- <el-button @click="cancelInstall" :disabled="formLoading">鏀惧純瑁呮満</el-button>
+ <el-button @click="cancelInstall" :disabled="formLoading">鏀惧純妫�鏌�</el-button>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
<ContentWrap>
@@ -44,14 +44,14 @@
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="瑁呮満鎯呭喌" align="center" prop="lost" >
<template #default="scope">
- <span v-if="scope.row.jobType === 10">"宸茶鏈�"</span>
- <span v-if="scope.row.jobType === 35">"宸叉斁寮�"</span>
+ <span v-if="scope.row.jobType === 60">宸叉鏌�</span>
+ <span v-if="scope.row.jobType === 50">宸叉斁寮�</span>
</template>
</el-table-column>
<!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
<!-- <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />-->
<el-table-column label="鍖荤敓鍚嶇О" align="center" prop="docName" />
- <el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
+<!-- <el-table-column label="璁惧缂栧彿" align="center" prop="devId" />-->
<el-table-column label="鎮ｈ�呯紪鍙�" align="center" prop="patId" />
<el-table-column label="鎮ｈ�呭悕绉�" align="center" prop="patName" />
<el-table-column
@@ -61,7 +61,7 @@
:formatter="dateFormatter"
width="180px"
/>
- <el-table-column label="浣滀笟姒傝" align="center" prop="summary" />
+<!-- <el-table-column label="浣滀笟姒傝" align="center" prop="summary" />-->
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column
label="鍒涘缓鏃堕棿"
@@ -127,7 +127,7 @@
const setPatient = (queueVO: QueueVO | undefined) => {
formData.value.patId = queueVO?.patId
- getAppointmentInfoByPatId()
+ getRentInfoByPatId()
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -193,26 +193,23 @@
formRef.value?.resetFields()
}
-const getAppointmentInfoByPatId = () => {
+const getRentInfoByPatId = () => {
const tempPatId = formData.value.patId;
resetForm()
if (isStringEmpty(tempPatId))
return
formData.value.patId = tempPatId;
- getAppointmentInfo()
+ getFreeRentInfo()
}
-const getAppointmentInfo = async () => {
- const appointmentData = await AppointmentApi.getAppointmentByPatId(formData.value.patId)
- if (null === appointmentData)
+const getFreeRentInfo = async () => {
+ const data = await DevRentApi.getFreeRent(formData.value)
+ if (null === data)
return
// formDate 瀵瑰簲 DevRent
- formData.value.patName = appointmentData.patName
- formData.value.patDeptDesc = appointmentData.patDeptDesc
- formData.value.patWardDesc = appointmentData.patWardDesc
- formData.value.patBedNo = appointmentData.patBedNo
+ formData.value = data
}
@@ -259,11 +256,11 @@
formData.value.bedNo = props.room.bedNo
const data = formData.value as unknown as DevRentVO
if (formData.value.id === null || formData.value.id === undefined) {
- const result = await DevRentApi.devInstallCancel(data)
+ const result = await DevRentApi.routineCheckCancel(data)
formData.value.id = result
message.success(t('鎿嶄綔鎴愬姛'))
} else {
- await DevRentApi.devInstallCancel(data)
+ await DevRentApi.routineCheckCancel(data)
message.success(t('鎿嶄綔鎴愬姛'))
}
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
--
Gitblit v1.9.3