diff --git a/src/api/mes/pro/protask.js b/src/api/mes/pro/protask.js index 8f7aa4e..6689f83 100644 --- a/src/api/mes/pro/protask.js +++ b/src/api/mes/pro/protask.js @@ -18,6 +18,15 @@ export function listGanttTaskList(query) { }) } +// 查询生产任务列表 +export function listTaskListByWorkorder(query) { + return request({ + url: '/mes/pro/protask/listTaskListByWorkorder', + method: 'get', + params: query + }) +} + // 查询生产任务详细 export function getProtask(taskId) { diff --git a/src/api/mes/pro/workorder.js b/src/api/mes/pro/workorder.js index d5abb1a..9c2deef 100644 --- a/src/api/mes/pro/workorder.js +++ b/src/api/mes/pro/workorder.js @@ -17,6 +17,15 @@ export function getWorkorder(workorderId) { }) } +//查询生产工单,并携带每个生产工单下生产任务的情况 +export function listWithTaskJson(query) { + return request({ + url: '/mes/pro/workorder/listWithTaskJson', + method: 'get', + params: query + }) +} + // 新增生产工单 export function addWorkorder(data) { return request({ diff --git a/src/views/mes/pro/schedule/ganttedit.vue b/src/views/mes/pro/schedule/ganttedit.vue index 97cdbda..d83b1a3 100644 --- a/src/views/mes/pro/schedule/ganttedit.vue +++ b/src/views/mes/pro/schedule/ganttedit.vue @@ -105,8 +105,11 @@ export default { if(this.changedTaskIds.length>0){ this.reset(); this.changedTaskIds.forEach(id => { - debugger; + debugger; let nTask = this.tasks.data.filter(task => task.id == id)[0]; + if(nTask.id.startsWith("MO")){ + return; //如果是工单改变,不进行保存。 + } let startDate = new Date(nTask.start_date); let endDate = new Date(nTask.end_date); this.form = nTask;