From b0d4df5f39525ae7fe252e8ee65d85fd71dca721 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:53:32 +0800
Subject: [PATCH] 手动下单:检验中订单撤销报错问题修复

---
 src/views/business/materialOrderComponents/materialOrder/printDialog.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/business/materialOrderComponents/materialOrder/printDialog.vue b/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
index fe99554..58a72ce 100644
--- a/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
@@ -77,7 +77,7 @@
           <div>
             <div class="titleH1" style="text-align: center;margin-bottom: 1px">妫�娴嬩腑蹇冩牱鍝佹爣璇嗗崱</div>
             <div style="text-align: center;">
-              <barcode :value="item.barcode" :height="22" :width="1.6" :displayValue="false"></barcode>
+              <barcode :margin="1" :value="item.barcode" :height="22" :width="1.6" :displayValue="false"></barcode>
             </div>
             <div style="margin-left: 12px;text-align: left">
               <div class="item">
@@ -128,6 +128,7 @@
 <script>
 import PrintJS from "print-js";
 import {printLabel} from "@/api/business/rawMaterialOrder";
+import {stringToBase64} from '@/utils/base64Util'
 
 export default {
   name: "printDialog",
@@ -168,7 +169,7 @@
               console.log('item---', item)
               item.sendTime = item.sendTime && item.sendTime.substring(0, 10)
               item.sampleNumber = item.qtyArrived + item.buyUnitMeas
-              this.$set(item, 'barcode', item.entrustCode)
+              this.$set(item, 'barcode', item.entrustCode+","+stringToBase64(item.color))
               this.$set(item, 'isLeave', item.labelStatus === '2')
             })
             this.barcodeData = res.data
@@ -224,7 +225,7 @@
         targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
         printable: 'printOrder',//椤甸潰
         type: "html",//鏂囨。绫诲瀷
-        maxWidth:360,
+        maxWidth:440,
         header: '',
         style:
           `@page {
@@ -233,14 +234,13 @@
             margin-top: 0.4cm;
             margin-bottom: 0.4cm;
             padding-bottom: 0px;
-            size: 400px 75px collapse;
+            size: 440px 75px collapse;
           }
           html{
             zoom:100%;
-
           }
           @media print{
-            width: 400px;
+            width: 440px;
             height: 75px;
             margin:0;
           }`,

--
Gitblit v1.9.3