From 9ff11fe426029c572cd4eace3b0e367b2bca8a4c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 11 九月 2024 10:21:11 +0800
Subject: [PATCH] 拆机功能

---
 src/views/ecg/doctor/DevDismantle.vue               |   52 +++++++++++++++++++++++-----------------------------
 src/api/ecg/devrent/index.ts                        |    4 ++--
 src/views/ecg/doctor/components/DevInstallPanel.vue |    1 +
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/api/ecg/devrent/index.ts b/src/api/ecg/devrent/index.ts
index 2fb7c4c..881ac04 100644
--- a/src/api/ecg/devrent/index.ts
+++ b/src/api/ecg/devrent/index.ts
@@ -47,7 +47,7 @@
   },
 
   // 鑾峰彇鎮ｈ�呰澶囨渶杩戠殑绉熻祦
-  getLatestRent: async (patId: string, devId: string) => {
-    return await request.download({ url: `/ecg/dev-rent/get-latest-rent?pat-id=` + patId + '&dev-id=' + devId })
+  getLatestRent: async (devId: string) => {
+    return await request.get({ url: `/ecg/dev-rent/get-latest-rent?&dev-id=` + devId })
   }
 }
\ No newline at end of file
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 7135947..9d1899f 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -1,5 +1,4 @@
 <template>
-  褰撳墠鎮ｈ��: {{patient.patId}} {{isStringEmpty(patient.patName)?'鏃�':patient.patName}}
     <el-form
       ref="formRef"
       :model="formData"
@@ -9,6 +8,12 @@
     >
       <el-form-item label="璁惧缂栧彿" prop="devId">
         <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="searchRentInfo"/>
+      </el-form-item>
+      <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
+        <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" />
+      </el-form-item>
+      <el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
+        <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
       </el-form-item>
       <el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
         <el-date-picker
@@ -62,18 +67,13 @@
 const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
 const formType = ref('create') // 琛ㄥ崟鐨勭被鍨嬶細create - 鏂板锛泆pdate - 淇敼
 
-const patient = ref<QueueVO>({
-  patId: '',
-  patName: ''
-})
-
 const formData = ref({
   id: undefined,
   devId: undefined,
-  patId: patient.value.patId,
-  patName: patient.value.patName,
+  patId: undefined,
+  patName: undefined,
   rentTime: undefined,
-  returnTime: undefined,
+  returnTime: new Date().getTime(),
   interference: undefined,
   baseline: undefined,
   detachment: undefined,
@@ -81,8 +81,7 @@
 })
 const formRules = reactive({
   devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
-  patId: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }],
-  patName: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }]
+  returnTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
 })
 const formRef = ref() // 琛ㄥ崟 Ref
 
@@ -94,20 +93,12 @@
   formLoading.value = true
   try {
     const data = formData.value as unknown as DevRentVO
-    data.id = null
-    data.patId = patient.value.patId
-    data.patName = patient.value.patName
-    if (formType.value === 'create') {
-      const result = await DevRentApi.createDevRent(data)
-      formData.value.id = result.data
-      message.success(t('common.createSuccess'))
-    } else {
-      await DevRentApi.updateDevRent(data)
-      message.success(t('common.updateSuccess'))
-    }
+    await DevRentApi.updateDevRent(data)
+    message.success(t('鎿嶄綔鎴愬姛'))
     dialogVisible.value = false
     // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
     emit('success')
+    resetForm()
   } finally {
     formLoading.value = false
   }
@@ -118,10 +109,10 @@
   formData.value = {
     id: undefined,
     devId: undefined,
-    patId: patient.value.patId,
-    patName: patient.value.patName,
+    patId: undefined,
+    patName: undefined,
     rentTime: undefined,
-    returnTime: undefined,
+    returnTime: new Date().getTime(),
     interference: undefined,
     baseline: undefined,
     detachment: undefined,
@@ -131,10 +122,13 @@
 }
 
 const searchRentInfo = async () => {
-  const result = await DevRentApi.getLatestRent(formData.value.patId, formData.value.devId!)
-  console.info( result )
-  if (null != result.data) {
-    formData.value = result.data
+  const data = await DevRentApi.getLatestRent(formData.value.devId)
+  console.info( data )
+  if (data.returnTime === null)
+    data.returnTime = new Date().getTime()
+
+  if (null != data) {
+    formData.value = data
   }
 }
 
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index f454f33..a2c0e22 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -81,6 +81,7 @@
 })
 const formRules = reactive({
   devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
+  rentTime: [{ required: true, message: '璇烽�夋嫨瑁呮満鏃ユ湡', trigger: 'blur' }],
   patId: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }],
   patName: [{ required: true, message: '鐩墠娌℃湁鎮ｈ��', trigger: 'blur' }]
 })

--
Gitblit v1.9.3