From 936c01060eea0924b88ca5c35d221a972a6aba7d Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 05 十月 2026 10:47:22 +0800
Subject: [PATCH] 检查单列表调整

---
 src/views/ecg/appointment/alter.vue |  291 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 158 insertions(+), 133 deletions(-)

diff --git a/src/views/ecg/appointment/alter.vue b/src/views/ecg/appointment/alter.vue
index 8e688f1..12d3f32 100644
--- a/src/views/ecg/appointment/alter.vue
+++ b/src/views/ecg/appointment/alter.vue
@@ -1,39 +1,18 @@
 <template>
   <ContentWrap>
     <!-- 鎼滅储宸ヤ綔鏍� -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <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="鎮h�呮墜鏈�" prop="patMobile">
-        <el-input
-          v-model="queryParams.patMobile"
-          placeholder="璇疯緭鍏ユ偅鑰呮墜鏈�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.patMobile" placeholder="璇疯緭鍏ユ偅鑰呮墜鏈�" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <!--
       <el-form-item label="鎮h�呯數璇�" prop="patPhone">
@@ -47,15 +26,10 @@
       </el-form-item>
 -->
       <el-form-item label="韬唤璇佸彿" prop="patIdentityId">
-        <el-input
-          v-model="queryParams.patIdentityId"
-          placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.patIdentityId" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="棰勭害缂栧彿" prop="applyNo">
+      <!-- <el-form-item label="棰勭害缂栧彿" prop="applyNo">
         <el-input
           v-model="queryParams.applyNo"
           placeholder="璇疯緭鍏ラ绾︾紪鍙�"
@@ -63,21 +37,34 @@
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
-      </el-form-item>
-      <el-form-item label="妫�鏌ョ被鍨�" prop="bookCheckType">
-        <el-select
-          v-model="queryParams.bookCheckType"
-          placeholder="璇烽�夋嫨妫�鏌ョ被鍨�"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in checkTypeStore.getCheckTypeOptions()"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+      </el-form-item> -->
+      <el-form-item label="妫�鏌ラ」鐩�" prop="bookCheckType">
+        <el-select v-model="queryParams.bookCheckType" placeholder="璇烽�夋嫨妫�鏌ラ」鐩�" clearable class="!w-240px">
+          <el-option v-for="dict in checkTypeStore.getCheckTypeOptions()" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
+      </el-form-item>
+      <el-form-item label-width="90" label="鐢宠鍗曠姸鎬�" prop="bookCheckType">
+        <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨" clearable class="!w-240px">
+          <el-option label="鐢宠鍗曞紑绔�" :value="'1'" />
+          <el-option label="鐢宠鍗曟挙閿�" :value="'2'" />
+          <el-option label="妫�鏌ョ櫥璁�" :value="'3'" />
+          <el-option label="鍙栨秷妫�鏌�" :value="'4'" />
+          <el-option label="妫�鏌ュ紑濮�" :value="'5'" />
+          <el-option label="缁欓�犲奖鍓�" :value="'6'" />
+          <el-option label="妫�鏌ョ粨鏉�" :value="'7'" />
+          <el-option label="鎶ュ憡鐢熸垚" :value="'8'" />
+          <el-option label="鎶ュ憡鎾ら攢" :value="'9'" />
+          <el-option label="鎶ュ憡瀹℃牳" :value="'10'" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鐧昏鏃堕棿" prop="registerTime">
+        <el-date-picker v-model="djTime" 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="kdTime" 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="bookSrc">
@@ -91,23 +78,17 @@
       </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:appointment:create']"
-        >
+        <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:appointment:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 鏂板
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['ecg:appointment:export']"
-        >
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['ecg:appointment:export']">
           <Icon icon="ep:download" class="mr-5px" /> 瀵煎嚭
         </el-button>
       </el-form-item>
@@ -116,22 +97,14 @@
 
   <!-- 鍒楄〃 -->
   <ContentWrap>
-    <el-table
-      v-loading="loading"
-      :data="appointmentList"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-    >
-      <el-table-column label="灏辫瘖娴佹按鍙�" align="center" prop="episodeId" min-width="110px" />
-      <el-table-column label="鐢宠鍙�" align="center" prop="applyNo" min-width="110px" />
-      <el-table-column label="缂栧彿" align="center" prop="patId" />
-      <!--
-      <el-table-column label="缂磋垂" align="center" prop="paid">
+    <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="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="120px">
         <template #default="scope">
