Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
This commit is contained in:
2025-11-05 11:45:36 +08:00
3 changed files with 96 additions and 48 deletions

View File

@@ -3,46 +3,7 @@
<el-row>
<el-col :span="24" class="card-box">
<el-card>
<template #header>
<div style="display: flex; align-items: center; justify-content: space-between; width: 100%">
<span style="vertical-align: middle; font-size: 16px; font-weight: bold;">门诊挂号</span>
<div>
<el-button type="primary" icon="Plus" @click="handleAddPatient" style="margin-right: 8px;">
新建
</el-button>
<el-button
type="primary"
plain
icon="Search"
@click="handleSearch"
style="margin-right: 8px;"
>
查询
</el-button>
<el-button type="primary" plain @click="handleReadCard('01')" style="margin-right: 8px;">
电子凭证
</el-button>
<el-button
type="primary"
plain
@click="handleReadCard('02')"
style="margin-right: 8px;"
:disabled="true"
>
身份证
</el-button>
<el-button type="primary" plain @click="handleReadCard('03')" style="margin-right: 8px;">
医保卡
</el-button>
<el-button type="warning" plain icon="CircleClose" @click="handleClear" style="margin-right: 8px;">
清空
</el-button>
<el-button type="primary" icon="Plus" @click="handleAdd">
保存挂号
</el-button>
</div>
</div>
</template>
<template #header> <span style="vertical-align: middle">门诊挂号</span></template>
<el-form :model="form" :rules="rules" ref="outpatientRegistrationRef" label-width="110px">
<el-row :gutter="24">
<el-col :span="5">
@@ -67,6 +28,44 @@
</el-popover>
</el-form-item>
</el-col>
<el-col :span="6" style="padding: 0">
<el-button type="primary" icon="Plus" @click="handleAddPatient" style="width: 65px">
新建
</el-button>
<el-button
type="primary"
plain
icon="Search"
@click="handleSearch"
style="width: 65px"
>
查询
</el-button>
<el-button type="primary" plain @click="handleReadCard('01')" style="width: 65px">
电子凭证
</el-button>
<el-button
type="primary"
plain
@click="handleReadCard('02')"
style="width: 65px"
:disabled="true"
>
身份证
</el-button>
<el-button type="primary" plain @click="handleReadCard('03')" style="width: 65px">
医保卡
</el-button>
<!-- <el-button
type="primary"
plain
@click="handleReadCard('99')"
style="width: 65px"
:disabled="true"
>
学生卡
</el-button> -->
</el-col>
<el-col :span="5">
<el-form-item label="姓名:" prop="name">
<el-input v-model="form.name" placeholder="姓名" :disabled="true" />
@@ -351,6 +350,12 @@
<el-input v-model="form.totalPrice" placeholder="" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="4" style="text-align: right">
<el-button type="warning" plain icon="CircleClose" @click="handleClear"
>清空</el-button
>
<el-button type="primary" plain icon="Plus" @click="handleAdd">保存挂号</el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="24" justify="end">
<el-col :span="5" style="text-align: right">