From 8b78c320b11458e7a16c0dd3b95794c93d32f644 Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Mon, 12 May 2025 12:56:32 +0800 Subject: [PATCH 01/10] dev --- src/assets/scss/base.scss | 2 +- src/components/charge/ChargeQueue.vue | 3 +- src/components/charge/PatientCard.vue | 6 +- src/components/charge/RecordsLog.vue | 25 +++--- src/components/charge/RecordsLog/Detail.vue | 10 ++- src/components/common/Calendar.vue | 59 +++++++++----- src/components/common/Header.vue | 51 ++++++++---- src/components/outpatient/Case.vue | 52 ++++++------ src/components/outpatient/MedicalHistory.vue | 2 +- src/utils/dateUtils.ts | 2 - src/views/charge/index.vue | 15 +++- src/views/outpatient/index.vue | 5 +- src/views/registration/index.vue | 85 +++++++++++++------- 13 files changed, 197 insertions(+), 120 deletions(-) diff --git a/src/assets/scss/base.scss b/src/assets/scss/base.scss index 585658c..f38ba29 100644 --- a/src/assets/scss/base.scss +++ b/src/assets/scss/base.scss @@ -18,7 +18,7 @@ $border-color-extra-light: #F2F6FC; // 背景颜色 $background-color-base: #eee; -$background-color-main: #5078c8; +$background-color-main: #4D6DE4; // 边框圆角 $border-radius-base: 4px; diff --git a/src/components/charge/ChargeQueue.vue b/src/components/charge/ChargeQueue.vue index 9f774bd..b741ca5 100644 --- a/src/components/charge/ChargeQueue.vue +++ b/src/components/charge/ChargeQueue.vue @@ -70,7 +70,7 @@ import {CaretBottom} from "@element-plus/icons-vue"; import {apiConfig} from "@/assets/config/apiConfig.ts"; const curItem = ref({}); -const emit = defineEmits(['clickItem']) +const emit = defineEmits(['clickItem','getStatus']) const clickItem = (item: any) => { curItem.value = item emit('clickItem', item, query.value.status); @@ -141,6 +141,7 @@ const statusList = ref([ ]) const tab = (item: any) => { query.value.status = item.value + emit('getStatus', item.value) init() } const getTipCount = () => { diff --git a/src/components/charge/PatientCard.vue b/src/components/charge/PatientCard.vue index fd5146d..c7de250 100644 --- a/src/components/charge/PatientCard.vue +++ b/src/components/charge/PatientCard.vue @@ -11,7 +11,7 @@
{{ seeDockerInfo?.patientInfo?.name }} - {{ seeDockerInfo?.patientInfo?.age}} + {{ seeDockerInfo?.patientInfo?.age||0}}岁
{{ seeDockerInfo?.patientInfo?.phone }} @@ -26,11 +26,11 @@ class="detail-doctor">{{ seeDockerInfo?.dockerName }}-{{ seeDockerInfo?.sectionName }}
-
费用类别: 医保
+
费用类别: {{seeDockerInfo?.feeTypeName||'-'}}
医保卡剩余金额: {{ seeDockerInfo?.socialBalance }}元
上次就诊时间: {{ - formatDate(seeDockerInfo?.lastSeeDoctorTime) + formatDate(seeDockerInfo?.lastSeeDoctorTime)||'-' }}
diff --git a/src/components/charge/RecordsLog.vue b/src/components/charge/RecordsLog.vue index 1ee2f4c..9b7e714 100644 --- a/src/components/charge/RecordsLog.vue +++ b/src/components/charge/RecordsLog.vue @@ -6,16 +6,9 @@
@@ -32,9 +25,9 @@ import Panel from '@/components/common/Panel.vue'; import Detail from './RecordsLog/Detail.vue'; import {post} from "@/utils/request.ts"; import {ref} from "vue"; +import {formatListTime} from "@/utils/dateUtils.ts"; + const list = ref([]) - - const init = (patientId: any) => { const query = { patientId: patientId, @@ -42,6 +35,7 @@ const init = (patientId: any) => { } post('charge/listDetail', {query}).then((res: any) => { list.value = res.list + console.log(list,'list') }) } const clearList = () => { @@ -61,14 +55,19 @@ defineExpose({init,clearList}) justify-content: space-between; .disease-name { - width: 135px; + width: 90px; overflow: hidden; /* 隐藏溢出的内容 */ white-space: nowrap; /* 防止文本换行 */ text-overflow: ellipsis; /* 显示省略号 */ + text-align: left; } .doctor { - width: 85px; + width: 80px; + } + .time{ + display: inline-block; + overflow: hidden; } } } diff --git a/src/components/charge/RecordsLog/Detail.vue b/src/components/charge/RecordsLog/Detail.vue index f6602fa..2a37a17 100644 --- a/src/components/charge/RecordsLog/Detail.vue +++ b/src/components/charge/RecordsLog/Detail.vue @@ -44,10 +44,10 @@
-
+
合计
-
￥{{ sumPrice }}
+
￥{{ sumPrice }}
@@ -143,6 +143,12 @@ onMounted(() => { .price-left { margin-right: 38px; } + .sumPrice{ + font-weight: bold; + font-size: 16px; + color: #FF0000; + font-style: normal; + } } } } diff --git a/src/components/common/Calendar.vue b/src/components/common/Calendar.vue index aef8ee5..795645b 100644 --- a/src/components/common/Calendar.vue +++ b/src/components/common/Calendar.vue @@ -75,6 +75,7 @@ console.log(calendarData); \ No newline at end of file diff --git a/src/components/outpatient/MedicalHistory.vue b/src/components/outpatient/MedicalHistory.vue index 2cd4b54..3f9b3b3 100644 --- a/src/components/outpatient/MedicalHistory.vue +++ b/src/components/outpatient/MedicalHistory.vue @@ -25,7 +25,7 @@ import Panel from '@/components/common/Panel.vue'; import DiseaseDetails from './DiseaseDetails.vue'; import {post} from "@/utils/request.ts"; import {ref} from "vue"; -import {formatListTime} from "../../utils/dateUtils.ts"; +import {formatListTime} from "@/utils/dateUtils.ts"; const list = ref([]) const init = (patientId: any) => { post("medical/record/listByPatient",{patientId:patientId}).then((res: any) => { diff --git a/src/utils/dateUtils.ts b/src/utils/dateUtils.ts index 403c6aa..3e674e5 100644 --- a/src/utils/dateUtils.ts +++ b/src/utils/dateUtils.ts @@ -30,11 +30,9 @@ export const formatListTime = (date: any) => { } else if (typeof date === 'string') { dateDetail = new Date(date); if (isNaN(dateDetail.getTime())) { - console.error(`Invalid date string: ${date}`); return '-'; } } else { - console.error(`Invalid date type: ${typeof date}`); return '-'; } const year = dateDetail.getFullYear(); diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue index 5e98816..6c32266 100644 --- a/src/views/charge/index.vue +++ b/src/views/charge/index.vue @@ -1,7 +1,7 @@