From e514e5f1043525fce4c6cbc97722113d16fc5901 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 10 Apr 2023 18:21:07 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/board/inspectBoard.vue      |   2 +-
 src/views/modules/print/print_stock_label.js  |   4 +
 .../print/print_stock_label_preview.js        |   4 +
 .../modules/print/print_transNo_label.js      | 202 ++++--
 src/views/modules/production/cancelSfdc.vue   |  55 ++
 .../production/cancelSfdcForWareHouse.vue     |  54 +-
 .../modules/production/generateReport.vue     |  56 +-
 src/views/modules/production/searchSfdc.vue   | 613 ++++++++++++++++++
 src/views/modules/production/stockPrint.vue   |   1 +
 9 files changed, 914 insertions(+), 77 deletions(-)
 create mode 100644 src/views/modules/production/searchSfdc.vue

diff --git a/src/views/modules/board/inspectBoard.vue b/src/views/modules/board/inspectBoard.vue
index 5ca15a7..68193cd 100644
--- a/src/views/modules/board/inspectBoard.vue
+++ b/src/views/modules/board/inspectBoard.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mod-config">
     <div style="text-align: center">
-      <h1>实验室看板</h1>
+      <h1>实验室待检验看板</h1>
     </div>
     <div class="board2">
       <!--        @mouseenter.native="mouseEnter"-->
diff --git a/src/views/modules/print/print_stock_label.js b/src/views/modules/print/print_stock_label.js
index 760f40d..bfe6394 100644
--- a/src/views/modules/print/print_stock_label.js
+++ b/src/views/modules/print/print_stock_label.js
@@ -74,6 +74,10 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_TEXT(177,300,100,25,printData.expiredDate);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(29,209,189,25,printData.status);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     // LODOP.PRINT_DESIGN();
     // LODOP.PREVIEW();
