From 20bd52d1aa8b9f9884d416c32e469becc0836786 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 28 Apr 2025 15:15:36 +0800
Subject: [PATCH] 20250427

---
 .../board/VulcanizationDispatchOrder.vue      | 47 +++++++++++++++++--
 src/views/modules/print/print_outBox_label.js |  3 ++
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/board/VulcanizationDispatchOrder.vue b/src/views/modules/board/VulcanizationDispatchOrder.vue
index 7755c62..9fc06de 100644
--- a/src/views/modules/board/VulcanizationDispatchOrder.vue
+++ b/src/views/modules/board/VulcanizationDispatchOrder.vue
@@ -5,7 +5,7 @@ export default {
   name: 'vulcanizationDispatchOrder',
   data(){
     return{
-      setTimeoutDelay: 60*1000*60,
+      setTimeoutDelay: 30*1000,
       refreshTool: null,
       dataList:[],
       queryParams:{
@@ -47,7 +47,8 @@ export default {
           serialNumber: null,
           columnType: null,
           align: 'left'
-        }, {
+        },
+        {
           tableId: "vulcanizationTable",
           tableName: this.$route.meta.title,
           columnProp: "orderNo",
@@ -81,7 +82,8 @@ export default {
           serialNumber: null,
           columnType: null,
           align: 'left'
-        },{
+        },
+        {
           tableId: "vulcanizationTable",
           tableName: this.$route.meta.title,
           columnProp: "partSpec",
@@ -116,7 +118,26 @@ export default {
           serialNumber: null,
           columnType: null,
           align: 'right'
-        },{
+        },
+        {
+          tableId: "vulcanizationTable",
+          tableName: this.$route.meta.title,
+          columnProp: "qtyRequired",
+          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: "vulcanizationTable",
           tableName: this.$route.meta.title,
           columnProp: "qtyApprove",
@@ -188,6 +209,24 @@ export default {
           columnType: null,
           align: 'center'
         },
+        {
+          tableId: "vulcanizationTable",
+          tableName: this.$route.meta.title,
+          columnProp: "lastReportTimeDepartment",
+          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: 'center'
+        },
         {
           tableId: "vulcanizationTable",
           tableName: this.$route.meta.title,
diff --git a/src/views/modules/print/print_outBox_label.js b/src/views/modules/print/print_outBox_label.js
index c7c2d37..717a3ec 100644
--- a/src/views/modules/print/print_outBox_label.js
+++ b/src/views/modules/print/print_outBox_label.js
@@ -104,6 +104,9 @@ export function printOutBoxLabel(printList) {
       LODOP.ADD_PRINT_TEXT(45,60,173,20,printData.receiveDate);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(45,255,173,20,printData.keyInfoStr2);
+      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(67,253,76,25,printData.partRevNo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);