From 3339fa19a6b295e827f4fc41694701490cbd3e66 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 10 四月 2025 11:20:08 +0800
Subject: [PATCH] 拆机：  允许  已领用的拆机

---
 src/views/ecg/doctor/DevDismantle.vue |    6 ++++--
 src/api/ecg/devrent/index.ts          |    6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 37002a2..3980e1d 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -64,9 +64,9 @@
     return await request.get({ url: `/ecg/dev-rent/get-ready-rent`, params })
   },
 
-  // 鑾峰彇宸插畨瑁呯殑绉熻祦
-  getInstalledRent: async (params: any) => {
-    return await request.get({ url: `/ecg/dev-rent/get-installed-rent`, params })
+  // 鑾峰彇宸插畨瑁匼宸查鐢ㄧ殑绉熻祦
+  getExistingRent: async (params: any) => {
+    return await request.get({ url: `/ecg/dev-rent/get-existing-rent`, params })
   },
 
   // 鑾峰彇宸叉媶鍗哥璧�
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 9263826..89c1aea 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -33,7 +33,7 @@
             <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getRentInfoByDevId" />
           </el-form-item>
           <el-form-item label="璁惧鎻忚堪" prop="">
-            {{formData.brand + "&nbsp;&nbsp;" + formData.model}}
+            {{formData.brand + "&nbsp;&nbsp;" + formData.model + " " + tranlateDevState(formData.devState)}}
           </el-form-item>
           <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
             <el-date-picker
@@ -151,6 +151,7 @@
 import {isStringEmpty} from "@/utils/stringUtil";
 import {calculateHours, curDayEnd, curDayStart} from "@/utils/dateUtil";
 import {AppointmentApi} from "@/api/ecg/appointment";
+import {tranlateDevState} from "../../../utils/statusFormatter";
 
 /** 瑁呮満鎷嗘満 琛ㄥ崟 */
 defineOptions({ name: 'DevrDismantle' })
@@ -285,6 +286,7 @@
     category: '',
     brand: '',
     model: '',
+    devState: undefined,
   }
   formRef.value?.resetFields()
 }
@@ -310,7 +312,7 @@
 }
 
 const getRentInfo = async () => {
-  const data = await DevRentApi.getInstalledRent(formData.value)
+  const data = await DevRentApi.getExistingRent(formData.value)
   if (null === data)
     return
 

--
Gitblit v1.9.3