From 3144dc4d8be94296ee7fce33a34229a49e9d9b8e Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 27 Aug 2024 16:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prepare/index.vue | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 5a9e31c..66fc58c 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -233,9 +233,7 @@
         <el-form :model="form">
 
           <!-- 表头-工单信息 -->
-		  <div class="my-print-barcode" :width="shengchan?'731px':'721px'">
-			<svg id="barcode"></svg>
-		  </div>
+		  
 		  <el-row>
 			<div class="my-print-head">
             	<el-col>生产订单备料单({{printData.printTitle}})</el-col>
@@ -243,14 +241,19 @@
           </el-row>
           <!-- 导航栏 -->
           <el-row class="my-print-nav">
-            <el-col :span="8">工厂:{{printData.factory}}</el-col>
-            <el-col :span="8">工作中心:{{printData.workCenter}}</el-col>
-			<el-col :span="8" v-if="printData.prodLineCode!=null">线体:{{printData.prodLineCode}}</el-col>
+            <el-col :span="6">工厂:{{printData.factory}}</el-col>
+            <el-col :span="6">工作中心:{{printData.workCenter}}</el-col>
+			<el-col :span="4" v-if="printData.prodLineCode!=null">线体:{{printData.prodLineCode}}</el-col>
+			<el-col style="position: absolute;right: 0px;" :span="8">
+				<div class="my-print-barcode" :width="shengchan?'631px':'621px'">
+			       <svg id="barcode"></svg>
+		        </div>
+			</el-col>
           </el-row>
 		  <el-row class="my-print-nav">
-            <el-col :span="8">生产日期:{{printData.productDate}}</el-col>
-            <el-col :span="8">打印日期:{{printData.printDate}}</el-col>
-            <el-col :span="8">页次:  1/  1</el-col>
+            <el-col :span="6">生产日期:{{printData.productDate}}</el-col>
+            <el-col :span="6">打印日期:{{printData.printDate}}</el-col>
+            <el-col :span="6">页次:  1/  1</el-col>
           </el-row>
           <!-- 主数据 -->
 		  <div v-for="(item,index) in printData.workTable" :key="index">
@@ -310,8 +313,8 @@ export default {
 	// components: {Detail},
 	data() {
 		return {
-		fenyeNumber:2,
-		fenyeNumberTwo:4,
+		fenyeNumber:4,
+		fenyeNumberTwo:6,
 	  shengchan:true,
       newWorkerLoading: false,
       refreshNewWorkerTable:true,
@@ -527,8 +530,8 @@ export default {
 	generateBarcode(barcode){
 		JsBarcode("#barcode", barcode, {
         	format: "CODE128",
-			height:75,
-			width:2,
+			height:35,
+			width:1.5,
         	displayValue: true,
       });
 	},
@@ -687,7 +690,7 @@ export default {
 
 .my-print-nav {
   margin-top: 10px;
-  margin-bottom: 10px;
+  margin-bottom: 20px;
 }
 
 .my-print-foot {