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/appointment/index.vue |  105 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index 48bb190..1f29327 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -10,9 +10,19 @@
         <el-input v-model="queryParams.patName" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
-      <el-form-item label="鎮h�呮墜鏈�" prop="patMobile">
-        <el-input v-model="queryParams.patMobile" placeholder="璇疯緭鍏ユ偅鑰呮墜鏈�" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+      <!-- 銆愭湰闇�姹傘�戦绾︽棩鏈熸椂闂存鏌ヨ锛堟浛浠e凡鍘绘帀鐨勩�屾偅鑰呮墜鏈恒�嶆潯浠讹紝鍑忓皯鏌ヨ鏉′欢鏁伴噺锛� -->
+      <el-form-item label="棰勭害鏃ユ湡" prop="bookDateRange">
+        <el-date-picker
+          v-model="queryParams.bookDateRange"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          range-separator="鑷�"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          unlink-panels
+          clearable
+          class="!w-320px"
+        />
       </el-form-item>
       <!--
       <el-form-item label="鎮h�呯數璇�" prop="patPhone">
@@ -84,8 +94,41 @@
   <!-- 鍒楄〃 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="appointmentList" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="鐢宠鍙�" align="center" prop="applyNo" min-width="110px" />
-      <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
+      <el-table-column label="鐢宠鍗曞彿" align="center" prop="applyNo" min-width="110px" />
+      <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />      
+      <el-table-column label="濮撳悕" align="center" min-width="160px">
+        <template #default="scope">
+          {{ scope.row.patName }} <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
+          <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc" />
+        </template>
+      </el-table-column>
+      <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="140px">
+        <template #default="scope">
+          {{ getCheckTypeName(scope.row.bookCheckType) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="棰勭害鏃ユ湡" align="center" prop="bookDate" :formatter="dateFormatter2" width="120px" />
+      <el-table-column label="棰勭害鏃堕棿娈�" align="center" prop="bookTimeslot" width="100px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
+        </template>
+      </el-table-column>      
+      
+      <!-- 闇�姹�1锛氱姸鎬� -->
+      <!-- 娉ㄦ剰锛氬繀椤绘樉寮忓垽绌猴紝涓嶈兘鐢� v-if="scope.row.status" 鈥斺��
+           鐘舵�� '0'锛堟湭鐧昏锛夋槸鍚堟硶鍊硷紝鐪熷�煎垽鏂細鎶婂畠璇垽涓�"鏃犳暟鎹�"鑰屾樉绀� '-' -->
+      <el-table-column label="鐘舵��" align="center" prop="status" width="110px">
+        <template #default="scope">
+          <dict-tag v-if="scope.row.status !== null && scope.row.status !== undefined && scope.row.status !== ''"
+            :type="DICT_TYPE.ECG_STATUS" :value="scope.row.status" />
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="缂磋垂" align="center" prop="paid">
+        <template #default="scope">
+          {{ scope.row.paid == 1 ? "宸蹭粯" : "" }}
+        </template>
+      </el-table-column>
       <el-table-column label="灏辫瘖鍙�" align="center" prop="episodeId" min-width="110px" />
       <!-- 鏈垪鏍囩鐢便�屽氨璇婂崱鍙枫�嶆敼涓恒�岄棬璇婂彿銆嶏紙缁忕‘璁わ級銆傚師鍥狅紙璇﹁銆婇儴缃叉竻鍗曘��5.1锛夛細
            HIS 鍦ㄥ崱鍙锋Ы浣嶄紶绌猴紝medical_card 鍏ㄥ簱 159,116 琛�**鏃犱竴闈炵┖**锛�
@@ -99,39 +142,6 @@
           <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" min-width="160px">
-        <template #default="scope">
-          {{ scope.row.patName }} <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
-          <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc" />
-        </template>
-      </el-table-column>
-
-      <el-table-column label="棰勭害鏃ユ湡" align="center" prop="bookDate" :formatter="dateFormatter2" width="120px" />
-      <el-table-column label="棰勭害鏃堕棿娈�" align="center" prop="bookTimeslot" width="100px">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
-        </template>
-      </el-table-column>
-      <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="120px">
-        <template #default="scope">
-          {{ getCheckTypeName(scope.row.bookCheckType) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="缂磋垂" align="center" prop="paid">
-        <template #default="scope">
-          {{ scope.row.paid == 1 ? "宸蹭粯" : "" }}
-        </template>
-      </el-table-column>
-      <!-- 闇�姹�1锛氱姸鎬� -->
-      <!-- 娉ㄦ剰锛氬繀椤绘樉寮忓垽绌猴紝涓嶈兘鐢� v-if="scope.row.status" 鈥斺��
-           鐘舵�� '0'锛堟湭鐧昏锛夋槸鍚堟硶鍊硷紝鐪熷�煎垽鏂細鎶婂畠璇垽涓�"鏃犳暟鎹�"鑰屾樉绀� '-' -->
-      <el-table-column label="鐘舵��" align="center" prop="status" width="110px">
-        <template #default="scope">
-          <dict-tag v-if="scope.row.status !== null && scope.row.status !== undefined && scope.row.status !== ''"
-            :type="DICT_TYPE.ECG_STATUS" :value="scope.row.status" />
-          <span v-else>-</span>
         </template>
       </el-table-column>
       <!-- 闇�姹�1锛氬勾榫勶紙搴撲腑鏃犳鍒楋紝鐢辩敓鏃ュ疄鏃惰绠楋級 -->
@@ -157,23 +167,25 @@
         </template>
       </el-table-column>
       <el-table-column label="鐧昏鏃堕棿" align="center" prop="registerDate" />
-      <el-table-column label="绉戝浠g爜" align="center" prop="patDeptCode" />
-      <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
-      <el-table-column label="鐥呭尯浠g爜" align="center" prop="patWardCode" />
+      <!-- <el-table-column label="绉戝浠g爜" align="center" prop="patDeptCode" /> -->
+      <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" min-width="120px"/>
+      <!-- <el-table-column label="鐥呭尯浠g爜" align="center" prop="patWardCode" /> -->
       <el-table-column label="鐥呭尯鍚嶇О" align="center" prop="patWardDesc" />
       <el-table-column label="搴婂彿" align="center" prop="patBedNo" />
       <el-table-column label="鐢熸棩" align="center" prop="patBirthday" :formatter="dateFormatter2" width="110px" />
       <el-table-column label="鎵嬫満" align="center" prop="patMobile" />
       <!--      <el-table-column label="鐢佃瘽" align="center" prop="patPhone" />-->
       <!--      <el-table-column label="韬唤璇佸彿" align="center" prop="patIdentityId" />-->
-      <el-table-column label="鍦板潃" align="center" prop="patAddr" />
-      <el-table-column label="鎿嶄綔" align="center" min-width="120px">
+      <el-table-column label="鍦板潃" align="center" prop="patAddr" min-width="150px"/>
+      <!-- 鎿嶄綔鍒楋細鎸夐挳鏍峰紡 + 鍥哄畾鍦ㄥ垪琛ㄦ渶鍙充晶 -->
+      <el-table-column label="鎿嶄綔" fixed="right" align="center" width="160px">
         <template #default="scope">
-          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+          <el-button type="primary" plain size="small" @click="openForm('update', scope.row.id)"
             v-hasPermi="['ecg:appointment:update']">
             缂栬緫
           </el-button>
-          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['ecg:appointment:delete']">
+          <el-button type="danger" plain size="small" @click="handleDelete(scope.row.id)"
+            v-hasPermi="['ecg:appointment:delete']">
             鍒犻櫎
           </el-button>
         </template>
@@ -217,7 +229,6 @@
   patName: undefined,
   patGender: undefined,
   patBirthday: undefined,
-  patMobile: undefined,
   patPhone: undefined,
   patIdentityId: undefined,
   patAddr: undefined,
@@ -227,6 +238,8 @@
   patWardDesc: undefined,
   patBedNo: undefined,
   bookDate: undefined,
+  // 銆愭湰闇�姹傘�戦绾︽棩鏈熸椂闂存锛歔]=[寮�濮�,缁撴潫]锛孉PI 灞備細鎷嗘垚 bookDateStart(00:00:00) / bookDateEnd(23:59:59)
+  bookDateRange: [] as string[] | undefined,
   bookTimeslot: undefined,
   bookCheckType: undefined,
   bookSrc: undefined

--
Gitblit v1.9.3