diff --git a/src/views/modules/print/print_stock_label_preview.js b/src/views/modules/print/print_stock_label_preview.js
index 9059b9e..6260ad7 100644
--- a/src/views/modules/print/print_stock_label_preview.js
+++ b/src/views/modules/print/print_stock_label_preview.js
@@ -74,6 +74,10 @@ export function printMaterialLabelPreview(printList) {
       LODOP.ADD_PRINT_TEXT(177,300,100,25,printData.expiredDate);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(29,209,189,25,printData.status);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     // LODOP.PRINT_DESIGN();
     LODOP.PREVIEW();
diff --git a/src/views/modules/print/print_transNo_label.js b/src/views/modules/print/print_transNo_label.js
index b96a908..e3580cf 100644
--- a/src/views/modules/print/print_transNo_label.js
+++ b/src/views/modules/print/print_transNo_label.js
@@ -9,76 +9,144 @@ export function printTransNoLabel(printList) {
     //LODOP.SET_PRINTER_INDEXA("小标签打印机");
     //循环调用打印机
     for(let i = 0; i < printList.length; i++){
+
       let printData = printList[i];
-      let remark='';
-      if(printData.partNo.substring(0,2)=='FP'){
-        remark='产成品'
-      }else if(printData.partNo.substring(0,2)=='SP'){
-        remark='半成品'
+      if(printData.type=='trans') {
+        let remark = '';
+        if (printData.partNo.substring(0, 2) == 'FP') {
+          remark = '产成品'
+        } else if (printData.partNo.substring(0, 2) == 'SP') {
+          remark = '半成品'
+        } else {
+          remark = '混炼胶'
+        }
+        LODOP.NewPage();
+        LODOP.SET_PRINT_PAGESIZE(0, 1000, 700, "");
+        LODOP.ADD_PRINT_BARCODE(43, 244, 208, 140, "QRCode", printData.transNo);
+        LODOP.ADD_PRINT_TEXT(82, 8, 108, 25, "Part:");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(82, 55, 195, 56, printData.partNo + '|' + printData.partDesc);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(155, 8, 77, 24, "Job No:");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(155, 110, 140, 20, printData.seqNo);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(134, 8, 113, 22, "Equip No:");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(134, 110, 139, 25, printData.workCenterNo);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(41, 8, 98, 25, "Trans No:");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(41, 110, 136, 25, printData.transNo);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(175, 8, 94, 25, "Order No:");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(175, 110, 141, 25, printData.orderNo);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(61, 8, 121, 25, "Trans Q.T.Y:");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(61, 110, 138, 24, printData.transQty + printData.umid);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(194, 8, 97, 25, "Trans Date:");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(194, 110, 244, 25, printData.transDate);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(224, 5, 256, 24, "Manufactured by A&M Polymer");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.ADD_PRINT_TEXT(224, 212, 156, 25, "IATF:16949 Certified");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Alignment", 3);
+        LODOP.ADD_PRINT_LINE(218, 2, 217, 374, 0, 1);
+        LODOP.ADD_PRINT_TEXT(12, 122, 135, 30, "入库通知单");
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 12);
+        LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(194, 266, 110, 25, "工厂编码:" + printData.site);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 11);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+        LODOP.ADD_PRINT_TEXT(174, 267, 100, 21, remark);
+        LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+        LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
       }else {
-        remark='混炼胶'
+        LODOP.NewPage();
+        LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+        LODOP.ADD_PRINT_TEXT(95,208,173,46,'合格');
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",30);
+        LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(88,8,108,25,"Part:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(88,50,200,50,printData.partNo+'|'+printData.partDesc);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(153,8,128,24,"Operator:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(153,110,140,20,printData.operatorName);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(132,8,113,25,"Shift:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(132,110,139,25,printData.sShiftNo);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(41,8,98,25,"Job No:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.seqNo);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(173,8,94,25,"Order No:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(173,110,141,25,printData.orderNo);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(64,8,96,25,"Q.T.Y:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(64,70,188,24,printData.qtyRequired+printData.umid+' | '+printData.weight+'公斤');
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(194,8,128,25,"MFG Date:");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(194,110,170,25,printData.sScheduledDate);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.ADD_PRINT_TEXT(224,212,156,25,"IATF:16949 Certified");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+        LODOP.ADD_PRINT_LINE(218,2,217,374,0,1);
+        LODOP.ADD_PRINT_TEXT(12,122,135,30,"派工单检验标签");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+        LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+        LODOP.ADD_PRINT_TEXT(175,265,110,20,"工序:"+printData.itemDesc);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       }
-      LODOP.NewPage();
-      LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
-      LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.transNo);
-      LODOP.ADD_PRINT_TEXT(82,8,108,25,"Part:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(82,55,195,56,printData.partNo+'|'+printData.partDesc);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(155,8,77,24,"Job No:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(155,110,140,20,printData.seqNo);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(134,8,113,22,"Equip No:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(134,110,139,25,printData.workCenterNo);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(41,8,98,25,"Trans No:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.transNo);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(175,8,94,25,"Order No:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(175,110,141,25,printData.orderNo);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(61,8,121,25,"Trans Q.T.Y:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(61,110,138,24,printData.transQty+printData.umid);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(194,8,97,25,"Trans Date:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(194,110,244,25,printData.transDate);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(224,212,156,25,"IATF:16949 Certified");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-      LODOP.ADD_PRINT_LINE(218,2,217,374,0,1);
-      LODOP.ADD_PRINT_TEXT(12,122,135,30,"入库通知单");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(174,267,100,21,remark);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     // LODOP.PRINT_DESIGN();
     // LODOP.PREVIEW();
diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue
index 2a07af6..54dbb7c 100644
--- a/src/views/modules/production/cancelSfdc.vue
+++ b/src/views/modules/production/cancelSfdc.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'派工单号'">
+        <el-input v-model="searchData.seqNo" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 130px"></el-input>
+      </el-form-item>
       <el-form-item :label="'生产订单号'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
@@ -379,6 +382,57 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportWeight",
+            columnLabel: "报告重量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "approveWeight",
+            columnLabel: "合格重量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "moldQty",
+            columnLabel: "模数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
@@ -454,6 +508,7 @@
         height: 200,
         tableData: [],
         searchData: {
+          seqNo:'',
           orderNo: '',
           workCenterNo: '',
           partNo: '',
diff --git a/src/views/modules/production/cancelSfdcForWareHouse.vue b/src/views/modules/production/cancelSfdcForWareHouse.vue
index 71dafdb..fd95a1b 100644
--- a/src/views/modules/production/cancelSfdcForWareHouse.vue
+++ b/src/views/modules/production/cancelSfdcForWareHouse.vue
@@ -2,7 +2,7 @@
   <div class="mod-config">
     <el-form :inline="true"  label-position="top" label-width="100px" >
       <el-form-item :label="'派工单号'">
-        <el-input v-model="searchData.seqNo" style="width: 130px"></el-input>
+        <el-input v-model="searchData.seqNo" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 130px"></el-input>
       </el-form-item>
 
       <el-form-item :label="' '">
@@ -325,6 +325,58 @@
             columnType: null,
             align: 'right'
           }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportWeight",
+            columnLabel: "报告重量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "approveWeight",
+            columnLabel: "合格重量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "moldQty",
+            columnLabel: "模数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
             columnProp: "reportedManfTime",
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 53cb46c..256a914 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -429,7 +429,7 @@
       </el-form>
       <el-form :inline="true" label-position="top">
         <el-form-item label="框重(KG)">
-          <el-input  type="number"  class="input_left" style="width: 178px;"   v-model="saveHeaderData.boxWeight"  @blur="boxWeightBlur()"></el-input>
+          <el-input  type="number"  class="input_left" style="width: 178px;" :disabled="factorFlag"  v-model="saveHeaderData.boxWeight"  @blur="boxWeightBlur()"></el-input>
         </el-form-item>
         <el-form-item label="停机原因">
           <el-input style="width: 178px;"  v-model="saveHeaderData.shutdownReason"></el-input>
@@ -462,8 +462,8 @@
           <el-input type="number" style="width: 178px;" disabled  v-model="saveHeaderData.manufacturingTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
 <!--          <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.manufacturingTime" size="medium" :min="0" :controls="false"></el-input-number>-->
         </el-form-item>
-        <el-form-item label="清理时间" label-width="0px">
-          <el-input type="number" style="width: 178px;"  v-model="saveHeaderData.cleaningTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
+        <el-form-item label="打印检验标签数" label-width="0px">
+          <el-input type="number" style="width: 178px;" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" v-model="saveHeaderData.printQty"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
           <!--            :min="0" 最小值  :controls="false" 隐藏减价按钮 -->
 <!--          <el-input-number style="width: 178px;text-align: right;"  v-model="saveHeaderData.cleaningTime" size="medium" :min="0" :controls="false"></el-input-number>-->
         </el-form-item>
@@ -570,6 +570,7 @@
         abnormalList:[],
         moQty:'',
         saveHeaderData: {
+          printQty:'',
           boxWeight:0,
           qtyRequire:'',
           qtyUnApprove:'',
@@ -600,6 +601,9 @@
           scheduleType:'',
           userId:'',
           liLunQty:'',
+          reportWeight:'',
+          approveWeight:'',
+          moldQty:'',
         },
         scanSeqNo:'',
         stopModalFlag:false,
@@ -659,6 +663,7 @@
           site:'',
           partNo:'',
         },
+        currentRow:'',
         scanModalFlag:false,
         partDescription:'',
         fileTitle:'',
@@ -697,7 +702,7 @@
           this.abnormalList = data.rows;
         })
       },
-      saveReport () {
+       saveReport () {
         this.saveHeaderData.qtyReported=Number(this.saveHeaderData.qtyUnApprove)+Number(this.saveHeaderData.qtyApprove);
         if (this.saveHeaderData.qtyUnApprove == null || this.saveHeaderData.qtyUnApprove < 0) {
           this.$alert('不合格数量错误！', '错误信息', {
@@ -753,14 +758,37 @@
           })
           return
         }
-        saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => {
+        if(this.moQty==null||this.moQty==''){
+          this.saveHeaderData.moldQty=0
+        }else {
+          this.saveHeaderData.moldQty=this.moQty
+        }
+        let boxWeightKG=0
+        if(this.saveHeaderData.boxWeight!=null&&this.saveHeaderData.boxWeight!=''){
+          boxWeightKG=this.saveHeaderData.boxWeight
+        }
+        if(this.KGApprove!=null&&this.KGApprove!=''&&this.KGApprove>=0){
+          this.saveHeaderData.approveWeight=Number(this.KGApprove)-boxWeightKG
+          if(this.KGReported!=null&&this.KGReported!=''&&this.KGReported>=0){
+            this.saveHeaderData.reportWeight=Number(this.KGApprove)-boxWeightKG+Number(this.KGReported)
+          }
+        }
+         saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => {
           if (data.code == 0) {
             this.$message.success(data.msg)
             this.setUp.reviewFlag = false
             this.search()
+            let inList=[];
             if(data.transData!=null){
-              let inList=[];
               inList.push(data.transData)
+            }
+            if(this.saveHeaderData.printQty>0){
+              for (let i = 0; i <this.saveHeaderData.printQty ; i++) {
+                inList.push(this.currentRow)
+              }
+            }
+            console.log(inList)
+            if(inList.length>0){
               printTransNoLabel(inList);
             }
           } else {
@@ -822,7 +850,6 @@
       initReportModal (row) {
         this.scanSeqNo=row.seqNo
         this.searchSeqNo()
-
       },
       closeDialog () {
         Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData)
@@ -1010,6 +1037,9 @@
             this.saveHeaderData.qtyApprove=0
             this.saveHeaderData.qtyUnApprove=0
             this.saveHeaderData.qtyRework=0
+            this.saveHeaderData.moldQty=0
+            this.saveHeaderData.reportWeight=0
+            this.saveHeaderData.approveWeight=0
             this.saveHeaderData.site = currentData.site;
             this.saveHeaderData.seqNo = currentData.seqNo;
             this.saveHeaderData.itemNo = currentData.itemNo;
@@ -1026,6 +1056,7 @@
             this.saveHeaderData.qtyRequire=currentData.qtyRequired;
             this.saveHeaderData.userId=this.$store.state.user.name;
             this.saveHeaderData.boxWeight=0;
+            this.saveHeaderData.printQty=0;
             this.qty1='';
             this.qty2 ='';
             this.moQty ='';
@@ -1060,6 +1091,16 @@
             this.scanModalFlag=false;
             this.setUp.reviewFlag = true;
             this.setUp.disabled = true;
+            getSOScheduleRoutingData(inData).then(({data}) => {
+              if( data.rows){
+                if(data.rows.length>0){
+                  data.rows[0].weight= Number(data.rows[0].weight.toFixed(2))
+                  data.rows[0].type='jianyan'
+                  this.currentRow=data.rows[0]
+
+                }
+              }
+            })
           } else {
             this.scanSeqNo=''
             this.$alert(data.msg, '错误', {
@@ -1139,7 +1180,6 @@
           this.saveHeaderData.qtyUnApprove=''
         }
       },
-
       KGReworkBlur(){
         if(this.qty3&&this.qty3!=0&&this.qty3!='erp未维护数据'&&this.KGRework!=''){
           this.saveHeaderData.qtyRework=(this.KGRework/this.qty3).toFixed(0)
diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue
new file mode 100644
index 0000000..360309d
--- /dev/null
+++ b/src/views/modules/production/searchSfdc.vue
@@ -0,0 +1,613 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'派工单号'">
+        <el-input v-model="searchData.seqNo" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'生产订单号'">
+        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'加工中心编码'">
+        <el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item >
+        <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
+        <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工序编号'">
+        <el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'加工中心编号'">
+        <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-form-item :label="'报工日期：'">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.startDate"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="'至: '">
+        <el-date-picker
+          style="width: 130px"
+          v-model="searchData.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item >
+        <span slot="label" style="" @click="getBaseList(26)"><a herf="#">操作员姓名</a></span>
+        <el-input v-model="searchData.operatorName" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item >
+        <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
+        <el-input v-model="searchData.resourceId" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'班次'">
+        <el-select v-model="searchData.shiftNo" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="白班" value="白班"></el-option>
+          <el-option label="晚班" value="晚班"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
+        <download-excel
+          :fields="fields()"
+          type="xls"
+          :name="exportName"
+          :fetch="createExportData"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ '导出' }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="tableData"
+      border
+      style="width: 100%">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        header-align="center"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    getSfdcList,
+
+  } from '@/api/production/generateReport.js'
+  import Chooselist from '@/views/modules/common/Chooselist'
+
+
+  export default {
+    name: 'searchSfdc',
+    components: {
+      Chooselist
+    },
+    data () {
+      return {
+        site: this.$store.state.user.site,
+        // 导出+动态列 start
+        exportData: [],
+        userDev:this.$store.state.user.userDev,
+        exportName: "派工单列表"+this.getStrDate(),
+        columnList: [
+          {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "site",
+            columnLabel: "工厂编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "assJobSeqNo",
+            columnLabel: "派工单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          },
+          {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "orderNo",
+            columnLabel: "生产订单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "itemNo",
+            columnLabel: "工序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "operationDesc",
+            columnLabel: "工序名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 120,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "seqNo",
+            columnLabel: "次序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 50,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "partNo",
+            columnLabel: "物料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "workCenterNo",
+            columnLabel: "加工中心编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportDate",
+            columnLabel: "报工日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "statisticDate",
+            columnLabel: "报工时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 130,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "operatorId",
+            columnLabel: "操作员",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "operatorName",
+            columnLabel: "操作员姓名",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reverseflag",
+            columnLabel: "是否已取消报工",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportQty",
+            columnLabel: "报告数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "approveQty",
+            columnLabel: "合格数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportWeight",
+            columnLabel: "报告重量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "approveWeight",
+            columnLabel: "合格重量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "moldQty",
+            columnLabel: "模数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportedManfTime",
+            columnLabel: "生产时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "shiftNo",
+            columnLabel: "班次编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "resourceId",
+            columnLabel: "机台编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "resourceDesc",
+            columnLabel: "机台名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }
+        ],
+        visible:false,
+        // 导出 end
+        height: 200,
+        tableData: [],
+        searchData: {
+          seqNo:'',
+          orderNo: '',
+          workCenterNo: '',
+          partNo: '',
+          site: this.$store.state.user.site,
+          itemNo:'',
+          startDate:new Date(),
+          endDate:'',
+          operatorName:'',
+          resourceId:'',
+          shiftNo:'',
+        },
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+        this.height2 = window.innerHeight -100
+      })
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 24) {
+            strVal = this.searchData.workCenterNo
+          }
+          if (val === 5) {
+            strVal = this.searchData.partNo
+          }
+          if (val === 26) {
+            strVal = this.searchData.operatorName
+          }
+          if (val === 88) {
+            strVal = this.searchData.resourceId
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 24) {
+          this.searchData.workCenterNo = val.WorkCenterNo
+        }  else if (this.tagNo === 5) {
+          this.searchData.partNo = val.PartNo
+        }
+        if (this.tagNo === 26) {
+          this.searchData.operatorName = val.OperatorName
+        }
+        if (this.tagNo === 88) {
+          this.searchData.resourceId = val.ResourceID
+        }
+      },
+
+      search () {
+        getSfdcList(this.searchData).then(({data}) => {
+          this.tableData = data.rows
+        })
+      },
+
+      // 导出+动态列
+      fields() {
+        let json = "{"
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+        return s
+      },
+      createExportData() {
+        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
+        return this.tableData;
+      },
+      getStrDate() {
+        let dd = new Date();
+        let Y = dd.getFullYear();
+        let M = (dd.getMonth() + 1) < 10 ? "0" + (dd.getMonth() + 1) : (dd.getMonth() + 1);//获取当前月份的日期，不足10补0
+        let D = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();//获取当前几号，不足10补0
+        let H = dd.getHours() < 10 ? "0" + dd.getHours() : dd.getHours();
+        let MM = dd.getMinutes() < 10 ? "0" + dd.getMinutes() : dd.getMinutes();
+        let S = dd.getSeconds() < 10 ? "0" + dd.getSeconds() : dd.getSeconds();
+        return Y + M + D + H + MM + S;
+
+      },
+
+
+    },
+    created () {
+      // this.getTableUserColumn()
+    }
+  }
+</script>
+
+<style scoped>
+  .input_left{
+    text-align: left;
+  }
+  .input_reight{
+    text-align: right;
+  }
+  /deep/ input::-webkit-inner-spin-button {
+    -webkit-appearance: none !important;
+  }
+  input[type='number'] {
+    -moz-appearance: textfield !important;
+  }
+
+</style>
diff --git a/src/views/modules/production/stockPrint.vue b/src/views/modules/production/stockPrint.vue
index c631c8d..681e5ff 100644
--- a/src/views/modules/production/stockPrint.vue
+++ b/src/views/modules/production/stockPrint.vue
@@ -257,6 +257,7 @@
           umid:row.umid,
           transDate:row.transDate,
           expiredDate:row.expiredDate,
+          status:row.status,
         }
         array.push(data)
         printMaterialLabelPreview(array);