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/DevDismantle.vue |  248 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 202 insertions(+), 46 deletions(-)

diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index b9699eb..9f3332e 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -1,40 +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 :xs="24" :sm="12" :md="12" :lg="6">
+        <el-form-item label="鐢宠鍗曞彿" prop="applyNo">
+          <el-input v-model="formData.applyNo" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" />
+        </el-form-item>
+      </el-col>
+       <el-col :xs="24" :sm="12" :md="12" :lg="6">
+        <el-form-item label="妫�鏌ラ」鐩�" prop="">
+          {{ formData?.checkType && getCheckTypeName(formData?.checkType) }}
+        </el-form-item>
+      </el-col>      
+        <el-col :xs="24" :sm="12" :md="12" :lg="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.patDetails?.wardDesc}} 搴婁綅: {{formData.patDetails?.bedNo}}
-          </el-form-item>
-          <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 :xs="24" :sm="12" :md="12" :lg="6">
+        <el-form-item label="鎮h�呭鍚�" prop="patName">
+          <el-input v-model="formData.episodeId" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" />
+        </el-form-item>
+      </el-col>    
+        <el-col :xs="24" :sm="12" :md="12" :lg="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}}
-          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :md="12" :lg="6">
           <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
             <el-date-picker
                 v-model="formData.returnTime"
@@ -43,41 +44,50 @@
                 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 :xs="24" :sm="12" :md="12" :lg="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 :xs="24" :sm="12" :md="12" :lg="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 :xs="24" :sm="12" :md="12" :lg="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>
-    <el-button @click="loseDismantle" :disabled="formLoading">閬� 澶�</el-button>
-    <el-button @click="damageDismantle" :disabled="formLoading">鎹� 姣�</el-button>
+    <!-- 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯锛氫笌鍏跺畠涓変釜宸ヤ綔鍙板悓娆惧鍣紙娴呬富鑹插簳 + 宸︿晶涓昏壊绔栨潯锛� -->
+    <div class="patient-actions">
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">鎷嗘満瀹屾垚</el-button>
+      <el-button @click="resetForm()">閲� 缃�</el-button>
+      <el-button @click="loseDismantle" :disabled="formLoading">閬� 澶�</el-button>
+      <el-button @click="damageDismantle" :disabled="formLoading">鎹� 姣�</el-button>
+    </div>
+
+  <!-- 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯涓庡凡瀹屾垚璁板綍涔嬮棿鐨勬爣棰樻爮锛堜笌妫�鏌�/棰嗙敤/瑁呮満涓変釜宸ヤ綔鍙板悓娆撅級 -->
+  <div class="records-title">
+    <span class="records-title__bar"></span>
+    <span class="records-title__text">宸插畬鎴愬垪琛�</span>
+  </div>
 
   <!-- 鍖荤敓鎷嗘満鍒楄〃 -->
   <ContentWrap>
@@ -149,7 +159,12 @@
 import {dateFormatter} from "@/utils/formatTime";
 import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
 import {isStringEmpty} from "@/utils/stringUtil";
-import {curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {calculateHours, curDayEnd, curDayStart} from "@/utils/dateUtil";
+import {AppointmentApi} from "@/api/ecg/appointment";
+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' })
@@ -173,6 +188,37 @@
 
 /** 鎻愪氦琛ㄥ崟 */
 const submitForm = async () => {
+  const data = formData.value as unknown as DevRentVO
+  const durationHours = calculateHours(data.rentTime!, data.returnTime!)
+  if (durationHours > 20) {
+    _submitForm()
+    return;
+  }
+
+  ElMessageBox.confirm(
+      '绂昏鏈轰笉鍒�20灏忔椂锛岀‘瀹氳鎷嗘満鍚楋紵',
+      'Warning',
+      {
+        confirmButtonText: '濂界殑',
+        cancelButtonText: '涓嶇敤',
+        type: 'warning',
+      }
+  )
+      .then(async () => {
+        _submitForm()
+      })
+      .catch(() => {
+/*
+        ElNotification({
+          title: '娓╅Θ鎻愮ず',
+          message: '纭澶辫触',
+          type: 'warning'
+        })
+*/
+      })
+}
+
+const _submitForm = async () => {
   // 鏍¢獙琛ㄥ崟
   await formRef.value.validate()
   // 鎻愪氦璇锋眰
@@ -253,6 +299,25 @@
     category: '',
     brand: '',
     model: '',
+    devState: undefined,
+    // 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤癸紙PatientInfoBlock 渚濊禆杩欎簺瀛楁锛�
+    // 涓嶅垵濮嬪寲浼氬鑷� Vue 鍦ㄦā鏉夸腑璇诲彇鏈畾涔夊睘鎬у苟鍛婅锛�
+    applyNo: undefined,
+    episodeId: undefined,
+    patGender: undefined,
+    patBirthday: undefined,
+    registerDate: undefined,
+    doctor: undefined,
+    doctorTime: undefined,
+    patSrc: undefined,
+    patMobile: undefined,
+    patPhone: undefined,
+    medicalCard: undefined,
+    outpatientNo: undefined,
+    patIdentityId: undefined,
+    tolerance: undefined,
+    status: undefined,
+    seqNum: undefined,
   }
   formRef.value?.resetFields()
 }
