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

---
 src/views/mes/prepare/index.vue | 73 +++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index eb520ff..5a9e31c 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -226,14 +226,14 @@
     <el-dialog
       title="备料信息"
       :visible.sync="printDialogVisible"
-      :width="shengchan?'821px':'721px'"
+      :width="shengchan?'731px':'721px'"
     >
       <div id="printFrom" class="my-print-box">
 
         <el-form :model="form">
 
           <!-- 表头-工单信息 -->
-		  <div class="my-print-barcode" :width="shengchan?'821px':'721px'">
+		  <div class="my-print-barcode" :width="shengchan?'731px':'721px'">
 			<svg id="barcode"></svg>
 		  </div>
 		  <el-row>
@@ -256,22 +256,22 @@
 		  <div v-for="(item,index) in printData.workTable" :key="index">
 			<el-table
             v-if="refreshNewWorkerTable" v-loading="newWorkerLoading" class="my-print-table" :data="item"
-            border style="width: 100%">
+            border style="width: 100%;">
             <el-table-column  label="序号" width="40">
 				<template slot-scope="scope">
         <!-- scope.$index 是当前行的索引（从 0 开始），加 1 后乘以 2 -->
-                 {{ (scope.$index + 1) + fenyeNumber* index}}
+                 {{ (scope.$index + 1) + (index==0?fenyeNumber* index:fenyeNumberTwo* index-2) }}
                </template>
 			</el-table-column>
-            <el-table-column prop="materialCode" label="料号" width="120" :formatter="productCodeFormate"></el-table-column>
-            <el-table-column prop="materialName" label="物料描述" width="250"></el-table-column>
-            <el-table-column prop="unit" width="50" label="单位"></el-table-column>
-            <el-table-column v-if="showWorkorderCode" prop="workorderCode" width="100" label="生产订单" :formatter="orderCodeFormate"></el-table-column>
-            <el-table-column prop="quantity" label="请领数量"  width="100"></el-table-column>
+            <el-table-column prop="materialCode" label="料号" :width="shengchan?85:125" :formatter="productCodeFormate"></el-table-column>
+            <el-table-column prop="materialName" label="物料描述" :width="shengchan?200:240"></el-table-column>
+            <el-table-column prop="unit" width="60" label="单位"></el-table-column>
+            <el-table-column v-if="showWorkorderCode" prop="workorderCode" width="90" label="生产订单" :formatter="orderCodeFormate"></el-table-column>
+            <el-table-column prop="quantity" label="请领数量"  width="80"></el-table-column>
 
             <el-table-column prop="routeCode" width="60" label="实发数量"></el-table-column>
-            <el-table-column prop="routeCode" width="60" label="实发数量2"></el-table-column>
-
+            <el-table-column prop="routeCode" width="75" label="实发数量2"></el-table-column>
+		      
           </el-table>
 		  <div class="fy" v-if="index!=printData.workTable.length-1"></div>
 		  </div>
@@ -310,7 +310,8 @@ export default {
 	// components: {Detail},
 	data() {
 		return {
-		fenyeNumber:13,
+		fenyeNumber:2,
+		fenyeNumberTwo:4,
 	  shengchan:true,
       newWorkerLoading: false,
       refreshNewWorkerTable:true,
@@ -431,9 +432,11 @@ export default {
         header: params.header, // '表单',
         targetStyles: ['*'],
         style: `
-
-      body {margin: 5mm;padding: 0;}
+      
+      body {margin: 3mm;padding: 0;}
       .fy{page-break-after: always;}
+	  table { border-collapse: collapse; } table, th, td { border: 2px solid black; }
+	  .el-table .cell{padding-left:5px;padding-right:5px;}
     `,
         ignoreElements: params.ignore || [], // ['no-print']
         properties: params.properties || null
@@ -463,9 +466,9 @@ export default {
 		let chunkedArray = [];
 
 // 遍历this.printData.workTable
-     for (let i = 0; i < this.printData.workTable.length; i += this.fenyeNumber) {
+     for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) {
     // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素）
-    let chunk = this.printData.workTable.slice(i, i + this.fenyeNumber);
+    let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo));
     // 将切割后的数组添加到chunkedArray中
     chunkedArray.push(chunk);
     }
@@ -506,9 +509,9 @@ export default {
 		let chunkedArray = [];
 
 // 遍历this.printData.workTable
-     for (let i = 0; i < this.printData.workTable.length; i += this.fenyeNumber) {
+     for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) {
     // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素）
-    let chunk = this.printData.workTable.slice(i, i + this.fenyeNumber);
+    let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo));
     // 将切割后的数组添加到chunkedArray中
     chunkedArray.push(chunk);
     }
@@ -653,8 +656,25 @@ export default {
 };
 </script>
 <style>
+.my-print-table .el-table {
+  border-collapse: collapse; 
+  border-spacing: 0; 
+}
+
+
+.my-print-table .el-table__header-wrapper th {
+  border: 1px solid black !important; 
+}
+.my-print-table .el-table__body-wrapper td {
+  border: 1px solid black !important; 
+}
+
+
+
+
+
 .my-print-head {
-  margin-top: 20px;
+  margin-top: 2px;
   font-weight: bold;
   text-align: center;
 }
@@ -666,8 +686,8 @@ export default {
 }
 
 .my-print-nav {
-  margin-top: 15px;
-  margin-bottom: 15px;
+  margin-top: 10px;
+  margin-bottom: 10px;
 }
 
 .my-print-foot {
@@ -677,13 +697,12 @@ export default {
   body {
     font-family: 'Arial', sans-serif; /* 设置字体为'Arial'或其他清晰的无衬线字体 */
     font-size: 14px; /* 设置字体大小 */
-	-webkit-print-color-adjust: exact;
-  }
-  table, th, td {
-    border: 1px solid black;
-    border-collapse: collapse;
-    font-size: 14px; /* 确保表格内字体大小一致 */
+	
   }
+  .my-print-table .el-table {
+  border-collapse: collapse; /* 合并表格边框 */
+}
+  
 }
 .fy{
 	page-break-after: always;