From 09dc74e264b6262cbe41c9c8476e24705871d4a6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:31:17 +0800
Subject: [PATCH] yxh

---
 src/views/ecg/doctor/DevDataEntry.vue |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/views/ecg/doctor/DevDataEntry.vue b/src/views/ecg/doctor/DevDataEntry.vue
index ac809e3..a5b029b 100644
--- a/src/views/ecg/doctor/DevDataEntry.vue
+++ b/src/views/ecg/doctor/DevDataEntry.vue
@@ -1,5 +1,6 @@
 <template>
     <el-form
+      class="patient-compact-form"
       ref="formRef"
       :model="formData"
       :rules="formRules"
@@ -7,7 +8,7 @@
       v-loading="formLoading"
     >
       <el-row :gutter="20">
-        <el-col :span="12">
+        <el-col :xs="24" :sm="24" :md="12" :lg="12">
           <el-form-item label="鎮h�呯紪鍙�" prop="patId">
             <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
           </el-form-item>
@@ -31,7 +32,7 @@
             <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :xs="24" :sm="24" :md="12" :lg="12">
           <el-form-item label="璁惧缂栧彿" prop="devId">
             <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getRentInfoByDevId" />
           </el-form-item>
@@ -328,7 +329,16 @@
 }
 
 const getSelectedRent = async (rentId) => {
-  formData.value = await DevRentApi.getDevRent(rentId)
+  // 鈿狅笍 鍘熷疄鐜版槸鏁翠綋鏇挎崲 formData锛屼細鎶婃偅鑰呬俊鎭啿鎴� null锛堣瑙� DevReadyPanel 涓悓绫讳慨澶嶇殑璇存槑锛�
+  const _record = await DevRentApi.getDevRent(rentId)
+  if (_record) {
+    const _merged = { ...formData.value } as Record<string, any>
+    Object.keys(_record as Record<string, any>).forEach((k) => {
+      const v = (_record as Record<string, any>)[k]
+      if (v !== null && v !== undefined && v !== '') _merged[k] = v
+    })
+    formData.value = _merged as typeof formData.value
+  }
 }
 
 /** 鍒濆鍖� **/
@@ -338,3 +348,16 @@
 })
 
 </script>
+
+<style scoped lang="scss">
+/* ==========================================================================
+   闇�姹傦細琛ㄥ崟鍐呭鎸ゅ崰浜嗕笅鏂硅褰曡〃鏍肩殑绌洪棿 鈥斺�� 鍘嬬缉琛岄棿璺濄��
+   Element Plus 榛樿 `.el-form-item { margin-bottom: 18px }`锛�
+   鏈〉琛ㄥ崟鍚� 18 椤规偅鑰呬俊鎭紙4 鍒� = 5 琛岋級+ 9 椤硅澶囦俊鎭紝
+   浠呴棿璺濆氨瑕佷笂鐧� px锛屾妸 el-table 鎸ゅ埌鐪嬩笉瑙併��
+   杩欓噷缁熶竴鍘嬪埌 4px銆傛敞鎰� :deep 鏄繀闇�鐨勶紙el-form-item 鏄湰缁勪欢鐨勫瓙缁勪欢娓叉煋锛夈��
+   ========================================================================== */
+.patient-compact-form :deep(.el-form-item) {
+  margin-bottom: 4px;
+}
+</style>

--
Gitblit v1.9.3