From e41cb44dc302b51534036b3cf114dd2d5bc4f809 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 29 九月 2026 14:32:49 +0800
Subject: [PATCH] 修改了数据采集

---
 src/views/ecg/doctor/components/DevReadyPanel.vue |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 1b6991b..a568504 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="鎮h�呯紪鍙�" prop="patId">
+      </el-col>
+      <el-col :span="12">
+      <el-form-item label="鎮h�呯紪鍙�" 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="鎮h�呭悕绉�" prop="patName">
         <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
       </el-form-item>
-
+     </el-col>
+      <el-col :span="12">
+  
       <el-form-item label="鎮h�呮弿杩�" 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,17 +55,14 @@
           placeholder="閫夋嫨棰嗙敤鏃堕棿"
         />
       </el-form-item>
-       <el-form-item label="鏄惁澶氳��" prop="tolerance">
-          <el-radio-group v-model="formData.tolerance" readonly>
-            <el-radio
-              v-for="dict in getIntDictOptions(DICT_TYPE.ecg_tolerance)"
-              :key="dict.value"
-              :value="dict.value"
-            >
-              {{ dict.label }}
-            </el-radio>
-          </el-radio-group>
+           </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>
@@ -62,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" />
@@ -295,6 +308,7 @@
     checkType: undefined,
     rentTime: new Date().getTime(),
     returnTime: undefined,
+    tolerance: undefined,
     remark: undefined,
     patDetails: undefined,
     paid: undefined,
@@ -316,6 +330,7 @@
   formData.value.patId = queueVO?.patId
   formData.value.patName = queueVO?.patName
   formData.value.checkType = queueVO?.bookCheckType
+  formData.value.tolerance = queueVO?.tolerance // 澶氳�愯嵂锛屽悗绔粠棰勭害鍗曡ˉ榻�
   getFreeRentInfo(formData.value)  // 寰呮鏌ョ殑淇℃伅  @ dev_rent 琛�
   copyBarcode()
 }

--
Gitblit v1.9.3