From 01ee694a3bb8048372fc793a8de314d70b688b35 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 18 十月 2026 22:36:21 +0800
Subject: [PATCH] 修改了工位

---
 src/views/ecg/devrent/index.vue |  209 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 114 insertions(+), 95 deletions(-)

diff --git a/src/views/ecg/devrent/index.vue b/src/views/ecg/devrent/index.vue
index 3e9a1db..4284912 100644
--- a/src/views/ecg/devrent/index.vue
+++ b/src/views/ecg/devrent/index.vue
@@ -2,63 +2,30 @@
 <template>
   <ContentWrap>
     <!-- 鎼滅储宸ヤ綔鏍� -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="120px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
       <el-form-item label="璁惧缂栧彿" prop="devId">
-        <el-input
-          v-model="queryParams.devId"
-          placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.devId" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="鎮h�呯紪鍙�" prop="patId">
-        <el-input
-          v-model="queryParams.patId"
-          placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="鎮h�呭悕绉�" prop="patName">
-        <el-input
-          v-model="queryParams.patName"
-          placeholder="璇疯緭鍏ユ偅鑰呭悕绉�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.patName" placeholder="璇疯緭鍏ユ偅鑰呭悕绉�" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="妫�鏌�&瑁呮満鏃堕棿" prop="rentTime">
-        <el-date-picker
-          v-model="queryParams.rentTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
+        <el-date-picker v-model="queryParams.rentTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" />
       </el-form-item>
       <el-form-item label="鎷嗘満鏃堕棿" prop="returnTime">
-        <el-date-picker
-          v-model="queryParams.returnTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
+        <el-date-picker v-model="queryParams.returnTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" />
       </el-form-item>