-          {{scope.row.paid == 1 ? "宸蹭粯" : ""}}
+          {{ getCheckTypeName(scope.row.bookCheckType) }}
         </template>
-      </el-table-column>
--->
+      </el-table-column>      
+      <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
       <el-table-column label="濮撳悕" align="center" min-width="160px">
         <template #default="scope">
           {{ scope.row.patName }}
@@ -139,77 +112,100 @@
           <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="episodeId" min-width="110px" />
+      <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>
+      <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
+      <el-table-column label="鐥呭尯" align="center" prop="patWardDesc" />
+      <el-table-column label="搴婂彿" align="center" prop="patBedNo" />
+      <!--
+      <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="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">
+
+      <el-table-column label="寮�鍗曟椂闂�" align="center" prop="createTime" :formatter="dateFormatter2" width="110px" />
+      <el-table-column label="寮�鍗曞尰鐢�" align="center" prop="doctor" width="110px" /><!-- 闇�姹�1锛氬尰鍢卞彿锛圚IS observationRequest.id.item[root=2.16.156.10011.1.28]锛夈��
+           璇ヨ妭鐐瑰湪瑙勮寖涓潪蹇呴』椤癸紝鍘嗗彶鏁版嵁锛堟柊澧炲垪涔嬪墠閲囬泦鐨勶級涓虹┖锛屾樉绀� '-'銆� -->
+      <el-table-column label="鍖诲槺鍙�" align="center" prop="doctorAdviceNo" min-width="110px">
         <template #default="scope">
