diff --git a/src/views/admin/sys-dept/index.vue b/src/views/admin/sys-dept/index.vue index 42ae858..5d657e4 100644 --- a/src/views/admin/sys-dept/index.vue +++ b/src/views/admin/sys-dept/index.vue @@ -109,7 +109,7 @@ const modalForm = reactive({ parent_id:'' }); watch(() =>modalForm.parent_id ,(value) => { - if(value==0){ + if(value==0 && modalSatus.value!="addson"){ parent_id.value="无" }else{ parent_id.value=value @@ -181,10 +181,13 @@ const handleAdd = ({ parent_id, dept_status = 2,dept_id } = {},type='') => { let id='' if(type=='addson'){ id=dept_id; + // parent_id.value=dept_id modalSatus.value="addson"; + modalForm.parent_id=dept_id; }else{ modalSatus.value="add"; id=parent_id; + modalForm.parent_id='' } if (parent_id || dept_id){ Object.assign(modalForm, {parent_id: id, dept_status,dept_id}); diff --git a/src/views/doctor/doctor-examine/index.vue b/src/views/doctor/doctor-examine/index.vue index 29d9794..cafa320 100644 --- a/src/views/doctor/doctor-examine/index.vue +++ b/src/views/doctor/doctor-examine/index.vue @@ -2,7 +2,7 @@
- + diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue index 099434d..e3ab84e 100644 --- a/src/views/doctor/doctor-list/index.vue +++ b/src/views/doctor/doctor-list/index.vue @@ -2,7 +2,7 @@
- + @@ -184,16 +184,18 @@ - + + :label="item.hospital_name"> + {{item.hospital_name+'('+item.province+item.city+item.county+')'}} + - + @@ -585,12 +587,14 @@ bank_card_code:'', }); const hospital_name=ref(''); - watch(()=>modalForm.hospital.hospital_name,()=>{ + watch(()=>modalForm.hospital,()=>{ if(modalForm.hospital.hospital_name){ hospital_name.value= modalForm.hospital.hospital_name+'('+modalForm.hospital.province+modalForm.hospital.city+modalForm.hospital.county+')' }else{ hospital_name.value='' } + },{ + deep:true }) //const doctor_expertise=ref([]); //证书计算 @@ -1181,8 +1185,9 @@ }; const hospitalData = ref([]); const changeHospital=(value)=>{ - console.log(value); - modalForm.hospital_id=value; + let arr=hospitalData.value.filter((item)=>item.hospital_id==value); + modalForm.hospital_id=arr[0].hospital_id; + modalForm.hospital=arr[0]; } //获取医院列表 const handleHospitalList = (value) => { diff --git a/src/views/doctor/doctor-multipoint/index.vue b/src/views/doctor/doctor-multipoint/index.vue index 5b5a651..4245fdd 100644 --- a/src/views/doctor/doctor-multipoint/index.vue +++ b/src/views/doctor/doctor-multipoint/index.vue @@ -2,7 +2,7 @@
- + @@ -527,8 +527,9 @@ }; //审核 const handleCheck= async(type)=>{ - proxy.$loading.show(); + if(type=="ok"){ + proxy.$loading.show(); const {code,message,data}= await checkDoctor({ multi_point_status:1 },modalForm.doctor_id);