-<!--
+      <!--
       <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -72,23 +39,14 @@
       </el-form-item>
 -->
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['ecg:dev-rent:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 鏂板
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 鎼滅储
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['ecg:dev-rent:export']"
-        >
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆
+        </el-button>
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['ecg:dev-rent:export']">
           <Icon icon="ep:download" class="mr-5px" /> 瀵煎嚭
         </el-button>
       </el-form-item>
@@ -99,38 +57,100 @@
   <ContentWrap>
     <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" />
-      <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="checkType" width="100px">
+
+      <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="checkType" width="100px">
         <template #default="scope">
-          <span>{{getCheckTypeName(scope.row.checkType)}}</span>
+          <span>{{ getCheckTypeName(scope.row.checkType) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="state" width="90px">
         <template #default="scope">
-          <span>{{tranlateCheckState(scope.row.state)}}</span>
+          <span>{{ tranlateCheckState(scope.row.state) }}</span>
         </template>
       </el-table-column>
-        <el-table-column
-        label="妫�鏌�&瑁呮満鏃堕棿"
-        align="center"
-        prop="rentTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column
-        label="鎷嗘満鏃堕棿"
-        align="center"
-        prop="returnTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+      <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
+      <el-table-column label="鎮h�呭悕绉�" align="center" prop="patName" />
+      <el-table-column label="鏉ユ簮" align="center" width="90px">
+        <template #default="scope">
+          <dict-tag v-if="scope.row.patSrc !== undefined && scope.row.patSrc !== null" :type="DICT_TYPE.ECG_PAT_SOURCE"
+            :value="scope.row.patSrc" />
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+
+      <!-- 璁惧鐩稿叧鍒楋紙涓庛�屽鑰愩�嶅悓绾э紝鍘熷厛琚敊璇祵濂楄繘銆屽鑰愩�嶅垪鍐咃紝瀵艰嚧 Vue 缂栬瘧鎶�
+           "Extraneous children found when component already has a slot"锛� -->
+      <el-table-column label="璁惧缂栧彿" align="center" prop="devId" />
+      <el-table-column label="妫�鏌�&瑁呮満鏃堕棿" align="center"
+        prop="rentTime" :formatter="dateFormatter" width="180px" />
+      <el-table-column label="鎷嗘満鏃堕棿" align="center" prop="returnTime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="骞叉壈鏁�" align="center" prop="interference" />
       <el-table-column label="鍩虹嚎绮�" align="center" prop="baseline" />
       <el-table-column label="鑴辫惤" align="center" prop="detachment" />
+
+      <el-table-column label="澶氳��" align="center" width="110px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ECG_TOLERANCE" :value="scope.row.tolerance ?? 0" />
+        </template>
+      </el-table-column>
+      <!-- 闇�姹�1锛氶棬璇婂彿 + 鍖诲槺鍙凤紙姝ゅ墠杩欎袱涓〉闈㈤仐婕忎簡璇ュ垪锛屾湰娆¤ˉ榻愶級
+           鏍囩鐢便�屽氨璇婂崱鍙枫�嶆敼涓恒�岄棬璇婂彿銆嶏紙缁忕‘璁わ級锛歮edical_card 鍏ㄥ簱涓虹┖锛�
+           璇ュ垪瀹為檯鏄剧ず outpatient_no锛堣瑙併�婇儴缃叉竻鍗曘��5.1锛夈�� -->
+      <el-table-column label="闂ㄨ瘖鍙�" align="center" min-width="140px">
+        <template #default="scope">
+          <span>{{ resolveCardNo(scope.row).value }}</span>
+          <el-tag v-if="resolveCardNo(scope.row).from" size="small" type="info" effect="plain" class="ml-1">
+            {{ resolveCardNo(scope.row).from }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="鍖诲槺鍙�" align="center" prop="doctorAdviceNo" min-width="110px">
+        <template #default="scope">
+          {{ scope.row.doctorAdviceNo || '-' }}
+        </template>
+      </el-table-column>
+      <!-- 闇�姹�1锛氳ˉ榻愭偅鑰呬俊鎭紙鍚庣 DevRentRespVO 宸叉墿瀛楁骞跺洖濉級 -->
+      <el-table-column label="鎬у埆" align="center" width="70px">
+        <template #default="scope">
+          <!-- 1鐢�/2濂筹紱0 鎴栫己澶憋紙HIS 鏈彁渚涳紝瀹炴祴搴撲腑鏈� 2123 琛�=0锛夋樉绀�"鏈煡" -->
+          <dict-tag v-if="scope.row.patGender === 1 || scope.row.patGender === 2" :type="DICT_TYPE.SYSTEM_USER_SEX"
+            :value="scope.row.patGender" />
+          <span v-else>鏈煡</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="鍑虹敓鏃ユ湡" align="center" width="110px">
+        <template #default="scope">{{ formatDateOnly(scope.row.patBirthday) || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="骞撮緞" align="center" width="80px">
+        <template #default="scope">{{ formatAge(scope.row.patBirthday) || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="鐥呭尯" align="center" min-width="110px">
+        <template #default="scope">{{ scope.row.patWardDesc || scope.row.patDetails?.wardDesc || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="鐥呭簥鍙�" align="center" width="90px">
+        <template #default="scope">{{ scope.row.patBedNo || scope.row.patDetails?.bedNo || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="鎮h�呯數璇�" align="center" min-width="120px">
+        <template #default="scope">
+          {{ scope.row.patMobile || scope.row.patPhone || scope.row.patDetails?.mobile || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="鐧昏鏃堕棿" align="center" min-width="150px">
+        <template #default="scope">{{ formatDateTime(scope.row.registerDate) || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="寮�鍗曟棩鏈�" align="center" min-width="150px">
+        <template #default="scope">{{ formatDateTime(scope.row.doctorTime) || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="璺濅粖澶╂暟" align="center" width="90px">
+        <template #default="scope">{{ formatDaysFromOrder(scope.row.doctorTime) || '-' }}</template>
+      </el-table-column>
+      <el-table-column label="寮�鍗曞尰甯�" align="center" min-width="100px">
+        <template #default="scope">{{ scope.row.doctor || '-' }}</template>
+      </el-table-column>
+
+
       <el-table-column label="澶囨敞" align="center" prop="remark" />
-<!--
+      <!--
       <el-table-column
         label="鍒涘缓鏃堕棿"
         align="center"
@@ -139,6 +159,7 @@
         width="180px"
       />
 -->
+      <!--
       <el-table-column label="鎿嶄綔" align="center" min-width="120px">
         <template #default="scope">
           <el-button
@@ -159,14 +180,11 @@
           </el-button>
         </template>
       </el-table-column>
+-->
     </el-table>
     <!-- 鍒嗛〉 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
@@ -178,16 +196,17 @@
 import download from '@/utils/download'
 import { DevRentApi, DevRentVO } from '@/api/ecg/devrent'
 import DevRentForm from './DevRentForm.vue'
-import {tranlateCheckState} from "../../../utils/statusFormatter";
-import {useCheckTypeStore} from "@/store/modules/checkType";
+import { tranlateCheckState } from "../../../utils/statusFormatter";
+import { getCheckTypeName } from "../../../utils/checkTypeFormatter";
+// 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤癸紙瀛楀吀 + 骞撮緞/璺濅粖澶╂暟绛夊疄鏃惰绠楋級
+import { DICT_TYPE } from '@/utils/dict'
+import { formatAge, formatDaysFromOrder, formatDateTime, formatDateOnly, resolveCardNo } from '@/utils/patientInfo'
 
 /** 瑁呮満鎷嗘満 鍒楄〃 */
 defineOptions({ name: 'DevRent' })
 
 const message = useMessage() // 娑堟伅寮圭獥
 const { t } = useI18n() // 鍥介檯鍖�
-
-const checkTypeStore = useCheckTypeStore()
 
 const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
 const list = ref<DevRentVO[]>([]) // 鍒楄〃鐨勬暟鎹�
@@ -249,7 +268,7 @@
     message.success(t('common.delSuccess'))
     // 鍒锋柊鍒楄〃
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.3