From 1fa81f8c3c68b14e08554637eda80679f90b46ee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 23 七月 2026 14:40:43 +0800
Subject: [PATCH] 新增停止

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

diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 0a54875..c0930da 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -9,29 +9,44 @@
       :rules="formRules"
       label-width="100px"
       v-loading="formLoading"
+   
     >
+     <el-row>
+    <el-col :span="12">
       <el-form-item label="妫�鏌ラ」鐩�" prop="">
         {{getCheckTypeName(formData.checkType)}}
       </el-form-item>
-      <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
+      </el-col>
+      <el-col :span="12">
+      <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId" >
         <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
         <Barcode v-if="displayBarCode" :value="displayBarCode" :width=100 />
         <el-button @click="copyBarcode()">澶嶅埗</el-button>
       </el-form-item>
+      </el-col>
+      <el-col :span="12">
       <el-form-item label="鎮ｈ�呭悕绉�" prop="patName">
         <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
       </el-form-item>
-
+     </el-col>
+      <el-col :span="12">
+  
       <el-form-item label="鎮ｈ�呮弿杩�" prop="patDeptDesc">
         <dict-tag v-if="formData.patDetails?.source" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patDetails?.source" />
         {{formData?.patDetails?.deptDesc}} {{formData?.patDetails?.wardDesc}} {{formData?.patDetails?.bedNo}}
       </el-form-item>
+           </el-col>
+      <el-col :span="12">
       <el-form-item label="璁惧缂栧彿" prop="devId">
         <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getDevInfo"/>
       </el-form-item>
+           </el-col>
+      <el-col :span="12">
       <el-form-item label="璁惧鎻忚堪" prop="">
         {{ devInfo?.brand||'-' }} {{ devInfo?.model||'-' }} {{ tranlateDevState(devInfo?.state) }}
       </el-form-item>
+           </el-col>
+      <el-col :span="12">
       <el-form-item label="棰嗙敤鏃堕棿" prop="rentTime">
         <el-date-picker
           v-model="formData.rentTime"
@@ -40,6 +55,14 @@
           placeholder="閫夋嫨棰嗙敤鏃堕棿"
         />
       </el-form-item>
+           </el-col>
+      <el-col :span="12">
+       <el-form-item label="鏄惁澶氳��" prop="tolerance">
+         <el-tag type="info" v-if="formData.tolerance == 0">鍚�</el-tag>
+        <el-tag type="danger" v-else>鏄�</el-tag>
+        </el-form-item>
+             </el-col>
+      </el-row>
       <el-form-item label="澶囨敞" prop="remark">
         <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
       </el-form-item>
@@ -51,6 +74,7 @@
         </el-radio-group>
       </el-form-item>
 -->
+        
     </el-form>
     <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
     <el-checkbox style="margin-left:10px" label="鑷姩&nbsp;" v-model="autoPrint" />
@@ -147,7 +171,7 @@
 import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
 import {useCheckTypeStore} from '@/store/modules/checkType'
 import {calGender, getBookBeginTime} from "@/utils";
-import {DICT_TYPE} from "@/utils/dict";
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import {tranlateDevState} from "@/utils/statusFormatter";
 import {getCheckTypeName, needAutoFeeConfirm} from "../../../../utils/checkTypeFormatter";
 
@@ -466,9 +490,14 @@
     return
   }
 
-  const result = await DevRentApi.feeCancel(formData.value.id)
-  if (0 === result)
-    message.success('鎿嶄綔鎴愬姛')
+  try {
+    const result = await DevRentApi.feeCancel(formData.value.id)
+    if (0 === result) {
+      //message.success('纭垂鍙栨秷鎴愬姛')
+    }
+  } catch (err) {
+    // 妗嗘灦 浼氱粰鍑� 鍚庡彴鐨� 閿欒淇℃伅
+  }
 }
 
 /**

--
Gitblit v1.9.3