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

Compare commits

base: gdxz:42d2e7e1e8daf33897d6e719f13d0ff0cca07e38
Branches Tags
gdxz:master
gdxz:dev
..
compare: gdxz:5d6a029d50cfce9753feba15535e0087932b5488
Branches Tags
gdxz:master
gdxz:dev

No commits in common. "42d2e7e1e8daf33897d6e719f13d0ff0cca07e38" and "5d6a029d50cfce9753feba15535e0087932b5488" have entirely different histories.
42d2e7e1e8 ... 5d6a029d50

2 changed files with 13 additions and 21 deletions
Show Stats Expand all files Collapse all files

28
src/components/medinceModal.vue
View File

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

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

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