From e4fc16e1f5f056832f0df73fce0edf94de80f16c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 23 Aug 2022 11:33:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=88=90=E5=93=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/print.js                         | 54 +++++++++++++++++++--
 src/pages/xinrui/inspection/ResultEntry.vue |  2 +-
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/config/print.js b/src/config/print.js
index 1932424..097419e 100644
--- a/src/config/print.js
+++ b/src/config/print.js
@@ -24,11 +24,15 @@ export function toPrint (data) {
   LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
   LODOP.PRINT_INIT('')
   LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', store.getters.printName) // 指定打印机
-  LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
-  LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
-  LODOP.SET_PRINT_STYLE('FontSize', 12)
-  LODOP.SET_PRINT_STYLE('Bold', 1)
+  // LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+  // LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+  // LODOP.SET_PRINT_STYLE('FontSize', 12)
+  // LODOP.SET_PRINT_STYLE('Bold', 1)
   if (data.print_type === '05') {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bag_id + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
@@ -37,6 +41,10 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '还回人员：' + data.return_person)
   } else if (data.print_type === '04' && data.printWeight === undefined) {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
@@ -45,6 +53,10 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
   } else if (data.print_type === '04' && data.printWeight === true) {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
@@ -53,13 +65,21 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
   } else if (data.print_type === '04' && data.printWeight === false) {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
     LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + data.bucketunique)
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
-  } else if (data.print_type === '02' || data.print_type === '03') {
+  } else if (data.print_type === '02') {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
@@ -68,7 +88,31 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
     LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order)
+  } else if (data.print_type === '03') {
+    LODOP.SET_PRINT_PAGESIZE(1, '150mm', '100mm', '')
+    LODOP.ADD_PRINT_RECT('2mm', '2mm', '146mm', '96mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 23)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
+    LODOP.ADD_PRINT_BARCODE('5mm', '5mm', '60mm', '60mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
+    LODOP.ADD_PRINT_TEXT('7mm', '65mm', '80mm', '27mm', '日期：' + data.input_time)
+    // LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
+    LODOP.ADD_PRINT_TEXT('19mm', '65mm', '80mm', '27mm', pcsn)
+    // LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '重量：' + Number(data.storage_qty).toFixed(3) + 'kg')
+    LODOP.ADD_PRINT_TEXT('31mm', '65mm', '80mm', '27mm', '重量：' + Number(data.storage_qty).toFixed(3) + 'kg')
+    // LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + data.bucketunique)
+    LODOP.ADD_PRINT_TEXT('43mm', '65mm', '80mm', '27mm', '桶号：' + data.bucketunique + '')
+    // LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
+    LODOP.ADD_PRINT_TEXT('59mm', '6mm', '140mm', '27mm', '编码：' + data.material_code + '')
+    LODOP.ADD_PRINT_TEXT('85mm', '6mm', '140mm', '27mm', '牌号：' + data.old_mark + '')
+    // LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
+    LODOP.ADD_PRINT_TEXT('72mm', '6mm', '140mm', '27mm', '名称：' + data.material_name + '')
+    // LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order)
+    LODOP.ADD_PRINT_TEXT('85mm', '110mm', '60mm', '27mm', '序号：' + data.record_order + '')
   } else if (data.print_type === '01') {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
diff --git a/src/pages/xinrui/inspection/ResultEntry.vue b/src/pages/xinrui/inspection/ResultEntry.vue
index 6e8fab9..81df4db 100644
--- a/src/pages/xinrui/inspection/ResultEntry.vue
+++ b/src/pages/xinrui/inspection/ResultEntry.vue
@@ -105,7 +105,7 @@
     :mdShow="mdShow"
     @closeModalCallback="closeModalCallback"
     @comfirmCallback="comfirmCallback">
-      检测值全部为空，是否继续？
+      检测值有为空，是否继续？
     </modal>
   </section>
 </template>