From f280f8050385bf3a404018a4987e4059e0d13a7d Mon Sep 17 00:00:00 2001
From: DOUDOU <877258667@qq.com>
Date: Fri, 8 Dec 2023 16:56:23 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BF=AE=E6=94=B92023-12-08=20LR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/yieldReport/com_finish_schedule.vue | 10 +++-------
 src/views/modules/yieldReport/print_roll_label.js     |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue
index bcbeac3..0f55275 100644
--- a/src/views/modules/yieldReport/com_finish_schedule.vue
+++ b/src/views/modules/yieldReport/com_finish_schedule.vue
@@ -1315,15 +1315,11 @@
         //首先判断数值是否通过判断
         let approvedQty = this.pageData.approvedQty;
         let defectedQty = this.pageData.defectedQty;
-        debugger;;
-        console.log(0==null )
-        console.log(0=='' )
         if (approvedQty == null || approvedQty === '') {
           this.$message.error(this.labels.pleaseEnterTotalApprovedQty);
           this.pageData.approvedQty = 0;//重新赋值
           return false;
         }
-        debugger;;
         if (approvedQty < 0) {
           this.$message.error(this.labels.totalApprovedQtyMustMoreTanZero);
           this.pageData.approvedQty = 0;//重新赋值
@@ -1331,7 +1327,7 @@
         }
         //校验总良品+不良的数量
         if ((approvedQty + defectedQty) <= 0) {
-          this.$message.error(this.seqNoValidApprovedAndDefectQty);
+          this.$message.error(this.labels.seqNoValidApprovedAndDefectQty);
           this.pageData.approvedQty = 0;//重新赋值
           return false;
         }
@@ -1476,7 +1472,7 @@
       getMultiLanguageList() {
         //首先查询当前按钮的多语言
         searchFunctionButtonList(this.queryButton).then(({data}) => {
-          if (data && data.code == 0 ) {
+          if (data && data.code === 0 ) {
             this.buttons = data.data
           } else {
             // saveButtonList(this.buttonList).then(({data}) => {
@@ -1485,7 +1481,7 @@
         });
         //其次查询当前标签的多语言
         searchFunctionButtonList(this.queryLabel).then(({data}) => {
-          if (data && data.code == 0 ) {
+          if (data && data.code === 0 ) {
             this.labels = data.data
           } else {
             // saveButtonList(this.buttonList).then(({data}) => {
diff --git a/src/views/modules/yieldReport/print_roll_label.js b/src/views/modules/yieldReport/print_roll_label.js
index 81d9c27..e2b7133 100644
--- a/src/views/modules/yieldReport/print_roll_label.js
+++ b/src/views/modules/yieldReport/print_roll_label.js
@@ -45,7 +45,7 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_TEXT(190,7,60,15,"入库人员");
       LODOP.ADD_PRINT_TEXT(206,7,60,15,"校验签章");
       LODOP.ADD_PRINT_TEXT(122,137,38,20,"库位");
-      LODOP.ADD_PRINT_TEXT(27,70,100,20, printData.rollNo);
+      LODOP.ADD_PRINT_TEXT(27,70,150,20, printData.rollNo);
       LODOP.ADD_PRINT_TEXT(45,115,100,20, printData.partNo);
       LODOP.ADD_PRINT_TEXT(66,70,190,15, printData.supplierDesc);
       LODOP.ADD_PRINT_TEXT(88,70,187,35, printData.partDesc +' '+ printData.spec);
@@ -111,7 +111,7 @@ export function printSfdcLabel(printList) {
       LODOP.ADD_PRINT_TEXT(138,7,60,15,"数量");
       LODOP.ADD_PRINT_TEXT(154,7,50,15,"工序");
       LODOP.ADD_PRINT_TEXT(172,7,47,20,"下道");
-      LODOP.ADD_PRINT_TEXT(27,120,100,15, printData.rollNo);
+      LODOP.ADD_PRINT_TEXT(27,70,150,15, printData.rollNo);
       LODOP.ADD_PRINT_TEXT(42,115,100,15, printData.partNo);
       LODOP.ADD_PRINT_TEXT(55,70,185,35, printData.partDesc);
       LODOP.ADD_PRINT_TEXT(92,70,185,15, printData.customerPartNo);