Merge branch 'dev'

This commit is contained in:
zoujiandong 2023-09-28 09:53:28 +08:00
commit 8ff4f707e4
2 changed files with 23 additions and 7 deletions

View File

@ -757,9 +757,13 @@ const modalForm = reactive({
handleDecryptBank();
if (data.doctor_bank_card && data.doctor_bank_card.province_id) {
handelAreaList('', data.doctor_bank_card.province_id, 3);
}
}else{
modalForm.doctor_bank_card={}
}
if (data.doctor_bank_card && data.doctor_bank_card.city_id) {
handelAreaList('', data.doctor_bank_card.city_id, 4);
}else{
modalForm.doctor_bank_card={}
}
if(data.doctor_bank_card){
let obj=data.doctor_bank_card;

View File

@ -173,7 +173,7 @@
<!-- Modal -->
<a-modal v-model:visible="modalVisible" fullscreen :title="modalTitle" title-align="start" :footer="false"
@before-ok="handleSubmit" @close="() => {$refs.modalFormRef.resetFields(); modalForm.doctor_id = null;}">
@before-ok="handleSubmit" @close="() => {$refs.modalFormRef.resetFields(); modalForm.doctor_id = null;showEye=false}">
<div class="titlebox">
<div class="bar"></div>
<div class="name">医生信息</div>
@ -205,9 +205,11 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item field="card_num" label="身份证号:" v-if="modalSatus=='add'">
<a-input v-model="modalForm.card_num" placeholder="请输入身份证号" />
</a-form-item>
<a-form-item field="idCard" label="身份证号:" v-else>
<div class="box" v-show="!showEye && modalSatus!='add'">
<div class="cardNum">{{modalForm.user_doctor_info.card_num_mask}}</div>
@ -633,13 +635,14 @@
hospital_id: ''
},
user_doctor_info: {
card_num_mask:''
},
doctor_bank_card: {
province_id:'',
bank_card_province_id: '',
bank_card_city_id: '',
bank_card_county_id: '',
bank_id: ''
bank_id: '',
},
user: {},
doctor_id: '',
@ -1018,12 +1021,17 @@
data.doctor_expertise.forEach((item) => {
arr.push(item.expertise_id)
})
handleDecryptBank();
handleDecryptBank();
if (data.doctor_bank_card && data.doctor_bank_card.province_id) {
handelAreaList('', data.doctor_bank_card.province_id, 3);
}
}else{
modalForm.doctor_bank_card={}
}
if (data.doctor_bank_card && data.doctor_bank_card.city_id) {
handelAreaList('', data.doctor_bank_card.city_id, 4);
handelAreaList('', data.doctor_bank_card.city_id,4);
}else{
modalForm.doctor_bank_card={}
}
if(data.doctor_bank_card){
let obj=data.doctor_bank_card;
@ -1050,9 +1058,13 @@
if (data.doctor_bank_card && data.doctor_bank_card.province_id) {
handelAreaList('', data.doctor_bank_card.province_id, 3);
}else{
modalForm.doctor_bank_card={}
}
if (data.doctor_bank_card && data.doctor_bank_card.city_id) {
handelAreaList('', data.doctor_bank_card.city_id, 4);
}else{
modalForm.doctor_bank_card={}
}
if (!data.user_doctor_info) {
data.user_doctor_info = {};