diff --git a/src/api/productionSchedulingPlan/scheduling.js b/src/api/productionSchedulingPlan/scheduling.js index 71fdcf7..626f46c 100644 --- a/src/api/productionSchedulingPlan/scheduling.js +++ b/src/api/productionSchedulingPlan/scheduling.js @@ -49,4 +49,13 @@ export const selectEquip = row => { method: 'get', params: row, }); +}; + +// 排产恢复 recoveryUpdate +export const recoveryUpdate = row => { + return request({ + url: '/blade-scheduling/workOrder/saveWorkOrderFromBak/' + row, + method: 'get', + // data: row, + }); }; \ No newline at end of file diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue index 33f4144..8eb6c68 100644 --- a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue +++ b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue @@ -1328,16 +1328,15 @@ export default { }, // 任务 样式计算 getStatusColor(row) { - if (row.planStatus === '1') { - if (row.remindStatus === '1') { - return '#FFD700'; // 黄色(可自定义) - } else if (row.remindStatus === '2') { - return '#dc3545'; // 红色(与返工状态一致,或自定义) - } - // 如果没有 remindStatus,默认保持原灰色 - return '#6c757d'; + if (row.remindStatus == '1') { + return '#FFD700'; // 黄色(可自定义) + } else if (row.remindStatus == '2') { + return '#dc3545'; // 红色(与返工状态一致,或自定义) } + switch (row.planStatus) { + case '1': + return '#6c757d'; case '5': return '#007bff'; case '2': diff --git a/src/views/productionSchedulingPlan/schedulingException/index.vue b/src/views/productionSchedulingPlan/schedulingException/index.vue index c281db5..6e42640 100644 --- a/src/views/productionSchedulingPlan/schedulingException/index.vue +++ b/src/views/productionSchedulingPlan/schedulingException/index.vue @@ -16,21 +16,25 @@ @refresh-change="refreshChange" @on-load="onLoad" > -