From 0365790f2dcee6af41637289b6c5a54e520e1475 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 07 八月 2024 18:19:57 +0800
Subject: [PATCH] 预约功能
---
src/views/ecg/appointment/index.vue | 69 +++++++++++-----------------------
src/api/ecg/appointment/index.ts | 4 +-
src/views/ecg/appointment/AppointmentForm.vue | 5 +-
src/utils/dict.ts | 1
4 files changed, 27 insertions(+), 52 deletions(-)
diff --git a/src/api/ecg/appointment/index.ts b/src/api/ecg/appointment/index.ts
index e3e4960..ed0ee0f 100644
--- a/src/api/ecg/appointment/index.ts
+++ b/src/api/ecg/appointment/index.ts
@@ -16,8 +16,8 @@
patWardDesc: string // 鎮ｈ�呮墍鍦ㄧ梾鍖哄悕绉�
patBedNo: string // 搴婂彿
bookId: string // 棰勭害缂栧彿
- bookPeriodStart: Date // 棰勭害妫�鏌ユ椂闂存
- bookPeriodEnd: Date // 棰勭害妫�鏌ユ椂闂存
+ bookDate: Date // 棰勭害鏃ユ湡
+ bookTimeslot: number // 棰勭害鏃堕棿娈�
bookTime: Date // 棰勭害鍙戠敓鏃堕棿
bookCheckType: boolean // 棰勭害妫�鏌ョ被鍨�
}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index cdc7547..43e15e8 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -145,6 +145,7 @@
// ========== ECG 妯″潡 ==========
ECG_BOOK_TIMESLOT = 'ecg_book_timeslot',
ECG_CHECK_TYPE = 'ecg_check_type',
+ ECG_BOOK_SRC = 'ecg_book_src',
// ========== BPM 妯″潡 ==========
BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
diff --git a/src/views/ecg/appointment/AppointmentForm.vue b/src/views/ecg/appointment/AppointmentForm.vue
index 2aea537..f10b1fa 100644
--- a/src/views/ecg/appointment/AppointmentForm.vue
+++ b/src/views/ecg/appointment/AppointmentForm.vue
@@ -30,7 +30,6 @@
type="date"
value-format="x"
placeholder="閫夋嫨棰勭害鏃ユ湡"
- :default-value="new Date()"
/>
</el-form-item>
<el-form-item label="棰勭害鏃堕棿娈�" prop="bookTimeslot">
@@ -125,7 +124,7 @@
patBedNo: undefined,
bookId: undefined,
bookTime: undefined,
- bookDate: new Date(),
+ bookDate: new Date().getTime(),
bookTimeslot: 10001015,
bookCheckType: 10
})
@@ -199,7 +198,7 @@
patBedNo: undefined,
bookId: undefined,
bookTime: undefined,
- bookDate: new Date(),
+ bookDate: new Date().getTime(),
bookTimeslot: 10001015,
bookCheckType: 10
}
diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index 772c911..fa7dd21 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"
@@ -141,26 +141,6 @@
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-select
v-model="queryParams.bookCheckType"
@@ -169,7 +149,7 @@
class="!w-240px"
>
<el-option
- v-for="dict in getBoolDictOptions(DICT_TYPE.ECG_CHECK_TYPE)"
+ v-for="dict in getIntDictOptions(DICT_TYPE.ECG_CHECK_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@@ -219,44 +199,39 @@
<dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
</template>
</el-table-column>
- <el-table-column label="鎮ｈ�呯敓鏃�" align="center" prop="patBirthday" />
+ <el-table-column label="鎮ｈ�呯敓鏃�" align="center" prop="patBirthday" :formatter="dateFormatter2"/>
<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" prop="patDeptCode" />
- <el-table-column label="鎮ｈ�呮墍鍦ㄧ瀹ゅ悕绉�" align="center" prop="patDeptDesc" />
- <el-table-column label="鎮ｈ�呮墍鍦ㄧ梾鍖轰唬鐮�" align="center" prop="patWardCode" />
- <el-table-column label="鎮ｈ�呮墍鍦ㄧ梾鍖哄悕绉�" align="center" prop="patWardDesc" />
+ <el-table-column label="绉戝浠ｇ爜" align="center" prop="patDeptCode" />
+ <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
+ <el-table-column label="鐥呭尯浠ｇ爜" 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"
+ prop="bookDate"
+ :formatter="dateFormatter2"
width="180px"
/>
- <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="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">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ECG_CHECK_TYPE" :value="scope.row.bookCheckType" />
</template>
</el-table-column>
- <el-table-column label="棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�" align="center" prop="bookSrc" />
+ <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,8 +267,8 @@
</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'
--
Gitblit v1.9.3