@@ -278,7 +343,7 @@
 }
 
 const getRentInfo = async () => {
-  const data = await DevRentApi.getInstalledRent(formData.value)
+  const data = await DevRentApi.getExistingRent(formData.value)
   if (null === data)
     return
 
@@ -323,7 +388,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
+  }
 }
 
 /** 鍒濆鍖� **/
@@ -333,3 +407,85 @@
 })
 
 </script>
+
+<style scoped lang="scss">
+/*
+  銆愭湰娆¢渶姹傘�戞寜閽粺涓�灏哄 / 瀛楀彿锛堜笌鍏跺畠涓変釜宸ヤ綔鍙颁竴鑷达紱鏈〉涓嶄娇鐢� DoctorPageLayout锛�
+  鏅�氭寜閽� 32px / 14px 瀛楋紱琛ㄦ牸鍐呰鍐呮寜閽� 28px / 13px 瀛楋紱閾炬帴寮忔寜閽彧鏀惧ぇ瀛楀彿銆�
+*/
+.patient-actions :deep(.el-button) {
+  height: 32px;
+  padding: 0 14px;
+  font-size: 14px;
+}
+
+.el-table :deep(.el-button:not(.is-link)) {
+  height: 28px;
+  padding: 0 10px;
+  font-size: 13px;
+}
+
+.patient-actions :deep(.el-button.is-link),
+.el-table :deep(.el-button.is-link) {
+  height: auto;
+  padding: 0 4px;
+  font-size: 14px;
+}
+
+/*
+  銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯锛氫笌妫�鏌�/棰嗙敤/瑁呮満涓変釜宸ヤ綔鍙板畬鍏ㄤ竴鑷� 鈥斺��
+  鏋佹祬涓昏壊搴� + 缁嗚竟妗� + 宸︿晶 3px 涓昏壊绔栨潯锛堜笌銆屽凡瀹屾垚鍒楄〃銆嶆爣棰樻潯鍚屾璇█锛夈��
+*/
+.patient-actions {
+  display: flex;
+  flex: none;
+  flex-wrap: wrap;
+  gap: 8px;
+  align-items: center;
+  padding: 8px 10px;
+  margin: 2px 0 10px;
+  background-color: var(--el-color-primary-light-9);
+  border: 1px solid var(--el-color-primary-light-7);
+  border-left: 3px solid var(--el-color-primary);
+  border-radius: 4px;
+
+  /* Element Plus 缁欑浉閭� el-button 榛樿鍔犱簡 margin-left:12px锛屼細涓� gap 鍙犲姞锛屾竻鎺� */
+  :deep(.el-button + .el-button) {
+    margin-left: 0;
+  }
+}
+
+/* 銆愭湰娆¢渶姹傘�戙�屽凡瀹屾垚鍒楄〃銆嶆爣棰樻爮锛氫笌妫�鏌�/棰嗙敤/瑁呮満涓変釜宸ヤ綔鍙板畬鍏ㄤ竴鑷�
+   锛堝乏渚т富鑹茬珫绾� + 14px 鍔犵矖锛岀揣鍑戦珮搴︿笉鎸ゅ帇琛ㄦ牸锛� */
+.records-title {
+  display: flex;
+  align-items: center;
+  flex: none;
+  gap: 6px;
+  padding: 2px 0 6px;
+
+  &__bar {
+    width: 3px;
+    height: 14px;
+    background-color: var(--el-color-primary);
+    border-radius: 2px;
+  }
+
+  &__text {
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+}
+
+/* ==========================================================================
+   闇�姹傦細琛ㄥ崟鍐呭鎸ゅ崰浜嗕笅鏂硅褰曡〃鏍肩殑绌洪棿 鈥斺�� 鍘嬬缉琛岄棿璺濄��
+   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