From 5d7d2ded5353c26338a53243630a4a9d4afbbbf4 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 6 Apr 2022 16:16:14 +0800
Subject: [PATCH] =?UTF-8?q?0404BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/schedule/com_schedule_order_expand.vue | 8 ++++++--
 src/views/modules/yieldReport/com_finish_roll.vue        | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/schedule/com_schedule_order_expand.vue b/src/views/modules/schedule/com_schedule_order_expand.vue
index ac39a7b..fa8d30f 100644
--- a/src/views/modules/schedule/com_schedule_order_expand.vue
+++ b/src/views/modules/schedule/com_schedule_order_expand.vue
@@ -994,8 +994,6 @@ export default {
       this.orderScheduleList = [];
       //页面的参数
       this.refreshShopOrderData(orderRow);
-      //刷新当前的可用机台
-      this.getOrderAvailableResourceData();
     },
 
     //刷新派工单的数据
@@ -1006,6 +1004,8 @@ export default {
         this.pageData.needDate = data.row.needDate;
         this.pageData.workCenterNo = data.row.workCenterNo;
         this.pageData.itemDesc = data.row.itemDesc;
+        //刷新当前的可用机台
+        this.getOrderAvailableResourceData();
       });
     },
 
@@ -1016,6 +1016,10 @@ export default {
         //判断是否只有一个  默认选中第一个
         if(data.rows.length == 1){
           this.pageData.resourceId = data.rows[0].resourceId;
+          //刷新列表数据
+          this.getOrderScheduleList();
+          //刷新班次的数据
+          this.getResourceShiftData();
         }
       });
     },
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index c0309e9..7db80d8 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -597,9 +597,9 @@ export default {
         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.totalManufactureTime = data.row.totalManufactureTime.toFixed(2);
         this.pageData.totalManufactureDowntimeTime = data.row.totalManufactureDowntimeTime;
-        this.pageData.totalPureManufactureTime = data.row.totalPureManufactureTime;
+        this.pageData.totalPureManufactureTime = data.row.totalPureManufactureTime.toFixed(2);
         //先预设一些参数  后期方法再计算
         //生产时间=总生产时间
         this.pageData.sfdcProdTime = this.pageData.totalProdTime;
@@ -890,6 +890,7 @@ export default {
       //重置班次和排产的时间
       this.pageData.scheduledDate = scheduleDate.substring(0, 10);
       this.pageData.shiftDesc = shiftDesc;
+      this.pageData.shiftNo = shiftDesc;
       this.pageData.remark = username+"更改了班次."
     },