From 4400856b415e254bed5082005bd2ea45285047c5 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 24 六月 2025 09:41:44 +0800
Subject: [PATCH] 11
---
src/views/ecg/doctor/components/RoutinePanel.vue | 11 -
src/views/ecg/appointment/index.vue | 33 +++++
src/views/ecg/appointment/AppointmentConfirm.vue | 167 ++++++++++++++++----------------
src/views/ecg/appointment/AppointmentForm.vue | 8
src/views/ecg/doctor/components/DevInstallPanel.vue | 11 -
src/views/ecg/appointment/alter.vue | 17 ++-
src/views/ecg/doctor/components/DevReadyPanel.vue | 11 -
7 files changed, 134 insertions(+), 124 deletions(-)
diff --git a/src/views/ecg/appointment/AppointmentConfirm.vue b/src/views/ecg/appointment/AppointmentConfirm.vue
index 2ab1298..4066432 100644
--- a/src/views/ecg/appointment/AppointmentConfirm.vue
+++ b/src/views/ecg/appointment/AppointmentConfirm.vue
@@ -1,90 +1,93 @@
<template>
- <div style="display: flex; justify-content: center; ">
-
- <el-form-item label="鎮ｈ�呯紪鍙�" >
- <el-input v-model="queryParams.patId" placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�" clearable @input="searchBookInfo" />
+ <div style="display: flex; justify-content: center">
+ <el-form-item label="鎮ｈ�呯紪鍙�">
+ <el-input
+ v-model="queryParams.patId"
+ placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
+ clearable
+ @input="searchBookInfo"
+ />
</el-form-item>
</div>
- <div style="color: #ff0000; text-align: center; font-size: 12px; margin-top: 4px;">
- <i class="el-icon-warning" style="margin-right: 4px;"></i>
+ <div style="color: #ff0000; text-align: center; font-size: 12px; margin-top: 4px">
+ <i class="el-icon-warning" style="margin-right: 4px"></i>
鏀寔韬唤璇佸彿锛岀敵璇峰崟鍙凤紝灏辫瘖娴佹按鍙凤紝浣忛櫌鍙�
</div>
<div style="display: flex; flex-wrap: wrap; justify-content: center; margin-bottom: 20px">
<div v-for="(_appointment, index) in appointmentVOList" :key="index">
- <CheckItemPanel :appointment="_appointment" @event_appoint_confirm="onEventAppointConfirm"/>
+ <CheckItemPanel :appointment="_appointment" @event_appoint_confirm="onEventAppointConfirm" />
</div>
</div>
- <el-divider/>
+ <el-divider />
- <el-form
- ref="formRef"
- :model="formData"
- label-width="100px"
- class="two-column-form"
- >
+ <el-form ref="formRef" :model="formData" label-width="100px" class="two-column-form">
<div class="form-row">
<el-form-item label="鎮ｈ�呭鍚�" prop="patName">
<el-input v-model="formData.patName" placeholder="鎮ｈ�呭鍚�" readonly />
</el-form-item>
-
+
<el-form-item label="鎮ｈ�呯敓鏃�" prop="patBirthday">
<el-date-picker
- v-model="formData.patBirthday"
- type="date"
- value-format="x"
- placeholder="閫夋嫨鎮ｈ�呯敓鏃�"
- readonly
+ v-model="formData.patBirthday"
+ type="date"
+ value-format="x"
+ placeholder="閫夋嫨鎮ｈ�呯敓鏃�"
+ readonly
/>
</el-form-item>
</div>
<div class="form-row">
- <el-form-item label="鎮ｈ�呮�у埆" prop="patGender">
+ <el-form-item label="鎮ｈ�呮�у埆" prop="patGender">
<el-radio-group v-model="formData.patGender" readonly>
<el-radio
- v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
- :key="dict.value"
- :value="dict.value">
+ v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+ :key="dict.value"
+ :value="dict.value"
+ >
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鏄惁澶氳��" prop="tolerance">
- <el-radio-group v-model="formData.tolerance" readonly>
+ <el-tag type="info" v-if="formData.tolerance == 0">鍚�</el-tag>
+ <el-tag type="danger" v-else>鏄�</el-tag>
+ <!-- <el-radio-group v-model="formData.tolerance" readonly>
<el-radio
- v-for="dict in getIntDictOptions(DICT_TYPE.ecg_tolerance)"
- :key="dict.value"
- :value="dict.value">
+ v-for="dict in getIntDictOptions(DICT_TYPE.ecg_tolerance)"
+ :key="dict.value"
+ :value="dict.value"
+ >
{{ dict.label }}
</el-radio>
- </el-radio-group>
+ </el-radio-group> -->
</el-form-item>
</div>
<div class="form-row">
- <el-form-item label="鎮ｈ�呮墜鏈�" prop="patMobile" >
+ <el-form-item label="鎮ｈ�呮墜鏈�" prop="patMobile">
<el-input v-model="formData.patMobile" placeholder="璇疯緭鍏ユ偅鑰呮墜鏈�" readonly />
</el-form-item>
-<!--
+ <!--
<el-form-item label="鎮ｈ�呯數璇�" prop="patPhone" readonly>
<el-input v-model="formData.patPhone" placeholder="璇疯緭鍏ユ偅鑰呯數璇�" />
</el-form-item>
-->
- <el-form-item label="韬唤璇佸彿" prop="patIdentityId" >
+ <el-form-item label="韬唤璇佸彿" prop="patIdentityId">
<el-input v-model="formData.patIdentityId" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" readonly />
</el-form-item>
</div>
<div class="form-row">
-<!--
+ <!--
<el-form-item label="鐥呭尯浠ｇ爜" prop="patWardCode" readonly>
<el-input v-model="formData.patWardCode" placeholder="璇疯緭鍏ョ梾鍖轰唬鐮�" />
</el-form-item>
-->
- <el-form-item label="鐥呭尯鍚嶇О" prop="patWardDesc" >
+ <el-form-item label="鐥呭尯鍚嶇О" prop="patWardDesc">
<el-input v-model="formData.patWardDesc" placeholder="璇疯緭鍏ョ梾鍖哄悕绉�" readonly />
</el-form-item>
- <el-form-item label="搴婂彿" prop="patBedNo" >
+ <el-form-item label="搴婂彿" prop="patBedNo">
<el-input v-model="formData.patBedNo" placeholder="璇疯緭鍏ュ簥鍙�" readonly />
</el-form-item>
</div>
@@ -94,130 +97,127 @@
<el-input v-model="formData.patDeptCode" placeholder="璇疯緭鍏ョ瀹や唬鐮�" />
</el-form-item>
-->
- <el-form-item label="绉戝鍚嶇О" prop="patDeptDesc" >
- <el-input v-model="formData.patDeptDesc" placeholder="璇疯緭鍏ョ瀹ゅ悕绉�" readonly/>
+ <el-form-item label="绉戝鍚嶇О" prop="patDeptDesc">
+ <el-input v-model="formData.patDeptDesc" placeholder="璇疯緭鍏ョ瀹ゅ悕绉�" readonly />
</el-form-item>
<el-form-item label="鎮ｈ�呭湴鍧�" prop="patAddr">
- <el-input v-model="formData.patAddr" placeholder="璇疯緭鍏ユ偅鑰呭湴鍧�" readonly/>
+ <el-input v-model="formData.patAddr" placeholder="璇疯緭鍏ユ偅鑰呭湴鍧�" readonly />
</el-form-item>
</div>
</el-form>
</template>
<script setup lang="ts">
-import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { AppointmentApi, AppointmentVO } from '@/api/ecg/appointment'
-import CheckItemPanel from "@/views/ecg/appointment/CheckItemPanel.vue";
-import {getCheckTypeName} from "@/utils/checkTypeFormatter";
+import CheckItemPanel from '@/views/ecg/appointment/CheckItemPanel.vue'
+import { getCheckTypeName } from '@/utils/checkTypeFormatter'
/** 棰勭害纭 琛ㄥ崟 */
defineOptions({ name: 'AppointmentConfirm' })
const queryParams = reactive({
- patId: ''
+ patId: ''
})
const appointmentVOList = ref<AppointmentVO[]>([])
const formData = ref<AppointmentVO>({
id: 0,
- applyNo: "",
- episodeId: "",
+ applyNo: '',
+ episodeId: '',
patSrc: 0,
- patId: "",
- patName: "",
- tolerance:0,
+ patId: '',
+ patName: '',
+ tolerance: 0,
patGender: 1, // 1 鐢� 2 濂�
patBirthday: new Date(),
- patMobile: "",
- patPhone: "",
- patIdentityId: "",
- patAddr: "",
- patDeptCode: "",
- patDeptDesc: "",
- patWardCode: "",
- patWardDesc: "",
- patBedNo: "",
+ patMobile: '',
+ patPhone: '',
+ patIdentityId: '',
+ patAddr: '',
+ patDeptCode: '',
+ patDeptDesc: '',
+ patWardCode: '',
+ patWardDesc: '',
+ patBedNo: '',
bookTime: new Date(),
bookDate: new Date(),
bookTimeslot: 9301030,
bookCheckType: getCheckTypeName(100),
paid: 0,
- bookSeqNum: 0,
+ bookSeqNum: 0
})
const formRef = ref() // 琛ㄥ崟 Ref
const searchBookInfo = async () => {
resetForm()
- if (null === queryParams.patId || "" === queryParams.patId.trim())
- return
+ if (null === queryParams.patId || '' === queryParams.patId.trim()) return
const _patId = queryParams.patId.trim()
- console.warn("===" + _patId + "===")
+ console.warn('===' + _patId + '===')
const data = await AppointmentApi.queryAndCreateAppointmentByPatId(_patId) // 瀵瑰簲鏁版嵁搴撲腑 pat_id
- console.info( data )
+ console.info(data)
if (null !== data && data.length > 0) {
formData.value = data[0]
appointmentVOList.value = data
- console.info( formData.value )
+ console.info(formData.value)
return
}
ElNotification({
title: '娓╅Θ鎻愮ず',
- message: "璇峰厛棰勭害",
+ message: '璇峰厛棰勭害',
type: 'warning'
})
}
/** 閲嶇疆琛ㄥ崟 */
const resetForm = () => {
- appointmentVOList.value.length=0;
+ appointmentVOList.value.length = 0
formData.value = {
id: 0,
- applyNo: "",
- episodeId: "",
+ applyNo: '',
+ episodeId: '',
patSrc: 0,
- patId: "",
- patName: "",
- tolerance:0,
+ patId: '',
+ patName: '',
+ tolerance: 0,
patGender: 1, // 1 鐢� 2 濂�
patBirthday: new Date(),
- patMobile: "",
- patPhone: "",
- patIdentityId: "",
- patAddr: "",
- patDeptCode: "",
- patDeptDesc: "",
- patWardCode: "",
- patWardDesc: "",
- patBedNo: "",
+ patMobile: '',
+ patPhone: '',
+ patIdentityId: '',
+ patAddr: '',
+ patDeptCode: '',
+ patDeptDesc: '',
+ patWardCode: '',
+ patWardDesc: '',
+ patBedNo: '',
bookTime: new Date(),
bookDate: new Date(),
bookTimeslot: 9301030,
bookCheckType: getCheckTypeName(100),
paid: 0,
- bookSeqNum: 0,
+ bookSeqNum: 0
}
formRef.value?.resetFields()
}
const onEventAppointConfirm = () => {
-/*
+ /*
if (null !== appointmentVOList.value && appointmentVOList.value.length === 1) {
queryParams.patId = ""
}
*/
- queryParams.patId = ""
+ queryParams.patId = ''
}
/** 鍒濆鍖� **/
onMounted(() => {
resetForm()
})
-
-
</script>
<style lang="scss" scoped>
@@ -234,5 +234,4 @@
.el-form-item {
margin-bottom: 5px;
}
-
</style>
diff --git a/src/views/ecg/appointment/AppointmentForm.vue b/src/views/ecg/appointment/AppointmentForm.vue
index d1ad4d0..7cd3e5e 100644
--- a/src/views/ecg/appointment/AppointmentForm.vue
+++ b/src/views/ecg/appointment/AppointmentForm.vue
@@ -9,10 +9,10 @@
>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
+ <el-form-item label="缂栧彿" prop="patId">
<el-input
v-model="formData.patId"
- placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
+ placeholder="璇疯緭鍏ョ紪鍙�"
clearable
@input="searchBookInfo"
/>
@@ -38,11 +38,11 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="棰勭害缂栧彿" prop="bookId">
<el-input v-model="formData.bookId" placeholder="璇疯緭鍏ラ绾︾紪鍙�" />
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="12">
diff --git a/src/views/ecg/appointment/alter.vue b/src/views/ecg/appointment/alter.vue
index 8e688f1..43ff0e5 100644
--- a/src/views/ecg/appointment/alter.vue
+++ b/src/views/ecg/appointment/alter.vue
@@ -55,7 +55,7 @@
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,7 +63,7 @@
@keyup.enter="handleQuery"
class="!w-240px"
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="妫�鏌ョ被鍨�" prop="bookCheckType">
<el-select
v-model="queryParams.bookCheckType"
@@ -217,8 +217,14 @@
<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-select>
</el-form-item>
</el-form>
@@ -325,7 +331,8 @@
}).then(() => {
console.log(form, 'form')
AppointmentApi.alterAppointment(form)
- dialogFormVisible.value = true
+ message.success('淇敼鎴愬姛')
+ dialogFormVisible.value = false
})
}
diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index 6d459e9..1001f92 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -8,10 +8,10 @@
:inline="true"
label-width="68px"
>
- <el-form-item label="鎮ｈ�呯紪鍙�" prop="patId">
+ <el-form-item label="缂栧彿" prop="patId">
<el-input
v-model="queryParams.patId"
- placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
+ placeholder="璇疯緭鍏ョ紪鍙�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -55,7 +55,7 @@
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,7 +63,7 @@
@keyup.enter="handleQuery"
class="!w-240px"
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="妫�鏌ョ被鍨�" prop="bookCheckType">
<el-select
v-model="queryParams.bookCheckType"
@@ -78,6 +78,24 @@
:value="dict.value"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="鐧昏鏃堕棿" prop="registerTime">
+ <el-select
+ v-model="queryParams.registerTime"
+ placeholder="璇烽�夋嫨妫�鏌ョ被鍨�"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in opeionregister"
+ :key="dict.value"
+ :label="dict.value"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐥呭尯" prop="patWardDesc">
+ <el-input v-model="queryParams.patWardDesc" placeholder="璇疯緭鍏ョ梾鍖哄悕绉�" readonly />
</el-form-item>
<!--
<el-form-item label="棰勭害鏉ユ簮" prop="bookSrc">
@@ -155,6 +173,7 @@
<!-- <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="registerDate" />
<el-table-column label="绉戝浠ｇ爜" align="center" prop="patDeptCode" />
<el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
<el-table-column label="鐥呭尯浠ｇ爜" align="center" prop="patWardCode" />
@@ -216,6 +235,7 @@
pageNo: 1,
pageSize: 10,
applyNo: undefined,
+ registerTime:undefined,
patId: undefined,
patName: undefined,
patGender: undefined,
@@ -235,6 +255,11 @@
bookSrc: undefined
})
const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
+const opeionregister = ref([
+ {value:'鍏ㄩ儴',label:'鍏ㄩ儴'},
+ {value:'涓婂崍',label:'涓婂崍'},
+ {value:'涓嬪崍',label:'涓嬪崍'}
+]) // 鎼滅储鐨勮〃鍗�
const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
const checkTypeStore = useCheckTypeStore();
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 8c3d9d1..f0078b0 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -44,15 +44,8 @@
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
<el-form-item label="鏄惁澶氳��" prop="tolerance">
- <el-radio-group v-model="formData.tolerance" readonly>
- <el-radio
- v-for="dict in getIntDictOptions(DICT_TYPE.ecg_tolerance)"
- :key="dict.value"
- :value="dict.value"
- >
- {{ dict.label }}
- </el-radio>
- </el-radio-group>
+ <el-tag type="info" v-if="formData.tolerance == 0">鍚�</el-tag>
+ <el-tag type="danger" v-else>鏄�</el-tag>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 1b6991b..fdefbb9 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -41,15 +41,8 @@
/>
</el-form-item>
<el-form-item label="鏄惁澶氳��" prop="tolerance">
- <el-radio-group v-model="formData.tolerance" readonly>
- <el-radio
- v-for="dict in getIntDictOptions(DICT_TYPE.ecg_tolerance)"
- :key="dict.value"
- :value="dict.value"
- >
- {{ dict.label }}
- </el-radio>
- </el-radio-group>
+ <el-tag type="info" v-if="formData.tolerance == 0">鍚�</el-tag>
+ <el-tag type="danger" v-else>鏄�</el-tag>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index 908f54e..e5d93d0 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -49,15 +49,8 @@
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
<el-form-item label="鏄惁澶氳��" prop="tolerance">
- <el-radio-group v-model="formData.tolerance" readonly>
- <el-radio
- v-for="dict in getIntDictOptions(DICT_TYPE.ecg_tolerance)"
- :key="dict.value"
- :value="dict.value"
- >
- {{ dict.label }}
- </el-radio>
- </el-radio-group>
+ <el-tag type="info" v-if="formData.tolerance == 0">鍚�</el-tag>
+ <el-tag type="danger" v-else>鏄�</el-tag>
</el-form-item>
</el-col>
</el-row>
--
Gitblit v1.9.3