diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue index 5122fc0..82b3796 100644 --- a/pages/NursingNew/component/leftcontent/serveswipe.vue +++ b/pages/NursingNew/component/leftcontent/serveswipe.vue @@ -902,7 +902,7 @@ return true } } - const start = async (v) => { + const start = (v) => { // if(v.izMulti == "Y"){ // console.log(1111111111) // plsbuy.value[current2.value].directiveList.map((item,i)=>{ @@ -911,7 +911,6 @@ // Object.assign(plsbuy.value[current2.value].directiveList[i], { izStart: 'Y' }) // console.log(item) // }) - // await nextTick() // timeacde(2) // } // return @@ -925,23 +924,25 @@ // console.log(v) if (v.izStart != 'N') { return } startOrder({ id: v.id }).then(res => { + console.log(res) if (res.result.success) { if(v.izMulti == "Y"){ // console.log(1111111111) - // plsbuy.value[current2.value].directiveList.map((item,i)=>{ - // console.log(2222222222222) - // plsbuy.value[current2.value].directiveList[i].izStart = "Y" - // console.log(item) - // }) - firstgetqueryCgdList(uni.getStorageSync('nuId')) + plsbuy.value[current2.value].directiveList.map((item,i)=>{ + console.log(2222222222222) + plsbuy.value[current2.value].directiveList[i].izStart = "Y" + console.log(item) + }) + // firstgetqueryCgdList(uni.getStorageSync('nuId')) timeacde(2) }else{ v.izStart = "Y"; timeacde(1) } } else { - errmsg.value = res.message + errmsg.value = res.result.message openerror.value = true; + firstgetqueryCgdList(uni.getStorageSync('nuId')) } }) } @@ -967,7 +968,7 @@ const ends = () => { // console.log("看看传的", { id: endobj.value.id }) endOrder({ id: endobj.value.id }).then(res => { - console.log(res) + console.log(res,{ id: endobj.value.id }) if (res.result.success) { open.value = 0; endobj.value = {}; diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue index ee5fcc4..406e7f8 100644 --- a/pages/NursingNew/component/nurse/newindex.vue +++ b/pages/NursingNew/component/nurse/newindex.vue @@ -1050,7 +1050,7 @@ positioning: saveEditIndex.value.index0.toString(), positioningLong: saveEditIndex.value.index1.toString(), tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName, - startTime: allobject.startTime, + startTime: allobject.startTime? allobject.startTime?.slice(11, 16):'', izPackage: ruleritem.value.izPackage, cycleTypeId: nosave.value.cycleTypeId, cycleValue: nosave.value.cycleValue, @@ -1058,9 +1058,9 @@ optTime: ts, instructionTagId:typearray.value[whitchtype.value]?.instructionType } - console.log("啥情况data", data) + // console.log("啥情况data", data) editDirective(data).then((res) => { - console.log("啥情况1111", res) + // console.log("啥情况1111", res) if (res.success) { geteverything() setTimeout(() => { @@ -1870,10 +1870,10 @@ const emotionTagList = ref([]); const bodyTagList = ref([]); const geteverything = () => { - console.log("有老人吗",uni.getStorageSync('elderId'),uni.getStorageSync('nuId')) + // console.log("有老人吗",uni.getStorageSync('elderId'),uni.getStorageSync('nuId')) if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) { getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId'),typearray.value[whitchtype.value]?.instructionType).then((res : any) => { - console.log( res ) + // console.log( res ) timearr.value = Array.from({ length: 24 }, (_, hour) => ({ positioning: hour.toString(), children: minuteArr.map(time => ({