变更

src/views/work/abnormal_process/index.vue

@@ -277,7 +277,8 @@
       <el-table
         :data="finalData"
         stripe
-        style="width: 100%">
+        style="width: 100%"
+      >
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column
           prop="id"
@@ -445,7 +446,7 @@ export default {
       processBatchId: 0,
       nowPass: {},
       nextStepLoading: false,
-      circleStart: 0,
+      circleStart: 0
     }
   },
   methods: {
@@ -536,7 +537,12 @@ export default {
         let material = this.processing
         material.stepFlag = stepFlag
         materialNextError(material).then(res => {
-
+          if (res.data === 2) {
+            // 如果返回值为2表示全部发生异常了
+            this.finalFlag = 1
+            this.dialogVisible = true
+            this.finalData = this.dataList
+          }
           this.getDataList()
           // 表示这是第一次穷尽
           materialNextStepFlagError().then(res => {
@@ -659,12 +665,10 @@ export default {
         delFlag: 1,
         batchId: this.processing.batchId
       }
-      console.log(params)
       stepProcess(params).then(res => {
         this.passList = res.data
-        if (res.data.length()>0){
+        this.nextStepFlagError = res.data.filter(item => item.operation === 1).length > 0 ? res.data.filter(item => item.operation === 1)[0].state : -1
-          this.nextStepFlagError = res.data.filter(item => item.operation === 1)>0?res.data.filter(item => item.operation === 1)[0].state:-1
+        this.nowPass = this.passList.filter(item => item.operation === 1).length > 0 ? this.passList.filter(item => item.operation === 1)[0] : {}
-          this.nowPass = this.passList.filter(item => item.operation === 1)>0?this.passList.filter(item => item.operation === 1)[0]:{}
         if (this.nowPass !== {}) {
           let nowPass = this.nowPass
 
@@ -678,10 +682,9 @@ export default {
             5: 180,
             6: 270,
             7: 225,
-              8: 315,
+            8: 315
-            };
-            this.circleStart = angleMap[temp];
           }
+          this.circleStart = angleMap[temp]
         }
       })
     },

src/views/work/process/index.vue

@@ -538,10 +538,6 @@ export default {
             this.dialogVisible = true
             this.finalData = this.dataList
           }
-          if (res.data === 0) {
-            // 返回值等于0 表示没有切换物料
-
-          }
           this.getDataList()
           materialNextStepFlag().then(res => {
             if (res.data === 1) {