From d09a6913f41878e9114a93a2e2574c511cad94cd Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 26 Mar 2024 21:17:18 +0800
Subject: [PATCH] 1

---
 .../modules/print/label/print_seqNo_label.js  | 37 +++++++++----------
 src/views/modules/schedule/generateReport.vue |  4 +-
 .../modules/schedule/scheduleForSOTask.vue    |  9 +++--
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/print/label/print_seqNo_label.js b/src/views/modules/print/label/print_seqNo_label.js
index d3d2e40..446ea94 100644
--- a/src/views/modules/print/label/print_seqNo_label.js
+++ b/src/views/modules/print/label/print_seqNo_label.js
@@ -11,30 +11,30 @@ export function printSeqNoLabel(printList) {
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
       LODOP.NewPage();
-      LODOP.SET_PRINT_PAGESIZE(0,700,400,"");
+      LODOP.SET_PRINT_PAGESIZE(0,700,390,"");
       LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);
-      LODOP.ADD_PRINT_BARCODE(32,165,191,94,"QRCode",printData.seqNo);
-      LODOP.ADD_PRINT_TEXT(4,44,95,25,printData.sScheduledDate);
+      LODOP.ADD_PRINT_BARCODE(31,164,191,94,"QRCode",printData.seqNo);
+      LODOP.ADD_PRINT_TEXT(12,44,95,25,printData.sScheduledDate);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(3,139,111,25,printData.itemDesc);
+      LODOP.ADD_PRINT_TEXT(12,139,111,25,printData.itemDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(28,1,69,25,"派工单号：");
+      LODOP.ADD_PRINT_TEXT(32,1,69,25,"派工单号：");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(28,57,112,25,printData.seqNo);
+      LODOP.ADD_PRINT_TEXT(32,57,112,25,printData.seqNo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(53,1,69,25,"物料编码：");
+      LODOP.ADD_PRINT_TEXT(55,1,69,25,"物料编码：");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(53,57,112,25,printData.partNo);
+      LODOP.ADD_PRINT_TEXT(55,57,112,25,printData.partNo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -46,32 +46,29 @@ export function printSeqNoLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_RECT(1,0,254,148,0,1);
-      LODOP.ADD_PRINT_LINE(25,1,25,254,0,1);
-      LODOP.ADD_PRINT_LINE(124,0,124,253,0,1);
-      LODOP.ADD_PRINT_TEXT(103,1,69,25,"工单号：");
+      LODOP.ADD_PRINT_RECT(9,0,254,136,0,1);
+      LODOP.ADD_PRINT_LINE(31,1,31,254,0,1);
+      LODOP.ADD_PRINT_LINE(122,0,122,253,0,1);
+      LODOP.ADD_PRINT_TEXT(101,1,69,25,"工单号：");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(103,57,112,25,printData.orderNo);
+      LODOP.ADD_PRINT_TEXT(101,57,112,25,printData.orderNo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(4,2,55,25,printData.operatorName);
+      LODOP.ADD_PRINT_TEXT(12,2,55,25,printData.operatorName);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(129,0,64,25,"物料名称:");
+      LODOP.ADD_PRINT_TEXT(125,0,64,25,"物料名称:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(129,62,191,25,printData.partDesc);
+      LODOP.ADD_PRINT_TEXT(125,62,191,25,printData.partDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-
-
-
+      LODOP.SET_PRINT_STYLEA(0,"LineSpacing",30);
 
     }
     // LODOP.PRINT_DESIGN();
diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue
index 373cc97..7825aa8 100644
--- a/src/views/modules/schedule/generateReport.vue
+++ b/src/views/modules/schedule/generateReport.vue
@@ -601,7 +601,7 @@
     methods: {
        saveReport () {
         this.saveHeaderData.qtyReported=Number(this.saveHeaderData.qtyUnApprove)+Number(this.saveHeaderData.qtyApprove);
-        if (this.saveHeaderData.qtyUnApprove == null || this.saveHeaderData.qtyUnApprove < 0) {
+        if (this.saveHeaderData.qtyUnApprove == null||this.saveHeaderData.qtyUnApprove === '' || this.saveHeaderData.qtyUnApprove < 0) {
           this.$alert('不合格数量错误！', '错误信息', {
             confirmButtonText: '确定'
           })
@@ -903,7 +903,7 @@
       changeSum(){
         this.saveHeaderData.qtyUnApprove=0
         for (let i = 0; i <this.badList.length ; i++) {
-          if(this.badList[i].defectQty!==''&&this.badList[i].defectCode!==''){
+          if(this.badList[i].defectQty!==null&&this.badList[i].defectCode!==''){
            this.saveHeaderData.qtyUnApprove= Number(this.badList[i].defectQty)+Number(this.saveHeaderData.qtyUnApprove)
           }
         }
diff --git a/src/views/modules/schedule/scheduleForSOTask.vue b/src/views/modules/schedule/scheduleForSOTask.vue
index 5412095..14b95ef 100644
--- a/src/views/modules/schedule/scheduleForSOTask.vue
+++ b/src/views/modules/schedule/scheduleForSOTask.vue
@@ -183,7 +183,8 @@
         prop="orderDate"
         header-align="center"
         align="left"
-        min-width="130"
+        min-width="90"
+        sortable
         label="计划日期">
       </el-table-column>
       <el-table-column
@@ -191,7 +192,7 @@
         header-align="center"
         align="left"
         sortable
-        width="130"
+        width="90"
         sortable
         label="ERP要求完工日期">
       </el-table-column>
@@ -199,7 +200,7 @@
         prop="orderRef1"
         header-align="center"
         align="left"
-        min-width="130"
+        min-width="120"
         label="生产订单号">
       </el-table-column>
       <el-table-column
@@ -219,7 +220,7 @@
       <el-table-column
         prop="soremark"
         header-align="center"
-        align="right"
+        align="left"
         min-width="200"
         label="生产订单备注">
       </el-table-column>