-          {{ getCheckTypeName(scope.row.bookCheckType) }}
+          {{ scope.row.doctorAdviceNo || '-' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="鐢熸棩"
-        align="center"
-        prop="patBirthday"
-        :formatter="dateFormatter2"
-        width="110px"
-      />
+      <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" 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" 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>      
+      <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" prop="patBirthday" :formatter="dateFormatter2" width="110px" />
       <el-table-column label="鎵嬫満" align="center" prop="patMobile" />
+      <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" prop="patPhone" />-->
       <!--      <el-table-column label="韬唤璇佸彿" align="center" prop="patIdentityId" />-->
+      <!-- <el-table-column label="绉戝浠g爜" align="center" prop="patDeptCode" /> -->
       <el-table-column label="鍦板潃" align="center" prop="patAddr" />
-      <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="鐥呭尯鍚嶇О" align="center" prop="patWardDesc" />
-      <el-table-column label="搴婂彿" align="center" prop="patBedNo" />
-      <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="200px">
+      <!-- <el-table-column label="鐥呭尯浠g爜" align="center" prop="patWardCode" /> -->
+      <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="220px">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['ecg:appointment:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['ecg:appointment:update']">
             缂栬緫
           </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="statusalter(scope.row)"
-            v-hasPermi="['ecg:appointment:update']"
-          >
-            鐘舵�佷慨鏀�
+          <el-button link type="primary" @click="statusalter(scope.row)" v-hasPermi="['ecg:appointment:update']">
+            <dict-tag v-if="scope.row.status !== null && scope.row.status !== undefined && scope.row.status !== ''"
+              :type="DICT_TYPE.ECG_STATUS" :value="scope.row.status" />
+            <div v-else>鐘舵�佺紪杈�</div>
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['ecg:appointment:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['ecg:appointment:delete']">
             鍒犻櫎
           </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>
-
   <!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
   <AppointmentForm ref="formRef" @event_appointment_success="getList" />
   <!-- 淇敼寮圭獥 -->
@@ -217,8 +213,16 @@
     <el-form :model="form">
       <el-form-item label="鐘舵��" :label-width="formLabelWidth">
         <el-select v-model="form.status" placeholder="璇烽�夋嫨">
-          <el-option label="妫�鏌ョ櫥璁�" :value="3" />
-          <el-option label="鍙栨秷妫�鏌�" :value="4" />
+          <el-option label="鐢宠鍗曞紑绔�" disabled :value="'1'" />
+          <el-option label="鐢宠鍗曟挙閿�" disabled :value="'2'" />
+          <el-option label="妫�鏌ョ櫥璁�" :value="'3'" />
+          <el-option label="鍙栨秷妫�鏌�" :value="'4'" />
+          <el-option label="妫�鏌ュ紑濮�" disabled :value="'5'" />
+          <el-option label="缁欓�犲奖鍓�" disabled :value="'6'" />
+          <el-option label="妫�鏌ョ粨鏉�" disabled :value="'7'" />
+          <el-option label="鎶ュ憡鐢熸垚" disabled :value="'8'" />
+          <el-option label="鎶ュ憡鎾ら攢" disabled :value="'9'" />
+          <el-option label="鎶ュ憡瀹℃牳" disabled :value="'10'" />
         </el-select>
       </el-form-item>
     </el-form>
@@ -241,11 +245,16 @@
 import AppointmentForm from './AppointmentForm.vue'
 import { useCheckTypeStore } from '@/store/modules/checkType'
 import { getCheckTypeName } from '../../../utils/checkTypeFormatter'
+// 闇�姹�1锛氬勾榫� / 璺濅粖澶╂暟 / 鏃ユ湡鏍煎紡鍖栵紙搴撲腑鏃犲搴斿垪锛岄渶瀹炴椂璁$畻锛�
+import { formatAge, formatDaysFromOrder, formatDateTime, resolveCardNo } from '@/utils/patientInfo'
 import { status } from 'nprogress'
 import { log } from 'node:console'
 
-/** 棰勭害 鍒楄〃 */
-defineOptions({ name: 'Appointment' })
+/** 棰勭害鐢宠鍗� 鍒楄〃 */
+// 娉ㄦ剰锛氭湰椤碉紙棰勭害鐢宠鍗曪級涓� appointment/index.vue锛堥绾﹁褰曪級鍘熸湰閮藉0鏄� name: 'Appointment'锛�
+// 浼氫娇涓よ�呰矾鐢� name 鐩稿悓 鈫� keep-alive 缂撳瓨閿啿绐� 鈫� 鍒囨崲鏍囩椤垫椂鍙兘浜掔浉鏄剧ず瀵规柟鐨勭紦瀛樺唴瀹广��
+// 鏀圭敤鍞竴鍚嶇О锛屽苟涓庤彍鍗� system_menu(id=2855).component_name 淇濇寔涓�鑷淬��
+defineOptions({ name: 'AppointmentAlter' })
 
 const message = useMessage() // 娑堟伅寮圭獥
 const { t } = useI18n() // 鍥介檯鍖�
@@ -256,8 +265,17 @@
 const form = ref({
   status: ''
 }) // 淇敼鐘舵�佹暟鎹�
+const djTime = ref([])
+
+const kdTime = ref([])
+
 const queryParams = reactive({
   pageNo: 1,
+  status: undefined,
+  registerDateStart: null,
+  registerDateEnd: null,
+  createTimestart: null,
+  createTimeEnd: null,
   pageSize: 10,
   applyNo: undefined,
   patId: undefined,
@@ -287,6 +305,8 @@
 
 /** 鏌ヨ鍒楄〃 */
 const getList = async () => {
+  console.log(queryParams, 'queryParams')
+
   loading.value = true
   try {
     const data = await AppointmentApi.getAppointmentPage(queryParams)
@@ -300,6 +320,10 @@
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
   queryParams.pageNo = 1
+  queryParams.registerDateStart = djTime.value[0] || null
+  queryParams.registerDateEnd = djTime.value[1] || null
+  queryParams.createTimestart = kdTime.value[0] || null
+  queryParams.createTimeEnd = kdTime.value[1] || null
   getList()
 }
 
@@ -325,7 +349,8 @@
   }).then(() => {
     console.log(form, 'form')
     AppointmentApi.alterAppointment(form)
-    dialogFormVisible.value = true
+    message.success('淇敼鎴愬姛')
+    dialogFormVisible.value = false
   })
 }
 
@@ -339,7 +364,7 @@
     message.success(t('common.delSuccess'))
     // 鍒锋柊鍒楄〃
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.3