结束卷代码 BUG 修改

src/views/modules/yieldReport/com_finish_roll.vue

@@ -549,54 +549,51 @@ export default {
     },
 
     /*刷新当前的页面参数*/
-    refreshPageData(){
+    async refreshPageData(){
       //1.刷新当前卷的报工数据
-      getCurrentRollReportedQty(this.scheduleData).then(({data}) => {
+      await getCurrentRollReportedQty(this.scheduleData).then(({data}) => {
         this.pageData.approvedQty = data.row.approvedQty;
         this.pageData.defectedQty = data.row.defectedQty;
         this.pageData.totalQty = data.row.totalQty;
         this.pageData.otherRollQty = data.row.otherRollQty;
-      }).then(() => {
-        //2.刷新当前卷的时间信息
-        countSfdcTimeQty(this.scheduleData).then(({data}) => {
-          this.pageData.totalSetupTime = data.row.totalSetupTime;
-          this.pageData.totalDowntimeTimeSetup = data.row.totalDowntimeTimeSetup;
-          this.pageData.totalPureSetupTime = data.row.totalPureSetupTime;
-          this.pageData.totalProdTime = data.row.totalProdTime;
-          this.pageData.totalDowntimeTimeProd = data.row.totalDowntimeTimeProd;
-          this.pageData.totalPureProdTime = data.row.totalPureProdTime;
-          this.pageData.totalManufactureTime = data.row.totalManufactureTime;
-          this.pageData.totalManufactureDowntimeTime = data.row.totalManufactureDowntimeTime;
-          this.pageData.totalPureManufactureTime = data.row.totalPureManufactureTime;
-          //先预设一些参数  后期方法再计算
-          //生产时间=总生产时间
-          this.pageData.sfdcProdTime = this.pageData.totalProdTime;
-          //调机时间=总调机时间
-          this.pageData.sfdcSetupTime = this.pageData.totalSetupTime;
-          //制造时间=总制造时间
-          this.pageData.sfdcManufactureTime = this.pageData.totalManufactureTime;
-          //调机停机=总调机过程停机时间
-          this.pageData.sfdcSetupDownTime = this.pageData.totalDowntimeTimeSetup;
-          //生产调机=总生产过程停机时间
-          this.pageData.sfdcProdSetupTime = this.pageData.totalDowntimeTimeProd;
-          //停机时间=总制造过程停机时间
-          this.pageData.sfdcDownTime = this.pageData.totalManufactureDowntimeTime;
-        });
-      }).then(() => {
+      })
+      //2.刷新当前卷的时间信息
+      await countSfdcTimeQty(this.scheduleData).then(({data}) => {
+        this.pageData.totalSetupTime = data.row.totalSetupTime;
+        this.pageData.totalDowntimeTimeSetup = data.row.totalDowntimeTimeSetup;
+        this.pageData.totalPureSetupTime = data.row.totalPureSetupTime;
+        this.pageData.totalProdTime = data.row.totalProdTime;
+        this.pageData.totalDowntimeTimeProd = data.row.totalDowntimeTimeProd;
+        this.pageData.totalPureProdTime = data.row.totalPureProdTime;
+        this.pageData.totalManufactureTime = data.row.totalManufactureTime;
+        this.pageData.totalManufactureDowntimeTime = data.row.totalManufactureDowntimeTime;
+        this.pageData.totalPureManufactureTime = data.row.totalPureManufactureTime;
+        //先预设一些参数  后期方法再计算
+        //生产时间=总生产时间
+        this.pageData.sfdcProdTime = this.pageData.totalProdTime;
+        //调机时间=总调机时间
+        this.pageData.sfdcSetupTime = this.pageData.totalSetupTime;
+        //制造时间=总制造时间
+        this.pageData.sfdcManufactureTime = this.pageData.totalManufactureTime;
+        //调机停机=总调机过程停机时间
+        this.pageData.sfdcSetupDownTime = this.pageData.totalDowntimeTimeSetup;
+        //生产调机=总生产过程停机时间
+        this.pageData.sfdcProdSetupTime = this.pageData.totalDowntimeTimeProd;
+        //停机时间=总制造过程停机时间
+        this.pageData.sfdcDownTime = this.pageData.totalManufactureDowntimeTime;
+      });
         //3.刷新派工单的班次信息
-        getScheduleShiftData(this.scheduleData).then(({data}) => {
+      await getScheduleShiftData(this.scheduleData).then(({data}) => {
           this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
           this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
         });
-      }).then(() => {
         //4.刷新当前卷的最早和最晚时间
-        getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
+       await getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
           this.pageData.eventTime = data.row.eventTime;
           this.pageData.tillTime = data.row.tillTime;
         });
-      }).then(() => {
         //5.刷新当前卷的Sfdc表的时间
-        getSfdcTimeData(this.scheduleData).then(({data}) => {
+       await getSfdcTimeData(this.scheduleData).then(({data}) => {
           //先判断是否成功查询
           if(data.resultCode == 200){
             //判断是否操作成功
@@ -611,21 +608,16 @@ export default {
             //暂时不处理数据
           }
         });
-      }).then(() => {
         //6.刷新当前卷的报工数据
-        getSfdcReportedData(this.scheduleData).then(({data}) => {
+        await getSfdcReportedData(this.scheduleData).then(({data}) => {
           this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
           this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
           this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
         });
-      }).then(() => {
         //刷新当前卷的时间数据
-        getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
+        await getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
           this.sfdcMaterialList = data.rows;
         });
-      });
-
-
     },
 
     /*刷新当前卷的报工数据汇总*/

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -2797,13 +2797,19 @@ export default {
       });
     },
     // 获取当前卷的信息
-    getCurrentRollOpsBySeqNoFun() {
-      getCurrentRollOpsBySeqNo(this.currentRollOps).then(({data}) => {
-        this.currentRollOps.rollNo = data.row.rollNo;
-        this.scheduleData.rollNo = data.row.rollNo;
-        this.currentRollOps.finishedFlag = data.row.finishedFlag;
+    async getCurrentRollOpsBySeqNoFun() {
+      await getCurrentRollOpsBySeqNo(this.currentRollOps).then(({data}) => {
+        if(data.code === 200){
+          this.currentRollOps.rollNo = data.row.rollNo;
+          this.scheduleData.rollNo = data.row.rollNo;
+          this.currentRollOps.finishedFlag = data.row.finishedFlag;
+        }else{
+          this.currentRollOps.rollNo = '';
+          this.scheduleData.rollNo = '';
+        }
         //设置查询的数据
         this.searchData = JSON.parse(JSON.stringify(this.scheduleData));
+        console.log(123)
       });
     },
 
@@ -2814,8 +2820,8 @@ export default {
     },
 
     //刷新派工单的时间的记录
-    getSfdcTimeList() {
-      getSfdcTimeByCon(this.searchData).then(({data}) => {
+    async getSfdcTimeList() {
+     await getSfdcTimeByCon(this.searchData).then(({data}) => {
         this.sfdcTimeList = data.rows;
       });
     },
@@ -2870,7 +2876,10 @@ export default {
     },
 
     //刷新页签的table数据
-    refreshCurrentTabTable() {
+    async refreshCurrentTabTable() {
+      console.log(456)
+      //设置查询的数据
+      this.searchData = JSON.parse(JSON.stringify(this.scheduleData));
       //判断是否按照当前卷来查询
       if (this.scheduleData.currentRollFlag) {
         //设置相关的卷号 判断是否存在卷
@@ -2878,9 +2887,11 @@ export default {
       } else {
         this.searchData.rollNo = '';
       }
+
+      console.log(this.scheduleData,this.searchData)
       //区分不同的页签刷新不同的列表数据
       if (this.activeTable == 'sfdc_time') {
-        this.getSfdcTimeList();
+       await this.getSfdcTimeList();
       } else if (this.activeTable == 'sfdc_tool') {
         this.getOrderToolList();
         this.getSfdcToolList();
@@ -2905,8 +2916,9 @@ export default {
     },
 
     //刷新页面的数据
-    refreshPageData() {
-      getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
+    async refreshPageData() {
+      await getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
+        console.log(12)
         this.scheduleData.seqNo = data.row.seqNo;
         this.scheduleData.orderNo = data.row.orderNo;
         this.scheduleData.itemNo = data.row.itemNo;
@@ -2926,24 +2938,22 @@ export default {
         //设置弹窗的标题
         this.titleCon = '机台工作台' + ' - ' + data.row.workCenterDesc + ' '
           + data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';
-      }).then(() => {
-        //打开模态框
-        this.visibleFlag = true;
+      })
         //刷新页面的卷信息
-        this.getCurrentRollOpsBySeqNoFun();
-      }).then(() => {
+      await  this.getCurrentRollOpsBySeqNoFun();
+
         //设置table页签
         this.activeTable = 'sfdc_time';
         //刷新当前页签的table的内容
-        this.refreshCurrentTabTable();
-      }).then(() => {
+        await this.refreshCurrentTabTable();
+
         //刷新当前的菜单
-        this.refreshPageButtons();
-      });
+       await this.refreshPageButtons();
+
     },
 
     //刷新当前页面的菜单
-    refreshPageButtons() {
+    async refreshPageButtons() {
       //判断是否存在人员
       if (this.operatorData.operatorId == null || this.operatorData.operatorId == '') {
         this.buttonTags.createNewRollFlag = true;
@@ -2960,7 +2970,7 @@ export default {
         //存在人员既可以合并卷
         this.buttonTags.mergeRollFlag = false;
         //刷新其他的菜单
-        refreshWorkPlatformButtons(this.scheduleData).then(({data}) => {
+        await refreshWorkPlatformButtons(this.scheduleData).then(({data}) => {
           if (data.resultMap.createNewRollFlag == 'Y') {
             this.buttonTags.createNewRollFlag = false;
           } else {