From b10d61337f207fbdbea2c44f4f270d83c845cbf9 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 29 十一月 2024 13:28:06 +0800
Subject: [PATCH] 检查类型  条码显示控制

---
 src/views/ecg/devmanage/index.vue |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/views/ecg/devmanage/index.vue b/src/views/ecg/devmanage/index.vue
index a16379f..8229feb 100644
--- a/src/views/ecg/devmanage/index.vue
+++ b/src/views/ecg/devmanage/index.vue
@@ -120,7 +120,7 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <!--      <el-table-column label="id" align="center" prop="id" />-->
       <el-table-column label="璁惧缂栧彿" align="center" prop="devId" width="100px" />
-      <el-table-column label="鍒嗙被鍚�" align="center" prop="category">
+      <el-table-column label="鍒嗙被" align="center" prop="category" width="60px">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ECG_DEV_CATEGORY" :value="scope.row.category" />
         </template>
@@ -130,23 +130,31 @@
           <dict-tag :type="DICT_TYPE.ECG_DEV_BRAND" :value="scope.row.brand" />
         </template>
       </el-table-column>
-      <el-table-column label="鍨嬪彿" align="center" prop="model" />
-      <el-table-column label="鐘舵��" align="center" prop="lost" >
+      <el-table-column label="鍨嬪彿" align="center" prop="model" width="100px"/>
+      <el-table-column label="鐘舵��" align="center" prop="lost" width="80px">
         <template #default="scope">
           <span>{{tranlateDevState(scope.row.state)}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="閲囪喘鏃ユ湡" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/>
+
+      <el-table-column label="鎮h��" align="center" prop="patDetails" width="400px">
+        <template #default="scope">
+          <span>{{scope.row.patDetails?.name}} {{scope.row.patDetails?.mobile}} {{scope.row.patDetails?.wardDesc}} {{scope.row.patDetails?.bedNo}}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column label="鐘舵�佹棩鏈�" align="center" prop="stateDate" :formatter="dateFormatter2" width="120px"/>
-<!--
-      <el-table-column
-          label="鍒涘缓鏃堕棿"
-          align="center"
-          prop="createTime"
-          :formatter="dateFormatter2"
-          width="180px"
-      />
--->
+      <el-table-column label="閲囪喘鏃ユ湡" align="center" prop="purchaseDate" :formatter="dateFormatter2" width="120px"/>
+
+      <!--
+            <el-table-column
+                label="鍒涘缓鏃堕棿"
+                align="center"
+                prop="createTime"
+                :formatter="dateFormatter2"
+                width="180px"
+            />
+      -->
       <el-table-column label="鎿嶄綔" align="center" min-width="120px">
         <template #default="scope">
           <el-button
@@ -263,7 +271,7 @@
   if (!rentId) return
 
   const devRent = await DevRentApi.getDevRent(rentId)
-  ElMessageBox.alert(devRent.patDetails, '鎮h�呬俊鎭�');
+  ElMessageBox.alert(devRent.patName + " " + devRent.patDetails, '鎮h�呬俊鎭�');
 }
 
 /** 娣诲姞/淇敼鎿嶄綔 */

--
Gitblit v1.9.3