From e6dff096a9e94d1a5323e82f74bc1368ff7a72d6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 九月 2024 13:47:17 +0800
Subject: [PATCH] 装机 作业列表

---
 src/views/ecg/doctor/components/DevInstallPanel.vue |   45 ++++++++++++++-------------------------------
 1 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 3b5a071..031373b 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -18,23 +18,6 @@
           placeholder="閫夋嫨瑁呮満鏃堕棿"
         />
       </el-form-item>
-      <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
-        <el-date-picker
-          v-model="formData.returnTime"
-          type="date"
-          value-format="x"
-          placeholder="閫夋嫨鎷嗘満鏃堕棿"
-        />
-      </el-form-item>
-      <el-form-item label="骞叉壈鏁�" prop="interference">
-        <el-input v-model="formData.interference" placeholder="璇疯緭鍏ュ共鎵版暟" />
-      </el-form-item>
-      <el-form-item label="鍩虹嚎绮�" prop="baseline">
-        <el-input v-model="formData.baseline" placeholder="璇疯緭鍏ュ熀绾跨矖" />
-      </el-form-item>
-      <el-form-item label="鑴辩" prop="detachment">
-        <el-input v-model="formData.detachment" placeholder="璇疯緭鍏ヨ劚绂�" />
-      </el-form-item>
       <el-form-item label="澶囨敞" prop="remark">
         <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
       </el-form-item>
@@ -47,28 +30,28 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @current-change="onCurChange" >
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />
-      <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />
-      <el-table-column label="鍖荤敓鍚嶇О" align="center" prop="docName" />
+<!--      <el-table-column label="浣滀笟绫诲瀷" align="center" prop="jobType" />-->
+<!--      <el-table-column label="鍖荤敓缂栧彿" align="center" prop="docId" />-->
+      <el-table-column label="鍖荤敓鍚嶇О" align="center" width="auto" prop="docName" />
       <el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
-      <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
+<!--      <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />-->
       <el-table-column label="鎮h�呭悕绉�" align="center" prop="patName" />
       <el-table-column
           label="浣滀笟鏃堕棿"
           align="center"
           prop="jobTime"
-          :formatter="dateFormatter"
-          width="180px"
+          :formatter="timeFormatter"
       />
-      <el-table-column label="浣滀笟姒傝" align="center" prop="summary" />
+<!--      <el-table-column label="浣滀笟姒傝" align="center" prop="summary" />-->
       <el-table-column label="澶囨敞" align="center" prop="remark" />
+<!--
       <el-table-column
           label="鍒涘缓鏃堕棿"
           align="center"
           prop="createTime"
           :formatter="dateFormatter"
-          width="180px"
       />
+-->
       <el-table-column label="鎿嶄綔" align="center" min-width="120px">
         <template #default="scope">
           <el-button
@@ -106,7 +89,7 @@
 import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
 import {QueueVO} from "@/api/ecg/queue";
 import {isStringEmpty} from "@/utils/stringUtil";
-import {dateFormatter} from "@/utils/formatTime";
+import {dateFormatter, timeFormatter} from "@/utils/formatTime";
 import {JobRecordApi, JobRecordVO} from "@/api/ecg/jobrecord";
 
 /** 瑁呮満鎷嗘満 琛ㄥ崟 */
@@ -155,8 +138,6 @@
   formLoading.value = true
   try {
     const data = formData.value as unknown as DevRentVO
-    data.patId = patient.value.patId
-    data.patName = patient.value.patName
     if (formData.value.id === null || formData.value.id === undefined) {
       const result = await DevRentApi.devInstall(data)
       formData.value.id = result
@@ -168,6 +149,7 @@
     dialogVisible.value = false
     // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
     emit('success')
+    resetForm()
     getList()
   } finally {
     formLoading.value = false
@@ -179,8 +161,8 @@
   formData.value = {
     id: undefined,
     devId: undefined,
-    patId: patient.value?.patId,
-    patName: patient.value?.patName,
+    patId: patient.value.patId,
+    patName: patient.value.patName,
     rentTime: new Date().getTime(),
     returnTime: undefined,
     interference: undefined,
@@ -228,7 +210,8 @@
 }
 
 const onCurChange = (cur) => {
-  getSelectedRent( cur.rentId )
+  if (cur !== null)
+    getSelectedRent( cur.rentId )
 }
 
 const getSelectedRent = async (rentId) => {

--
Gitblit v1.9.3