From bbf5cedc98c2504307cb42628318f61fbaff6b08 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 2 Aug 2024 15:24:33 +0800
Subject: [PATCH 1/2] =?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/print/print_transNo_label.js     | 11 +++++------
 src/views/modules/production/liuhuaProductView.vue |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/print/print_transNo_label.js b/src/views/modules/print/print_transNo_label.js
index 866357b..1ae8fbe 100644
--- a/src/views/modules/print/print_transNo_label.js
+++ b/src/views/modules/print/print_transNo_label.js
@@ -166,10 +166,9 @@ export function printTransNoLabel(printList) {
       else if(printData.type=='reportData'){
         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(42,242,135,137,"备注:"+printData.remark);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+        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);
@@ -295,9 +294,9 @@ export function printTransNoLabel(printList) {
         LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       }
     }
-    // LODOP.PRINT_DESIGN();
+    LODOP.PRINT_DESIGN();
     // LODOP.PREVIEW();
-    LODOP.PRINT();
+    // LODOP.PRINT();
     console.log("操作成功！")
   }
 }
diff --git a/src/views/modules/production/liuhuaProductView.vue b/src/views/modules/production/liuhuaProductView.vue
index cee266a..5df940f 100644
--- a/src/views/modules/production/liuhuaProductView.vue
+++ b/src/views/modules/production/liuhuaProductView.vue
@@ -194,12 +194,12 @@
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
-            columnProp: "firstReportDate",
+            columnProp: "firstReportDate2",
             columnLabel: "首次报工日期",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 70,
+            columnWidth: 80,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,
@@ -207,7 +207,7 @@
             fixed: '',
             serialNumber: null,
             columnType: null,
-            align: 'left'
+            align: 'center'
           }, {
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
@@ -348,7 +348,7 @@
             tableId: "liuhuaView",
             tableName: this.$route.meta.title,
             columnProp: "liuhuahegelv",
-            columnLabel: "总完成率",
+            columnLabel: "硫化合格率",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,

From 5413e0255b76d917b4bdab52e73e829a403c66a9 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 2 Aug 2024 16:17:00 +0800
Subject: [PATCH 2/2] =?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/query/hlQuery.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/query/hlQuery.vue b/src/views/modules/query/hlQuery.vue
index 0e4e7b3..af1cd01 100644
--- a/src/views/modules/query/hlQuery.vue
+++ b/src/views/modules/query/hlQuery.vue
@@ -5,6 +5,9 @@
       <el-form-item :label="'混炼任务单号：'">
         <el-input v-model="searchData.taskNo" style="width: 120px"></el-input>
       </el-form-item >
+      <el-form-item :label="'合并订单号：'">
+        <el-input v-model="searchData.orderRef1" style="width: 120px"></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>
@@ -273,6 +276,7 @@
         searchData: {
           page: 1,
           limit: 20,
+          orderRef1:'',
           taskNo:'',
           partNo:'',
           startDate:'',
@@ -467,14 +471,14 @@
             columnProp: "qtyOnHand",
             headerAlign: "center",
             align: "right",
-            columnLabel: "库存数量",
+            columnLabel: "本订单库存数量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 80
+            columnWidth: 110
           },{
             userId: this.$store.state.user.name,
             functionId: 200001,