From 768e6dc2390863e2ebd0b57a0a1aaa9cf2796eaa Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 16:46:21 +0800
Subject: [PATCH] 常规检查 放弃功能
---
src/views/ecg/doctor/components/RoutinePanel.vue | 14 +++++++-------
src/views/ecg/doctor/Routine.vue | 2 +-
src/api/ecg/devrent/index.ts | 7 ++++++-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 5b2d711..be6b874 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -90,7 +90,12 @@
return await request.post({ url: `/ecg/dev-rent/dev-data-entry`, data })
},
- // 鏀惧純瑁呮満
+ // 鏀惧純..甯歌妫�鏌�
+ routineCheckCancel: async (data: DevRentVO) => {
+ return await request.post({ url: `/ecg/dev-rent/routine-check-cancel`, data })
+ },
+
+ // 鏀惧純棰嗙敤
devReadyCancel: async (data: DevRentVO) => {
return await request.post({ url: `/ecg/dev-rent/dev-ready-cancel`, data })
},
diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index e674ad2..c3a23bd 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -66,7 +66,7 @@
const getOnstagePatient = () => {
const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30)
if (undefined === tempPatient) {
- setOnStagePatient(undefined)
+ // setOnStagePatient(undefined)
} else if (tempPatient.patId !== onStagePatient.value.patId) {
onStagePatient.value= tempPatient
setOnStagePatient(tempPatient)
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index a25b38d..46cd7dc 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -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="鍒涘缓鏃堕棿"
@@ -259,11 +259,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