From 7dd1cf55eda4666b75f559b526837d0b4a6f2522 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 十月 2024 15:14:57 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/DevDismantle.vue | 2
src/views/ecg/doctor/DevInstall.vue | 8 ++--
src/api/ecg/devrent/index.ts | 11 ++++-
src/views/ecg/devrent/DevRentForm.vue | 2
src/views/ecg/devrent/index.vue | 12 +++--
src/views/ecg/doctor/DevDataEntry.vue | 22 ++++++++---
src/views/ecg/doctor/components/DevReadyPanel.vue | 10 +++--
7 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 892826d..48d2ccb 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -10,7 +10,7 @@
returnTime: Date // 鎷嗘満鏃堕棿
interference: number // 骞叉壈鏁�
baseline: string // 鍩虹嚎绮�
- detachment: string // 鑴辩
+ detachment: string // 鑴辫惤
remark: string // 澶囨敞
}
@@ -82,8 +82,13 @@
},
// 鏀惧純瑁呮満
- devCancel: async (data: DevRentVO) => {
- return await request.post({ url: `/ecg/dev-rent/dev-cancel`, data })
+ devReadyCancel: async (data: DevRentVO) => {
+ return await request.post({ url: `/ecg/dev-rent/dev-ready-cancel`, data })
+ },
+
+ // 鏀惧純瑁呮満
+ devInstallCancel: async (data: DevRentVO) => {
+ return await request.post({ url: `/ecg/dev-rent/dev-install-cancel`, data })
},
// 閬楀け
diff --git a/src/views/ecg/devrent/DevRentForm.vue b/src/views/ecg/devrent/DevRentForm.vue
index 6c8fde2..8fc9838 100644
--- a/src/views/ecg/devrent/DevRentForm.vue
+++ b/src/views/ecg/devrent/DevRentForm.vue
@@ -38,7 +38,7 @@
<el-form-item label="鍩虹嚎绮�" prop="baseline">
<el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" />
</el-form-item>
- <el-form-item label="鑴辩" prop="detachment">
+ <el-form-item label="鑴辫惤" prop="detachment">
<el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
diff --git a/src/views/ecg/devrent/index.vue b/src/views/ecg/devrent/index.vue
index b5f6ee4..d6005c5 100644
--- a/src/views/ecg/devrent/index.vue
+++ b/src/views/ecg/devrent/index.vue
@@ -57,6 +57,7 @@
class="!w-220px"
/>
</el-form-item>
+<!--
<el-form-item label="骞叉壈鏁�" prop="interference">
<el-input
v-model="queryParams.interference"
@@ -73,13 +74,14 @@
:inactive-value="0"
/>
</el-form-item>
- <el-form-item label="鑴辩" prop="detachment">
+ <el-form-item label="鑴辫惤" prop="detachment">
<el-switch
v-model="queryParams.detachment"
:active-value="1"
:inactive-value="0"
/>
</el-form-item>
+-->
<el-form-item label="澶囨敞" prop="remark">
<el-input
v-model="queryParams.remark"
@@ -147,7 +149,7 @@
/>
<el-table-column label="骞叉壈鏁�" align="center" prop="interference" />
<el-table-column label="鍩虹嚎绮�" align="center" prop="baseline" />
- <el-table-column label="鑴辩" align="center" prop="detachment" />
+ <el-table-column label="鑴辫惤" align="center" prop="detachment" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column
label="鍒涘缓鏃堕棿"
@@ -213,9 +215,9 @@
patName: undefined,
rentTime: [],
returnTime: [],
- interference: undefined,
- baseline: undefined,
- detachment: undefined,
+ // interference: undefined,
+ // baseline: undefined,
+ // detachment: undefined,
remark: undefined,
createTime: []
})
diff --git a/src/views/ecg/doctor/DevDataEntry.vue b/src/views/ecg/doctor/DevDataEntry.vue
index 9f75750..00f1f04 100644
--- a/src/views/ecg/doctor/DevDataEntry.vue
+++ b/src/views/ecg/doctor/DevDataEntry.vue
@@ -28,9 +28,6 @@
<el-form-item label="骞叉壈鏁�" prop="interference">
<el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
</el-form-item>
- <el-form-item label="鑴辩" prop="detachment">
- <el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" />
- </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="璁惧缂栧彿" prop="devId">
@@ -60,13 +57,26 @@
/>
</el-form-item>
<el-form-item label="鍩虹嚎绮�" prop="baseline">
- <el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" />
+ <el-switch
+ v-model="formData.baseline"
+ :active-value="1"
+ :inactive-value="0"
+ />
</el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
+ <el-form-item label="鑴辫惤" prop="detachment">
+ <el-switch
+ v-model="formData.detachment"
+ :active-value="1"
+ :inactive-value="0"
+ />
</el-form-item>
</el-col>
</el-row>
+ <el-row :gutter="20">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-row>
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading">褰曞叆瀹屾垚</el-button>
<el-button @click="resetForm()">閲� 缃�</el-button>
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 22331cc..d479724 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -54,7 +54,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鑴辩" prop="detachment">
+ <el-form-item label="鑴辫惤" prop="detachment">
<el-switch
v-model="formData.detachment"
:active-value="1"
diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 84c89f9..bfa5146 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -52,7 +52,7 @@
<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 === 30">"宸叉斁寮�"</span>
+ <span v-if="scope.row.jobType === 35">"宸叉斁寮�"</span>
</template>
</el-table-column>
<!-- <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
@@ -237,7 +237,7 @@
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
- jobType: [10, 30],
+ jobType: [10, 35],
docId: undefined,
docName: undefined,
devId: undefined,
@@ -272,11 +272,11 @@
const cancelInstall = async () => {
const data = formData.value as unknown as DevRentVO
if (formData.value.id === null || formData.value.id === undefined) {
- const result = await DevRentApi.devCancel(data)
+ const result = await DevRentApi.devInstallCancel(data)
formData.value.id = result
message.success(t('鎿嶄綔鎴愬姛'))
} else {
- await DevRentApi.devCancel(data)
+ await DevRentApi.devInstallCancel(data)
message.success(t('鎿嶄綔鎴愬姛'))
}
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index dad4f57..0b2f7c7 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -14,7 +14,7 @@
<el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
</el-form-item>
<el-form-item label="璁惧鎻忚堪" prop="">
- {{deviceInfo.brand + " " + deviceInfo.model}}
+ {{deviceInfo.brand + " " + deviceInfo.model + " " + deviceInfo.state}}
</el-form-item>
<el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
<el-date-picker
@@ -172,7 +172,7 @@
brand: '',
model: '',
purchaseDate: 0,
- lost: 0,
+ state: 0,
})
/** 鎻愪氦琛ㄥ崟 */
@@ -204,11 +204,11 @@
const cancelInstall = async () => {
const data = formData.value as unknown as DevRentVO
if (formData.value.id === null || formData.value.id === undefined) {
- const result = await DevRentApi.devCancel(data)
+ const result = await DevRentApi.devReadyCancel(data)
formData.value.id = result
message.success(t('鎿嶄綔鎴愬姛'))
} else {
- await DevRentApi.devCancel(data)
+ await DevRentApi.devReadyCancel(data)
message.success(t('鎿嶄綔鎴愬姛'))
}
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -236,6 +236,7 @@
deviceInfo.value.category = ''
deviceInfo.value.brand = ''
deviceInfo.value.model = ''
+ deviceInfo.value.state = 0
}
const setPatient = (queueVO: QueueVO | undefined) => {
@@ -296,6 +297,7 @@
deviceInfo.value.category = ''
deviceInfo.value.brand = ''
deviceInfo.value.model = ''
+ deviceInfo.value.state = 0
if (isStringEmpty(formData.value.devId))
return
--
Gitblit v1.9.3