diff --git a/h5/pages/main/ctime/ctime.vue b/h5/pages/main/ctime/ctime.vue index 8711635..218137f 100644 --- a/h5/pages/main/ctime/ctime.vue +++ b/h5/pages/main/ctime/ctime.vue @@ -153,26 +153,23 @@ //weekly子组件点击了日期 let selectedDate = ref(null); const selectDateFunc = (date) => { - selectedDate.value = date - selectedTime.value = null - if (itemSelected.value.type == 'nmr') { - // nmr_time.value = null - //nmr_date.value = date - YuYueInfo.value.NmrInfo[itemSelected.value.index].date=date - YuYueInfo.value.NmrInfo[itemSelected.value.index].time=null - - tj_time.value = null //如果切换核磁日期则清空体检选择的日期时间 - tj_date.value = null - doctor_name.value = null //清空体检医生 - NMRGetDayPlanListFunc() - } - if (itemSelected.value.type == 'tj') { - tj_time.value = null - tj_date.value = date - doctor_name.value = null //清空体检医生 - GetDayPlanListFunc(); + if(doctor_name.value){ + uni.showModal({ + title: '提示', + content: '已选择医生,切换日期将重新选择医生,是否继续', + cancelText:'取消', + confirmText:'确定', + success: function (res) { + if (res.confirm) { + DateChange(date) + } else if (res.cancel) { + + } + } + }); + }else{ + DateChange(date) } - } //weekly子组件点击了时间 let SelectedPlanId = ref(null) @@ -260,23 +257,26 @@ } const MonthConfirm = (e) => { //月历确认日期 console.log(e.fulldate) - selectedDate.value=e.fulldate - selectedTime.value = null - if (itemSelected.value.type == 'nmr') { - YuYueInfo.value.NmrInfo[itemSelected.value.index].time = null - YuYueInfo.value.NmrInfo[itemSelected.value.index].date = e.fulldate - - tj_time.value = null //如果切换核磁日期则清空体检选择的日期时间 - tj_date.value = null - doctor_name.value = null //清空体检医生 - NMRGetDayPlanListFunc() - } - if (itemSelected.value.type == 'tj') { - tj_time.value = null - tj_date.value = e.fulldate - doctor_name.value = null //清空体检医生 - GetDayPlanListFunc() + + if(doctor_name.value){ + uni.showModal({ + title: '提示', + content: '已选择医生,切换日期将重新选择医生,是否继续', + cancelText:'取消', + confirmText:'确定', + success: function (res) { + if (res.confirm) { + DateChange(e.fulldate) + } else if (res.cancel) { + + } + } + }); + }else{ + DateChange(e.fulldate) } + + } //获取体检每月号源数量 const GetMonthPlanListFunc = async (ym='') => { @@ -367,6 +367,26 @@ } }); } +//改变日期 +const DateChange=(date)=>{ + selectedDate.value=date + selectedTime.value = null + if (itemSelected.value.type == 'nmr') { + YuYueInfo.value.NmrInfo[itemSelected.value.index].time = null + YuYueInfo.value.NmrInfo[itemSelected.value.index].date = date + + tj_time.value = null //如果切换核磁日期则清空体检选择的日期时间 + tj_date.value = null + doctor_name.value = null //清空体检医生 + NMRGetDayPlanListFunc() + } + if (itemSelected.value.type == 'tj') { + tj_time.value = null + tj_date.value = date + doctor_name.value = null //清空体检医生 + GetDayPlanListFunc() + } +} let temp = null onMounted(() => { diff --git a/h5/pages/main/tj/tjzx.vue b/h5/pages/main/tj/tjzx.vue index 5c0ebb8..e41470b 100644 --- a/h5/pages/main/tj/tjzx.vue +++ b/h5/pages/main/tj/tjzx.vue @@ -111,6 +111,12 @@ const getBuyInfo = async () => { obj.combo_id = comboId.value; } const response = await $api("BuyInfo", obj); + console.log(response) + if(response.status===false){ + uni.hideLoading(); + uni.$lu.toast(response.msg); + return false; + } $response(response, () => { groupLength.value = response.data.group_info @@ -274,16 +280,25 @@ const configRef = (e) => { mountedAction(); } }; -const XuanZeItem= (item)=>{ - +const XuanZeItem= async (item)=>{ + let doi="" if(selectIds.value.includes(item.id)){ selectIds.value.splice(selectIds.value.indexOf(item.id),1); - + doi="del" }else{ selectIds.value.push(item.id); - + doi="add" } - getBuyInfo() + let a= await getBuyInfo() + if(a===false){ + if(doi=="add"){ + selectIds.value.splice(selectIds.value.indexOf(item.id),1); + } + if(doi=="del"){ + selectIds.value.push(item.id); + } + + } } onShow(() => {