From 89b9564ad0bd464ecac5bd659b23570b624e969d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 26 四月 2024 10:04:20 +0800
Subject: [PATCH] 车间订单修改

---
 src/views/plan/manufacturingorder/auto-operationtask.vue |    7 ++++---
 src/router/router.js                                     |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/router/router.js b/src/router/router.js
index 35ea479..8ccaeca 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -8,7 +8,7 @@
 //鍒涘缓璺敱
 const createRouter = () => {
   return new VueRouter({
-    mode: 'history',
+    // mode: 'history',
     scrollBehavior (to, from, savedPosition) {
       if (savedPosition) {
         return savedPosition
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