diff --git a/src/views/mes/workScheduling/components/Detail.vue b/src/views/mes/workScheduling/components/Detail.vue index 086250138..7e490efd8 100644 --- a/src/views/mes/workScheduling/components/Detail.vue +++ b/src/views/mes/workScheduling/components/Detail.vue @@ -833,8 +833,10 @@ const opensearchTable = ( // } const buttonClick=(type,row)=>{ if (type == 'pfinished') { - WorkSchedulingDetailApi.processFinished(row.id) - getList() + message.confirm("是否确认进行完工操作?").then (()=>{ + WorkSchedulingDetailApi.processFinished(row.id) + getList()}) + }else if (type == 'reprotProcess') { refreport.value.openDetail(row,"工序报工", planDayCode.value) }else if (type == 'checkProcess') { diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue index 4e2bba17f..8ca2069cd 100644 --- a/src/views/mes/workScheduling/index.vue +++ b/src/views/mes/workScheduling/index.vue @@ -192,7 +192,7 @@ const butttondata=(row) =>{ return [ ]} const reportRef=ref() const reportFinishRef=ref() -const qualifiedCheck=ref() + // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 @@ -231,8 +231,16 @@ const finishReport=async(row)=>{ } //console.log("workscheduling-finishReport-213",row) if(row.workingNode=='endNode'){ + + message.confirm("是否确认进行完工操作?").then (()=>{ + WorkSchedulingApi.completeHandle(params)}) + + // if(ret =='ddd'){ + // WorkSchedulingApi.completeHandle(params) + // } //reportFinishRef.value.openDetail(row,"完工") - WorkSchedulingApi.completeHandle(params) + + }else{ // let res=await WorkSchedulingApi.getNodePosition(params) // if(res){