From 246bba5f7892ffcf7779f3e82116a639057838d6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 14 Oct 2024 09:58:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/print/A4.vue | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/views/setting/print/A4.vue b/src/views/setting/print/A4.vue
index 7f8b4786..06ac5e9c 100644
--- a/src/views/setting/print/A4.vue
+++ b/src/views/setting/print/A4.vue
@@ -1,11 +1,9 @@
 <template>
     <el-container>
-        <el-side>
-            <el-button type="primary" @click="handleExport">导出</el-button>
-            <el-button type="primary" @click="handlePrint">打印</el-button>
-        </el-side>
         <!--基本信息!-->
         <el-main v-loading="mainLoading" style="margin-top: -10px;">
+            <el-button type="primary" @click="handleExport">导出</el-button>
+            <el-button type="primary" @click="handlePrint">打印</el-button>
             <div id="exportDiv" class="exportDiv">
                <!-- 入库信息 -->
                 <div class="containersDom">
@@ -21,7 +19,6 @@
                         <li class="export_ulli">仓库</li>
                         <li class="export_ulli">采购订单</li>
                         <li class="export_ulli">供应商名称</li>
-                        <!-- <li class="export_ulli"><span>333333333：</span><span class="export_ulli_info">333333333</span></li> -->
                     </ul>
                     <ul class="export_ul">
                         <li class="export_ulli">11111111111</li>
@@ -32,7 +29,6 @@
                         <li class="export_ulli">66666666666</li>
                         <li class="export_ulli">77777777777</li>
                         <li class="export_ulli">88888888888</li>
-                        <!-- <li class="export_ulli"><span>333333333：</span><span class="export_ulli_info">333333333</span></li> -->
                     </ul>
                 
                     <ul class="export_ul">
@@ -403,9 +399,19 @@
 	export default {
 		name: "scFire",
 		props: {
-			id: { type: String, default: "" },
-			wfId: { type: String, default: "" },
-		},
+            type: {
+                type: Number,
+                default: 10,
+            },
+            mgroupId: {
+                type: String,
+                default: "",
+            },
+            mgroupName: {
+                type: String,
+                default: "",
+            },
+        },
 		data() {
 			return {
 				mainLoading: false,
@@ -422,6 +428,9 @@
 		mounted() {
 			let that = this;
 			this.$nextTick(()=>{})
+
+
+            // 'BARCODE 0,130,"128",108,0,0,2,4,"'
 		},
 		methods: {
             handlePrint(){
@@ -468,9 +477,10 @@
 }
 .export_ulli{
     flex:1;
-    height: 35px;
+    min-height: 35px;
     font-size: 16px;
     line-height: 35px;
+    word-break: break-all;
     border-top: 1px solid #aaaaaa;
     border-left: 1px solid #aaaaaa;
 }