From d553a4be94d4f6ee162cc353a28b220403909cfc Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:58:19 +0800
Subject: [PATCH] ai优化

---
 src/views/ecg/doctor/DevDismantle.vue |  106 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 2570b4d..5272561 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -1,42 +1,41 @@
 <!--鎷嗘満鐣岄潰-->
 <template>
     <el-form
+      class="patient-compact-form"
       ref="formRef"
       :model="formData"
       :rules="formRules"
       label-width="100px"
       v-loading="formLoading"
     >
+      <!-- ===== 缂栬緫鍖猴紙闇�瑕佸綍鍏ョ殑瀛楁锛�===== -->
       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="鎮h�呯紪鍙�" prop="patId">
+        <el-col :span="6">
+        <el-form-item label="鐢宠鍗曞彿" prop="applyNo">
+          <el-input v-model="formData.applyNo" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" />
+        </el-form-item>
+      </el-col>
+       <el-col :span="6">
+        <el-form-item label="妫�鏌ラ」鐩�" prop="">
+          {{ formData?.checkType && getCheckTypeName(formData?.checkType) }}
+        </el-form-item>
+      </el-col>      
+        <el-col :span="6">
+          <el-form-item label="鎮h�呯紪鍙�" prop="">
             <el-input v-model="formData.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" @input="getRentInfoByPatId" />
           </el-form-item>
-          <el-form-item label="鎮h�呭悕绉�" prop="patName">
-            <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" />
-          </el-form-item>
-          <el-form-item label="鎮h�呮弿杩�" prop="patDeptDesc">
-            绉戝: {{ formData?.patDetails?.deptDesc || '-' }} 鐥呭尯: {{ formData.patWardDesc || formData?.patDetails?.wardDesc || '-' }} 搴婁綅: {{ formData.patBedNo || formData?.patDetails?.bedNo || '-' }}
-          </el-form-item>
-          <!-- 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤癸紙鍚庣 DevRentRespVO 宸叉墿瀛楁骞跺洖濉級 -->
-          <PatientInfoBlock :data="formData" check-type-field="checkType" />
-          <el-form-item label="瑁呮満鏃堕棿" prop="rentTime">
-            <el-date-picker
-                v-model="formData.rentTime"
-                type="date"
-                value-format="x"
-                placeholder="閫夋嫨瑁呮満鏃堕棿"
-                :readonly="true"
-            />
-          </el-form-item>
         </el-col>
-        <el-col :span="12">
+      <el-col :span="6">
+        <el-form-item label="鎮h�呭鍚�" prop="patName">
+          <el-input v-model="formData.episodeId" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" />
+        </el-form-item>
+      </el-col>    
+        <el-col :span="6">
           <el-form-item label="璁惧缂栧彿" prop="devId">
             <el-input v-model="formData.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" @input="getRentInfoByDevId" />
           </el-form-item>
-          <el-form-item label="璁惧鎻忚堪" prop="">
-            {{formData?.brand + "&nbsp;&nbsp;" + formData?.model + " " + tranlateDevState(formData?.devState)}}
-          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
             <el-date-picker
                 v-model="formData.returnTime"
@@ -45,36 +44,36 @@
                 placeholder="閫夋嫨鎷嗘満鏃堕棿"
             />
           </el-form-item>
-          <el-form-item label="澶囨敞" prop="remark">
-            <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
-          </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="骞叉壈鏁�" prop="interference">
             <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="鑴辫惤" prop="detachment">
-            <el-switch
-                v-model="formData.detachment"
-                :active-value="1"
-                :inactive-value="0"
-            />
+            <el-switch v-model="formData.detachment" :active-value="1" :inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="鍩虹嚎绮�" prop="baseline">
-            <el-switch
-                v-model="formData.baseline"
-                :active-value="1"
-                :inactive-value="0"
-            />
+            <el-switch v-model="formData.baseline" :active-value="1" :inactive-value="0" />
           </el-form-item>
         </el-col>
       </el-row>
+
+      <!-- ===== 鎮h�呬俊鎭紙闇�姹�1锛�18 椤圭粺涓�灞曠ず锛�**涓�琛屽洓鍒�**锛�=====
+           鍚庣 DevRentRespVO 宸叉墿瀛楁骞跺洖濉� -->
+      <PatientInfoBlock :data="formData" check-type-field="checkType" :span="6" />
+
+      <!-- ===== 璁惧淇℃伅锛堜竴琛屽洓鍒楋級=====
+           銆岃澶囩紪鍙� / 鎷嗘満鏃堕棿 / 骞叉壈鏁� / 鑴辫惤 / 鍩虹嚎绮椼�嶅凡鍦ㄤ笂鏂圭紪杈戝尯褰曞叆锛�
+           姝ゅ鍙灞曠ず鍏朵綑璁惧瀛楁锛堣鏈烘椂闂淬�佺櫥璁版椂闂淬�佽澶囨弿杩扮瓑锛� -->
+      <DeviceInfoBlock :data="formData" time-label-mode="dismantle" :span="6" />
+
+      <el-form-item label="澶囨敞" prop="remark">
+        <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
+      </el-form-item>
     </el-form>
     <el-button @click="submitForm" type="primary" :disabled="formLoading">鎷嗘満瀹屾垚</el-button>
     <el-button @click="resetForm()">閲� 缃�</el-button>
@@ -156,6 +155,7 @@
 import {tranlateDevState} from "../../../utils/statusFormatter";
 // 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤圭粺涓�灞曠ず鍧�
 import PatientInfoBlock from "@/views/ecg/doctor/components/PatientInfoBlock.vue";
+import DeviceInfoBlock from "@/views/ecg/doctor/components/DeviceInfoBlock.vue";
 
 /** 瑁呮満鎷嗘満 琛ㄥ崟 */
 defineOptions({ name: 'DevrDismantle' })
@@ -379,7 +379,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
+  }
 }
 
 /** 鍒濆鍖� **/
@@ -389,3 +398,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