From f1d92d5c904f7d33a34abb651185b1d5034bdf02 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 十月 2024 11:50:00 +0800
Subject: [PATCH] update

---
 src/views/ecg/doctor/components/DevReadyPanel.vue |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 3cfa0d1..e3329bb 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -1,5 +1,6 @@
 <template>
-  褰撳墠鎮ｈ��: {{patient?.patId}} {{isStringEmpty(patient?.patName)?'鏃�':patient.patName}}
+    褰撳墠鎮ｈ��: {{patient?.patId}} {{isStringEmpty(patient?.patName)?'鏃�':patient.patName}}
+    <Qrcode :text="patient?.patId" logo="/logo.gif" width=100 />
     <el-form
       ref="formRef"
       :model="formData"
@@ -7,11 +8,14 @@
       label-width="100px"
       v-loading="formLoading"
     >
+      <el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
+        绉戝: {{formData.patDeptDesc}} 鐥呭尯: {{formData.patWardDesc}} 搴婁綅: {{formData.patBedNo}}
+      </el-form-item>
       <el-form-item label="璁惧缂栧彿" prop="devId">
         <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
       </el-form-item>
       <el-form-item label="璁惧鎻忚堪" prop="">
-        {{deviceInfo.brand + "&nbsp;&nbsp;" + deviceInfo.model}}
+        {{deviceInfo.brand + "&nbsp;&nbsp;" + deviceInfo.model + " " + deviceInfo.state}}
       </el-form-item>
       <el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
         <el-date-picker
@@ -24,6 +28,12 @@
       <el-form-item label="澶囨敞" prop="remark">
         <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
       </el-form-item>
+      <el-form-item label="缂磋垂纭" prop="paid">
+        <el-radio-group v-model="formData.paid">
+          <el-radio key="1" :label="1"> 宸茬即璐� </el-radio>
+          <el-radio key="0" :label="0"> 鏈即璐� </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
     <el-button @click="resetForm()">閲� 缃�</el-button>
@@ -34,6 +44,11 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="onRowClick" >
       <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="缂磋垂" align="center" prop="paid">
+        <template #default="scope">
+          {{scope.row.paid == 1 ? "宸茬即" : ""}}
+        </template>
+      </el-table-column>
       <el-table-column label="棰嗙敤鎯呭喌" align="center" prop="cancelled" >
         <template #default="scope">
           <span v-if="scope.row.jobType === 5">"宸查鐢�"</span>
@@ -130,12 +145,18 @@
   devId: undefined,
   patId: patient.value?.patId,
   patName: patient.value?.patName,
+  patDeptCode: undefined,
+  patDeptDesc: undefined,
+  patWardCode: undefined,
+  patWardDesc: undefined,
+  patBedNo: undefined,
   rentTime: new Date().getTime(),
   returnTime: undefined,
   interference: undefined,
   baseline: undefined,
   detachment: undefined,
-  remark: undefined
+  remark: undefined,
+  paid: undefined
 })
 const formRules = reactive({
   devId: [{ required: true, message: '璁惧缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
@@ -152,7 +173,7 @@
   brand: '',
   model: '',
   purchaseDate: 0,
-  lost: 0,
+  state: 0,
 })
 
 /** 鎻愪氦琛ㄥ崟 */
@@ -184,11 +205,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('鎿嶄綔鎴愬姛'))
   }
   // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -216,6 +237,7 @@
   deviceInfo.value.category = ''
   deviceInfo.value.brand = ''
   deviceInfo.value.model = ''
+  deviceInfo.value.state = 0
 }
 
 const setPatient = (queueVO: QueueVO | undefined) => {
@@ -276,6 +298,7 @@
   deviceInfo.value.category = ''
   deviceInfo.value.brand = ''
   deviceInfo.value.model = ''
+  deviceInfo.value.state = 0
   if (isStringEmpty(formData.value.devId))
     return
 

--
Gitblit v1.9.3