From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突
---
src/views/plan/manufacturingorder/auto-operationtask.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/plan/manufacturingorder/auto-operationtask.vue b/src/views/plan/manufacturingorder/auto-operationtask.vue
index ad4cf17..adbf859 100644
--- a/src/views/plan/manufacturingorder/auto-operationtask.vue
+++ b/src/views/plan/manufacturingorder/auto-operationtask.vue
@@ -282,8 +282,8 @@
if(ele.name.indexOf(opName)>-1){
workId = ele.id
}
- })
- return workId
+ })
+ return workId
},
getManufactureAttrs(type) {
remote(type).then((response) => {
@@ -551,11 +551,12 @@
const resData = response.data
if (resData.code === 0) {
const autoTaskList = resData.data
+ console.log("autoTaskList-----",autoTaskList);
autoTaskList.forEach((item) => {
this.operationData.push({
operationName: item.operationName,
workCenter: item.workCenter,
- workstationId: item.workstationId ? item.workstationId : this.initWorkStation(item.operationName,item.workstations),
+ workstationId: item.workstationId ? item.workstationId : this.initWorkStation(item.operationName,item.workstations||[]),
locationId: item.locationId,
partNo: item.partNo,
partName: item.partName,
--
Gitblit v1.9.3