From d9020ea85395682af5621a6de6bf073d9ee5d086 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 29 十一月 2024 15:18:12 +0800
Subject: [PATCH] update
---
src/views/ecg/appointment/index.vue | 54 ++++++++++++--------------
src/api/ecg/appointment/index.ts | 3 -
src/store/modules/checkType.ts | 2
src/views/ecg/queue/index.vue | 6 ++-
src/views/ecg/checktype/CheckTypeForm.vue | 9 ++--
5 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/src/api/ecg/appointment/index.ts b/src/api/ecg/appointment/index.ts
index 962b361..fbb1e29 100644
--- a/src/api/ecg/appointment/index.ts
+++ b/src/api/ecg/appointment/index.ts
@@ -3,7 +3,7 @@
// 棰勭害 VO
export interface AppointmentVO {
id: number,
- applyNo: string
+ applyNo: string // 棰勭害鐢宠缂栧彿
episodeId: number //灏辫瘖娴佹按鍙�
patSrc: number
patId: string // 鎮ｈ�呯紪鍙�
@@ -19,7 +19,6 @@
patWardCode: string // 鎮ｈ�呮墍鍦ㄧ梾鍖轰唬鐮�
patWardDesc: string // 鎮ｈ�呮墍鍦ㄧ梾鍖哄悕绉�
patBedNo: string // 搴婂彿
- bookId: string // 棰勭害缂栧彿
bookDate: Date // 棰勭害鏃ユ湡
bookTimeslot: number // 棰勭害鏃堕棿娈�
bookTime: Date // 棰勭害鍙戠敓鏃堕棿, 鐐瑰嚮棰勭害鐨勬椂闂�
diff --git a/src/store/modules/checkType.ts b/src/store/modules/checkType.ts
index c282975..459548c 100644
--- a/src/store/modules/checkType.ts
+++ b/src/store/modules/checkType.ts
@@ -8,7 +8,7 @@
export interface CheckTypeSimpleVO {
value: number
name: string
- displayBarcode: number
+ displayBarcode: []
notes: string
}
export interface CheckTypeState {
diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index a5d4912..a380376 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -55,9 +55,9 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="棰勭害缂栧彿" prop="bookId">
+ <el-form-item label="棰勭害缂栧彿" prop="applyNo">
<el-input
- v-model="queryParams.bookId"
+ v-model="queryParams.applyNo"
placeholder="璇疯緭鍏ラ绾︾紪鍙�"
clearable
@keyup.enter="handleQuery"
@@ -117,52 +117,49 @@
<!-- 鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="appointmentList" :stripe="true" :show-overflow-tooltip="true">
- <el-table-column label="灏辫瘖娴佹按鍙�" align="center" prop="episodeId" min-width="150px"/>
+ <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">
<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">
+-->
+ <el-table-column label="濮撳悕" align="center" min-width="160px">
<template #default="scope">
- <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
+ {{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="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" 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="棰勭害鏃ユ湡"
- align="center"
- prop="bookDate"
- :formatter="dateFormatter2"
- width="120px"
+ 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">
+ <el-table-column label="棰勭害妫�鏌ョ被鍨�" align="center" prop="bookCheckType" min-width="120px">
<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" 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" 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" min-width="120px">
<template #default="scope">
<el-button
@@ -230,7 +227,6 @@
patWardCode: undefined,
patWardDesc: undefined,
patBedNo: undefined,
- bookId: undefined,
bookDate: undefined,
bookTimeslot: undefined,
bookCheckType: undefined,
diff --git a/src/views/ecg/checktype/CheckTypeForm.vue b/src/views/ecg/checktype/CheckTypeForm.vue
index 11afbe8..6183458 100644
--- a/src/views/ecg/checktype/CheckTypeForm.vue
+++ b/src/views/ecg/checktype/CheckTypeForm.vue
@@ -29,10 +29,10 @@
<el-form-item label="鏄剧ず鎮ｈ�呮潯鐮�" prop="displayBarcode">
<el-checkbox-group v-model="formData.displayBarcode">
<el-checkbox
- v-for="(dict, index) in getDictOptions(DICT_TYPE.ECG_PAT_SOURCE)"
+ v-for="(dict, index) in getIntDictOptions(DICT_TYPE.ECG_PAT_SOURCE)"
:key="index"
:label="dict.label"
- :value="dict.value"
+ :value=dict.value
/>
</el-checkbox-group>
</el-form-item>
@@ -63,7 +63,7 @@
<script setup lang="ts">
import { CheckTypeApi, CheckTypeVO } from '@/api/ecg/checktype'
import {useCheckTypeStore} from "@/store/modules/checkType";
-import {DICT_TYPE, getDictOptions} from "@/utils/dict";
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
/** 妫�鏌ョ被鍨� 琛ㄥ崟 */
defineOptions({ name: 'CheckTypeForm' })
@@ -150,7 +150,8 @@
expenseRecognition: undefined,
timeslotBookNum: undefined,
timeslotReservedNum: undefined,
- affinityCheckTypes: []
+ affinityCheckTypes: [],
+ notes: undefined
}
formRef.value?.resetFields()
}
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 669df7d..5208bc0 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -180,11 +180,13 @@
</template>
</el-table-column>
<!-- <el-table-column label="id" align="center" prop="id" />-->
- <el-table-column label="灏辫瘖娴佹按鍙�" align="center" prop="episodeId" min-width="150px"/>
+ <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" min-width="120px">
+ <el-table-column label="鎮ｈ�呭鍚�" align="center" min-width="160px">
<template #default="scope">
{{scope.row.patName}} ({{genderFormat(scope.row.patGender)}})
+ <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patDetails?.source" />
</template>
</el-table-column>
<el-table-column label="妫�鏌ョ被鍨�" align="center" prop="bookCheckType" min-width="100px">
--
Gitblit v1.9.3