变更

src/views/work/abnormal_process/index.vue

@@ -509,7 +509,7 @@ export default {
     nextStep() {
       let step = this.nowPass
       if (step && step.state === 0) {
-        alert('请操作当前道次')
+        this.$message('请操作当前道次')
         this.nextStepLoading = false
       } else {
         this.nextStepLoading = true
@@ -566,7 +566,6 @@ export default {
         if (res.data !== 0) {
           materialNextStepFlagError().then(res => {
             this.submitButton = res.data === 0
-            this.getDataList()
           })
           alert('开始轧制')
           this.getDataList()
@@ -658,27 +657,31 @@ export default {
       let params = {
         materialId: this.processing.id,
         delFlag: 1,
-        batchId: this.processing.batchId
+        batchId: this.processBatchId
       }
       stepProcess(params).then(res => {
         this.passList = res.data
-        this.nextStepFlagError = res.data.filter(item => item.operation === 1)[0].state
-        this.nowPass = this.passList.filter(item => item.operation === 1)[0]
-        let nowPass = this.nowPass
+        if (res.data.length()>0){
+          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)>0?this.passList.filter(item => item.operation === 1)[0]:{}
+          if (this.nowPass!=={}){
+            let nowPass = this.nowPass
 
-        let temp = nowPass.step % 8
-        const angleMap = {
-          0: 315,
-          1: 0,
-          2: 90,
-          3: 45,
-          4: 135,
-          5: 180,
-          6: 270,
-          7: 225,
-          8: 315,
-        };
-        this.circleStart = angleMap[temp];
+            let temp = nowPass.step % 8
+            const angleMap = {
+              0: 315,
+              1: 0,
+              2: 90,
+              3: 45,
+              4: 135,
+              5: 180,
+              6: 270,
+              7: 225,
+              8: 315,
+            };
+            this.circleStart = angleMap[temp];
+          }
+        }
       })
     },