|
|
@@ -605,6 +605,7 @@
|
|
|
try {
|
|
|
// /aps/assign/listByMesWorkOrder
|
|
|
let allRes = await listByRoutingIds([this.current.produceRoutingId]); // 查询全部工序数据
|
|
|
+
|
|
|
let params = {
|
|
|
apsWorkOrderId: this.current.apsWorkOrderId,
|
|
|
categoryId: this.current.categoryId,
|
|
|
@@ -642,8 +643,10 @@
|
|
|
return;
|
|
|
}
|
|
|
// this.procTaskDis = false;
|
|
|
+ console.log(res, 'resresresres');
|
|
|
let list = [];
|
|
|
res.forEach((item, index) => {
|
|
|
+ console.log(item.type, 'itemitemitemitem');
|
|
|
let obj = {
|
|
|
id: item.sourceTaskId, //工序 id
|
|
|
name: item.name, //工序 名称
|
|
|
@@ -662,7 +665,10 @@
|
|
|
lineDis: false // 产线按钮
|
|
|
},
|
|
|
isDisable:
|
|
|
- this.form.workCenterId == item.workCenterId ? true : false,
|
|
|
+ this.form.workCenterId == item.workCenterId &&
|
|
|
+ item.type != 2 &&
|
|
|
+ item.type != 3 &&
|
|
|
+ item.type != 6,
|
|
|
startDate: '', // 开始日期 (当前工序中最早的计划开始时间)
|
|
|
endDate: '', // 结束日期 (当前工序中最晚的计划结束时间)
|
|
|
workCenterId: item.workCenterId,
|