gdxz/hospital-admin
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'1.7

Browse Source
This commit is contained in:
zoujiandong 2026-01-07 10:23:16 +08:00
commit 5d6a029d50
4 changed files with 84 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/components/medinceModal.vue
View File

@ -256,7 +256,7 @@
</a-col>
</a-row>
<a-divider v-if="modalForm.order_prescription" />
<div class="titlebox" v-if="modalForm.user_doctor">
<div class="titlebox" v-if="modalForm.user_doctor && !from">
<div class="bar"></div>
<div class="name">医生信息</div>
<a-space
@ -275,7 +275,7 @@
<a-row :gutter="24" style="margin-top: 35px">
<a-col :span="24">
<a-form-item field="license_cert" :hide-label="true">
<div class="doctorInfo" v-if="modalForm.user_doctor">
<div class="doctorInfo" v-if="modalForm.user_doctor && !from">
<a-space size="large">
<a-image
width="80"
@ -313,7 +313,65 @@
</a-form-item>
</a-col>
</a-row>
<a-divider v-if="modalForm.user_doctor" />
<a-divider v-if="modalForm.user_doctor && !from" />
<div class="titlebox" v-if="modalForm.inquiry_doctor && from">
<div class="bar"></div>
<div class="name">医生信息</div>
<a-space
style="
margin-right: 8px;
flex: 1;
display: flex;
justify-content: flex-end;
"
>
<a-button type="primary" @click="openDcotor"
>查看医生完整信息</a-button
>
</a-space>
</div>
<a-row :gutter="24" style="margin-top: 35px">
<a-col :span="24">
<a-form-item field="license_cert" :hide-label="true">
<div class="doctorInfo" v-if="modalForm.inquiry_doctor && from">
<a-space size="large">
<a-image
width="80"
height="80"
class="headImg"
:src="modalForm.inquiry_doctor.avatar"
v-if="modalForm.inquiry_doctor.avatar"
>
</a-image>
<a-image
width="80"
height="80"
class="headImg"
src="https://img.applets.igandanyiyuan.com/basic/file/doctor_avatar.png"
v-else
>
</a-image>
</a-space>
<div class="infobox">
<div class="name">
{{ modalForm.inquiry_doctor.user_name }}&nbsp;&nbsp;{{
formatDoctorTitle(modalForm.inquiry_doctor.doctor_title)
}}
</div>
<div class="hospital">
{{
modalForm.inquiry_doctor.hospital.hospital_name
}}&nbsp;&nbsp;{{
modalForm.inquiry_doctor.department_custom_name
}}
</div>
</div>
</div>
<div class="doctorInfo" v-else>暂未分配到医生</div>
</a-form-item>
</a-col>
</a-row>
<a-divider v-if="modalForm.inquiry_doctor && from" />
<div class="titlebox">
<div class="bar"></div>
<div class="name">就诊人信息</div>
@ -493,6 +551,10 @@ const props = defineProps({
type: Boolean,
default: false,
},
from:{
type: String,
default:''
},
modalTitle:{
type: String,
default:'就诊人详情'

2
src/components/prescriptionModalTransfer.vue
View File

@ -321,7 +321,7 @@
}
"
></patientModal>
<medinceModal :medinceVisible="medinceVisible" :modalForm="medinceData" @medinceVisibleChange="()=>{medinceVisible=false}"></medinceModal>
<medinceModal :from="'transfer'" :medinceVisible="medinceVisible" :modalForm="medinceData" @medinceVisibleChange="()=>{medinceVisible=false}"></medinceModal>
</template>
<script setup>
import {ref,toRefs,reactive,watchEffect,watch,onMounted} from 'vue';

20
src/views/doctor/doctor-list/index.vue
View File

@ -364,23 +364,23 @@
</a-col>
</a-row>
<a-divider />
<div class="titlebox" v-if="showTransferDoctor">
<div class="titlebox" v-if="showTransferDoctor && modalSatus!='add' && modalForm.multi_point_status == 1 ">
<div class="bar"></div>
<div class="name">是否接受抄方</div>
</div>
<a-row :gutter="24" style="margin-top: 35px;" v-if="showTransferDoctor">
<a-row :gutter="24" style="margin-top: 35px;" v-if="showTransferDoctor && modalSatus!='add' && modalForm.multi_point_status == 1 ">
<a-col :span="12">
<a-form-item field="is_recommend" label="状态：">
<a-space size="large">
<a-switch checked-color="#14C9C9" :checked-value="1" :unchecked-value="0"
v-model="modalForm.is_transfer_prescription" />
v-model="modalForm.is_transfer_prescription" @change="changeTransferPrescription" />
</a-space>
</a-form-item>
</a-col>
</a-row>
<a-divider v-if="showTransferDoctor"/>
<a-divider v-if="showTransferDoctor && modalSatus!='add' && modalForm.multi_point_status == 1 "/>
<div class="titlebox">
<div class="bar"></div>
<div class="name">平台合作</div>
@ -1388,6 +1388,10 @@ const handleSubmit = (done) => {
bank_card_county_id: modalForm.doctor_bank_card.county_id ? modalForm.doctor_bank_card.county_id : 0,
bank_id: modalForm.doctor_bank_card.bank_id
}
if(modalForm.is_transfer_prescription == 1 || modalForm.is_transfer_prescription ==0) {
modalData.is_transfer_prescription = modalForm.is_transfer_prescription;
}
if (!modalForm.doctor_id) {
if (modalForm.id_card_front && modalForm.id_card_back && modalForm.sign_image) {
if (modalForm.doctor_bank_card) {
@ -1712,6 +1716,14 @@ const beforeUpload = (file, type) => {
const filterOption = (value, options) => {
console.log(value, options)
}
const changeTransferPrescription = (value) => {
console.log(value)
if (value == 1) {
modalForm.is_transfer_prescription = 1;
} else {
modalForm.is_transfer_prescription = 0;
}
}
//上传文件
const onChangeFile = (fileList) => {

4
src/views/order/medince-list/index.vue
View File

@ -649,7 +649,7 @@
<a-divider v-if="modalForm.inquiry_doctor && showTransferDoctor" />
<div class="titlebox" v-if="modalForm.transfer_prescription_doctor && !showTransferDoctor && modalForm.is_transfer_order==1">
<div class="bar"></div>
<div class="name">抄方医生信息</div>
<div class="name">医生信息</div>
<a-space
style="
margin-right: 8px;
@ -659,7 +659,7 @@
"
>
<a-button type="primary" @click="openDcotorTransfer"
>查看抄方医生完整信息</a-button
>查看医生完整信息</a-button
>
</a-space>
</div>