diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index beda93d..0c43a13 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -477,7 +477,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX 0) { // 如果超时,返回符合条件的结果 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue index 5599991..00d7af0 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue @@ -707,7 +707,9 @@ watch( } console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`); console.log("detail==", detail) - openDialogWT(detail); + if(detail.startTime){ + openDialogWT(detail); + } } ); watches.push(unwatch); // 存储当前的取消监听函数 @@ -719,7 +721,6 @@ watch( const openDialogWT = async (dataParam) => { taskDD.value = null; taskDD.value = dataParam.startTime; - console.log("taskDD==", taskDD) const data = await TaskDispatchApi.getTaskDispatchDetailListByWorkTime(dataParam); //debugger dataList.value = []; diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue index db76541..0a5b087 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue @@ -753,8 +753,10 @@ watch( return; } console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`); - console.log("detail==", detail) - openDialogWT(detail); + console.log("detail=", detail.startTime) + if(detail.startTime){ + openDialogWT(detail); + } } ); watches.push(unwatch); // 存储当前的取消监听函数 @@ -766,7 +768,6 @@ watch( const openDialogWT = async (dataParam) => { taskDD.value = null; taskDD.value = dataParam.startTime; - console.log("taskDD==", taskDD) const data = await TaskdispatchApi.getTaskDispatchDetailListByWorkTime(dataParam); //debugger dataList.value = [];