排产看板样式调整

dev-scheduling
zhangdi 1 day ago
parent 155241d43f
commit c5b9df4067
  1. 21
      src/views/productionSchedulingPlan/schedulingDashboard/container.vue

@ -448,7 +448,7 @@ export default {
name: 'GanttChart', name: 'GanttChart',
data() { data() {
return { return {
loading:false, loading: false,
formLabelAlign: { formLabelAlign: {
startTime: null, // startTime: null, //
teamName: '', // teamName: '', //
@ -525,7 +525,6 @@ export default {
// //
'$route.query': { '$route.query': {
handler(newQuery) { handler(newQuery) {
console.log('参数变化:', newQuery);
this.handleParamsChange(); this.handleParamsChange();
}, },
immediate: true, immediate: true,
@ -987,7 +986,7 @@ export default {
}, },
// //
async getData (params) { async getData(params) {
if (this.formLabelAlign.timeRange.length > 0) { if (this.formLabelAlign.timeRange.length > 0) {
this.formLabelAlign.startTime = this.formLabelAlign.timeRange[0]; this.formLabelAlign.startTime = this.formLabelAlign.timeRange[0];
this.formLabelAlign.endTime = this.formLabelAlign.timeRange[1]; this.formLabelAlign.endTime = this.formLabelAlign.timeRange[1];
@ -995,7 +994,7 @@ export default {
if (this.formLabelAlign.planStatusList.length <= 0) { if (this.formLabelAlign.planStatusList.length <= 0) {
this.formLabelAlign.planStatusList = null; this.formLabelAlign.planStatusList = null;
} }
this.loading = true this.loading = true;
await getData(this.formLabelAlign).then(res => { await getData(this.formLabelAlign).then(res => {
this.processData(res.data.data); this.processData(res.data.data);
}); });
@ -1020,10 +1019,12 @@ export default {
processData(rawData) { processData(rawData) {
const tasks = []; const tasks = [];
const orders = []; const orders = [];
const workOrders = Object.keys(rawData);
workOrders.forEach(woCode => { //
const woTasks = rawData[woCode] || []; rawData.forEach(item => {
const woCode = item.woCode; //
const woTasks = item.workOrderList || []; //
// //
if (woTasks.length > 0) { if (woTasks.length > 0) {
const firstTask = woTasks[0]; const firstTask = woTasks[0];
@ -1036,11 +1037,12 @@ export default {
priorityAps: firstTask.priorityAps, priorityAps: firstTask.priorityAps,
}); });
} }
// //
woTasks.forEach(task => { woTasks.forEach(task => {
tasks.push({ tasks.push({
...task, ...task,
// status: this.calcTaskStatus(task.startTime, task.endTime), woCode, // woCode 便
}); });
}); });
}); });
@ -1050,7 +1052,7 @@ export default {
this.taskData = tasks; this.taskData = tasks;
this.updateCurrentPageOrders(); this.updateCurrentPageOrders();
this.loading = false this.loading = false;
}, },
// //
@ -1257,7 +1259,6 @@ export default {
// //
if (taskStart >= adjustedLastEnd) { if (taskStart >= adjustedLastEnd) {
console.log('layers', tasks, layers);
// //
layer.push(task); layer.push(task);
placed = true; placed = true;

Loading…
Cancel
Save