Compare commits

...

3 Commits

Author SHA1 Message Date
zoujiandong
42d2e7e1e8 Merge branch 'dev'1.7bugxiufu 2026-01-07 11:39:16 +08:00
zoujiandong
1c8483fa65 1.7 2026-01-07 11:35:27 +08:00
zoujiandong
656aaa9295 弹窗医生 2026-01-07 11:18:29 +08:00
2 changed files with 21 additions and 13 deletions

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 && !from">
<div class="titlebox" v-if="modalForm.user_doctor && from==''">
<div class="bar"></div>
<div class="name">医生信息</div>
<a-space
@ -272,10 +272,10 @@
>
</a-space>
</div>
<a-row :gutter="24" style="margin-top: 35px">
<a-row :gutter="24" style="margin-top: 35px" v-if="modalForm.user_doctor && from==''">
<a-col :span="24">
<a-form-item field="license_cert" :hide-label="true">
<div class="doctorInfo" v-if="modalForm.user_doctor && !from">
<div class="doctorInfo" v-if="modalForm.user_doctor && from==''">
<a-space size="large">
<a-image
width="80"
@ -313,8 +313,9 @@
</a-form-item>
</a-col>
</a-row>
<a-divider v-if="modalForm.user_doctor && !from" />
<div class="titlebox" v-if="modalForm.inquiry_doctor && from">
<a-divider v-if="modalForm.user_doctor && from==''" />
<div class="titlebox" v-if="modalForm.inquiry_doctor && from=='transfer'">
<div class="bar"></div>
<div class="name">医生信息</div>
<a-space
@ -325,15 +326,16 @@
justify-content: flex-end;
"
>
<a-button type="primary" @click="openDcotor"
<a-button type="primary" @click="openDcotorTransfer"
>查看医生完整信息</a-button
>
</a-space>
</div>
<a-row :gutter="24" style="margin-top: 35px">
<a-row :gutter="24" style="margin-top: 35px" v-if="modalForm.inquiry_doctor && from=='transfer'">
<a-col :span="24">
<a-form-item field="license_cert" :hide-label="true">
<div class="doctorInfo" v-if="modalForm.inquiry_doctor && from">
<div class="doctorInfo" v-if="modalForm.inquiry_doctor && from=='transfer'">
<a-space size="large">
<a-image
width="80"
@ -358,7 +360,7 @@
formatDoctorTitle(modalForm.inquiry_doctor.doctor_title)
}}
</div>
<div class="hospital">
<div class="hospital" v-if="modalForm.inquiry_doctor.hospital">
{{
modalForm.inquiry_doctor.hospital.hospital_name
}}&nbsp;&nbsp;{{
@ -371,7 +373,7 @@
</a-form-item>
</a-col>
</a-row>
<a-divider v-if="modalForm.inquiry_doctor && from" />
<a-divider v-if="modalForm.inquiry_doctor && from=='transfer'" />
<div class="titlebox">
<div class="bar"></div>
<div class="name">就诊人信息</div>
@ -616,6 +618,12 @@ const openDcotor=()=>{
doctor_id.value=props.modalForm.user_doctor.doctor_id;
doctorVisible.value=true
}
const openDcotorTransfer=()=>{
doctor_id.value=props.modalForm.inquiry_doctor.doctor_id;
doctorVisible.value=true
}
//
const closeChange = (data) => {

View File

@ -589,7 +589,7 @@
</a-col>
</a-row>
<a-divider v-if="modalForm.order_prescription" />
<div class="titlebox" v-if="modalForm.user_doctor && showTransferDoctor">
<div class="titlebox" v-if="(modalForm.inquiry_doctor && showTransferDoctor) || (!showTransferDoctor && !modalForm.transfer_prescription_doctor)">
<div class="bar"></div>
<div class="name">医生信息</div>
<a-space
@ -605,7 +605,7 @@
>
</a-space>
</div>
<a-row :gutter="24" style="margin-top: 35px" v-if="modalForm.inquiry_doctor && showTransferDoctor">
<a-row :gutter="24" style="margin-top: 35px" v-if="(modalForm.inquiry_doctor && showTransferDoctor) || (!showTransferDoctor && !modalForm.transfer_prescription_doctor)">
<a-col :span="24">
<a-form-item field="license_cert" :hide-label="true">
<div class="doctorInfo" v-if="modalForm.inquiry_doctor">
@ -646,7 +646,7 @@
</a-form-item>
</a-col>
</a-row>
<a-divider v-if="modalForm.inquiry_doctor && showTransferDoctor" />
<a-divider v-if="(modalForm.inquiry_doctor && showTransferDoctor) || (!showTransferDoctor && !modalForm.transfer_prescription_doctor)" />
<div class="titlebox" v-if="modalForm.transfer_prescription_doctor && !showTransferDoctor && modalForm.is_transfer_order==1">
<div class="bar"></div>
<div class="name">医生信息</div>