From 01a90ce20bc50b1857db2541fb0242c8dbe53da6 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Thu, 5 May 2022 16:22:02 +0800
Subject: [PATCH] =?UTF-8?q?2022-05-05=20=E6=9A=82=E6=97=A0=E7=8F=AD?=
 =?UTF-8?q?=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/yieldReport/com_finish_part_roll.vue | 6 +++---
 src/views/modules/yieldReport/com_finish_roll.vue      | 2 +-
 src/views/modules/yieldReport/not_over_finish_roll.vue | 2 +-
 src/views/modules/yieldReport/print_roll_label.js      | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/yieldReport/com_finish_part_roll.vue b/src/views/modules/yieldReport/com_finish_part_roll.vue
index 5563830..bb1e298 100644
--- a/src/views/modules/yieldReport/com_finish_part_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_part_roll.vue
@@ -595,11 +595,11 @@ export default {
         this.pageData.sfdcDownTime = this.pageData.totalManufactureDowntimeTime;
       });
         //3.刷新派工单的班次信息
-      await getScheduleShiftData(this.scheduleData).then(({data}) => {
+      await getScheduleShiftData(this.pageData).then(({data}) => {
           let specialAuth = 'N';
            //区分是否存在班次
           if(data.code == 500){
-            this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+            this.pageData.shiftDesc = '无班次';//重置班次
             this.pageData.scheduledDate = '';//重置排产日期
             this.pageData.shiftNo = '';
           }else{
@@ -679,7 +679,7 @@ export default {
       getScheduleShiftData(this.scheduleData).then(({data}) => {
         //区分是否存在班次
         if(data.code == 500){
-          this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+          this.pageData.shiftDesc = '无班次';//重置班次
           this.pageData.scheduledDate = '';//重置排产日期
           this.pageData.shiftNo = '';
         }else{
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 7db80d8..7dc5150 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -619,7 +619,7 @@ export default {
         let specialAuth = 'N';
            //区分是否存在班次
           if(data.code == 500){
-            this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+            this.pageData.shiftDesc = '无班次';//重置班次
             this.pageData.scheduledDate = '';//重置排产日期
             this.pageData.shiftNo = '';
           }else{
diff --git a/src/views/modules/yieldReport/not_over_finish_roll.vue b/src/views/modules/yieldReport/not_over_finish_roll.vue
index 3a60f9d..f808930 100644
--- a/src/views/modules/yieldReport/not_over_finish_roll.vue
+++ b/src/views/modules/yieldReport/not_over_finish_roll.vue
@@ -669,7 +669,7 @@ export default {
         let specialAuth = 'N';
         //区分是否存在班次
         if (data.code == 500) {
-          this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+          this.pageData.shiftDesc = '无班次';//重置班次
           this.pageData.scheduledDate = '';//重置排产日期
           this.pageData.shiftNo = '';
         } else {
diff --git a/src/views/modules/yieldReport/print_roll_label.js b/src/views/modules/yieldReport/print_roll_label.js
index 013b47e..b6be950 100644
--- a/src/views/modules/yieldReport/print_roll_label.js
+++ b/src/views/modules/yieldReport/print_roll_label.js
@@ -47,7 +47,7 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_TEXT(122,137,38,20,"库位");
       LODOP.ADD_PRINT_TEXT(27,122,100,20, printData.rollNo);
       LODOP.ADD_PRINT_TEXT(45,115,100,20, printData.partNo);
-      LODOP.ADD_PRINT_TEXT(66,70,165,20, printData.supplierDesc);
+      LODOP.ADD_PRINT_TEXT(66,70,190,15, printData.supplierDesc);
       LODOP.ADD_PRINT_TEXT(88,70,187,35, printData.partDesc +' '+ printData.spec);
       LODOP.ADD_PRINT_TEXT(122,69,43,20, printData.rollQty);
       LODOP.ADD_PRINT_TEXT(121,176,83,20,printData.locationId);
@@ -57,9 +57,9 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_BARCODE(137,187,100,75,"QRCode", printData.rollNo);
       LODOP.ADD_PRINT_TEXT(189,120,90,17, printData.createdBy);
     }
-    //LODOP.PRINT_DESIGN();
+    LODOP.PRINT_DESIGN();
     //LODOP.PREVIEW();
-    LODOP.PRINT();
+    //LODOP.PRINT();
 
     console.log("操作成功！")
   }