From 6657e1941f1b517c66a47ec14ef5ed65afb75e21 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 17:27:20 +0800
Subject: [PATCH] update

---
 src/views/ecg/appointment/index.vue |  123 +++++++++++++++++-----------------------
 1 files changed, 53 insertions(+), 70 deletions(-)

diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index 772c911..e8e07c1 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -34,7 +34,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -78,46 +78,46 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="鎮h�呭湴鍧�" prop="patAddr">
+      <el-form-item label="鍦板潃" prop="patAddr">
         <el-input
           v-model="queryParams.patAddr"
-          placeholder="璇疯緭鍏ユ偅鑰呭湴鍧�"
+          placeholder="璇疯緭鍏ュ湴鍧�"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="鎮h�呮墍鍦ㄧ瀹や唬鐮�" prop="patDeptCode">
+      <el-form-item label="绉戝浠g爜" prop="patDeptCode">
         <el-input
           v-model="queryParams.patDeptCode"
-          placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ瀹や唬鐮�"
+          placeholder="璇疯緭鍏ョ瀹や唬鐮�"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="鎮h�呮墍鍦ㄧ瀹ゅ悕绉�" prop="patDeptDesc">
+      <el-form-item label="绉戝" prop="patDeptDesc">
         <el-input
           v-model="queryParams.patDeptDesc"
-          placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ瀹ゅ悕绉�"
+          placeholder="璇疯緭鍏ョ瀹ゅ悕绉�"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="鎮h�呮墍鍦ㄧ梾鍖轰唬鐮�" prop="patWardCode">
+      <el-form-item label="鐥呭尯浠g爜" prop="patWardCode">
         <el-input
           v-model="queryParams.patWardCode"
-          placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ梾鍖轰唬鐮�"
+          placeholder="璇疯緭鍏ョ梾鍖轰唬鐮�"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="鎮h�呮墍鍦ㄧ梾鍖哄悕绉�" prop="patWardDesc">
+      <el-form-item label="鐥呭尯" prop="patWardDesc">
         <el-input
           v-model="queryParams.patWardDesc"
-          placeholder="璇疯緭鍏ユ偅鑰呮墍鍦ㄧ梾鍖哄悕绉�"
+          placeholder="璇疯緭鍏ョ梾鍖哄悕绉�"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -141,45 +141,25 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="棰勭害妫�鏌ユ椂闂存" prop="bookPeriodStart">
-        <el-date-picker
-          v-model="queryParams.bookPeriodStart"
-          value-format="YYYY-MM-DD"
-          type="date"
-          placeholder="閫夋嫨棰勭害妫�鏌ユ椂闂存"
-          clearable
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="棰勭害妫�鏌ユ椂闂存" prop="bookPeriodEnd">
-        <el-date-picker
-          v-model="queryParams.bookPeriodEnd"
-          value-format="YYYY-MM-DD"
-          type="date"
-          placeholder="閫夋嫨棰勭害妫�鏌ユ椂闂存"
-          clearable
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="棰勭害妫�鏌ョ被鍨�" prop="bookCheckType">
+      <el-form-item label="妫�鏌ョ被鍨�" prop="bookCheckType">
         <el-select
           v-model="queryParams.bookCheckType"
-          placeholder="璇烽�夋嫨棰勭害妫�鏌ョ被鍨�"
+          placeholder="璇烽�夋嫨妫�鏌ョ被鍨�"
           clearable
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.ECG_CHECK_TYPE)"
+            v-for="dict in checkTypeStore.getCheckTypeOptions()"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�" prop="bookSrc">
+      <el-form-item label="棰勭害鏉ユ簮" prop="bookSrc">
         <el-input
           v-model="queryParams.bookSrc"
-          placeholder="璇疯緭鍏ラ绾︽潵婧愶細X绯荤粺銆佹姢澹墜鍔ㄩ绾�"
+          placeholder="璇疯緭鍏ラ绾︽潵婧�"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -212,51 +192,51 @@
   <!-- 鍒楄〃 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
-      <el-table-column label="鎮h�呭鍚�" align="center" prop="patName" />
-      <el-table-column label="鎮h�呮�у埆" align="center" prop="patGender">
+      <el-table-column label="缂栧彿" align="center" prop="patId" />
+      <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="patName" />
+      <el-table-column label="鎬у埆" align="center" prop="patGender">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
         </template>
       </el-table-column>
-      <el-table-column label="鎮h�呯敓鏃�" align="center" prop="patBirthday" />
-      <el-table-column label="鎮h�呮墜鏈�" align="center" prop="patMobile" />
-      <el-table-column label="鎮h�呯數璇�" align="center" prop="patPhone" />
+      <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="鎮h�呭湴鍧�" align="center" prop="patAddr" />
-      <el-table-column label="鎮h�呮墍鍦ㄧ瀹や唬鐮�" align="center" prop="patDeptCode" />
-      <el-table-column label="鎮h�呮墍鍦ㄧ瀹ゅ悕绉�" align="center" prop="patDeptDesc" />
-      <el-table-column label="鎮h�呮墍鍦ㄧ梾鍖轰唬鐮�" align="center" prop="patWardCode" />
-      <el-table-column label="鎮h�呮墍鍦ㄧ梾鍖哄悕绉�" align="center" prop="patWardDesc" />
+      <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="棰勭害缂栧彿" align="center" prop="bookId" />
       <el-table-column
-        label="棰勭害妫�鏌ユ椂闂存"
+        label="棰勭害鏃ユ湡"
         align="center"
-        prop="bookPeriodStart"
-        :formatter="dateFormatter"
-        width="180px"
+        prop="bookDate"
+        :formatter="dateFormatter2"
+        width="120px"
       />
-      <el-table-column
-        label="棰勭害妫�鏌ユ椂闂存"
-        align="center"
-        prop="bookPeriodEnd"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column
-        label="棰勭害鍙戠敓鏃堕棿"
-        align="center"
-        prop="bookTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="棰勭害妫�鏌ョ被鍨�" align="center" prop="bookCheckType">
+      <el-table-column label="棰勭害鏃堕棿娈�" align="center" prop="bookTimeslot" width="100px">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ECG_CHECK_TYPE" :value="scope.row.bookCheckType" />
+          <dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
         </template>
       </el-table-column>
-      <el-table-column label="棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�" align="center" prop="bookSrc" />
+      <el-table-column label="棰勭害妫�鏌ョ被鍨�" align="center" prop="bookCheckType">
+        <template #default="scope">
+          {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="棰勭害鏉ユ簮" align="center" prop="bookSrc">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ECG_BOOK_SRC" :value="scope.row.bookSrc" />
+        </template>
+      </el-table-column>
       <el-table-column label="鎿嶄綔" align="center" min-width="120px">
         <template #default="scope">
           <el-button
@@ -292,11 +272,12 @@
 </template>
 
 <script setup lang="ts">
-import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
+import { dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { AppointmentApi, AppointmentVO } from '@/api/ecg/appointment'
 import AppointmentForm from './AppointmentForm.vue'
+import {useCheckTypeStore} from "@/store/modules/checkType";
 
 /** 棰勭害 鍒楄〃 */
 defineOptions({ name: 'Appointment' })
@@ -332,6 +313,8 @@
 const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
 const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
 
+const checkTypeStore = useCheckTypeStore();
+
 /** 鏌ヨ鍒楄〃 */
 const getList = async () => {
   loading.value = true

--
Gitblit v1.9.3