From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
index 7a895b3..9314446 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -79,7 +79,7 @@
<template>
<div id="sheet">
- <table border="1">
+ <table >
<tr class="title-s">
<th colspan="17">
<img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">
@@ -94,11 +94,16 @@
<th colspan="5">鐢佃瘽:{{ company.telephone }}</th>
<th colspan="5">浼犵湡:{{ company.fax }}</th>
</tr>
-
+ <tr class="title-s" style="height: 30px">
+ <th colspan="17" >
+ <hr class=".hr-border"/>
+ <hr class=".hr-border"/>
+ </th>
+ </tr>
<tr class="title-s" >
<th colspan="17">
- <h3>鐜荤拑鍔犲伐鍗�</h3>
+ <h3>鐜荤拑鍔犲伐鍗�({{data.order.orderType}})</h3>
</th>
</tr>
<tr>
@@ -109,13 +114,13 @@
</tr>
<tr>
<th class="title-1">鐢熶骇鍗曞彿</th>
- <th colspan="3">{{data.order.orderId}}</th>
+ <th colspan="3"> <el-text>{{data.order.orderId}}<el-text style="font-size: 12px;font-weight: bolder">锛堝搴斿崟鍙穥{data.order.batch}})</el-text></el-text></th>
<th class="title-1">涓嬪崟鏃ユ湡</th>
<th colspan="3">{{data.order.createTime}}</th>
<th class="title-1">璁㈠崟绫诲瀷</th>
<th colspan="4">{{data.order.orderType}}</th>
<th class="title-1">璺熷崟鍛�</th>
- <th colspan="3">{{data.order.creator}}</th>
+ <th colspan="3">{{data.order.salesman}}</th>
</tr>
<tr>
<th>纾ㄨ竟</th>
@@ -127,8 +132,6 @@
<th>鍖呰</th>
<th colspan="3">{{data.order.packType}}</th>
</tr>
-
-
<tr>
<th >搴忓彿</th>
<th >{{company.columnName}}</th>
@@ -137,12 +140,11 @@
<th>瑙勬牸锛堝W*楂楬锛�</th>
<th>鐗囨暟</th>
<th>闈㈢Н</th>
- <th>{{company.columnNamePerimeter}}</th>
+ <th>寤剁背</th>
<th>鍗婂緞</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
- <th>澶囨敞</th>
- <th>搴忓彿</th>
+ <th colspan="2">澶囨敞</th>
<th>澶囨敞1</th>
<th>澶囨敞2</th>
<th>澶囨敞3</th>
@@ -151,14 +153,14 @@
<tbody v-for="(item,index) in data.orderDetail" :key="index">
<tr>
<td colspan="2" class="no-change-row">浜у搧鍚嶇О</td>
- <td colspan="10">{{item.productName}}</td>
+ <td colspan="10" style="text-align: left">{{item.productName}}</td>
<td class="no-change-row">浜у搧鎻忚堪</td>
<td colspan="4"></td>
</tr>
<template v-for="(item1,index1) in item.productDetail" :key="index1">
<tr >
<td>{{item1.orderNumber}}</td>
- <td>{{ item1.otherColumns?.S02}}</td>
+ <td class="notChangeRow">{{ item1.otherColumns?.S02}}</td>
<td>{{ item1.otherColumns?.S03}}</td>
<td class="notChangeRow">{{ item1.otherColumns?.S01}}</td>
<td>{{item1.width}}*{{item1.height}}</td>
@@ -168,8 +170,7 @@
<td>{{item1.bendRadius}}</td>
<td>{{item1.buildingNumber}}</td>
<td>{{item1.processingNote}}</td>
- <td>{{item1.remarks}}</td>
- <td></td>
+ <td colspan="2">{{item1.remarks}}</td>
<td>{{((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}</td>
<td>{{((item1.otherColumns?.S05)?item1.otherColumns.S05:'')}}</td>
<td>{{((item1.otherColumns?.S06)?item1.otherColumns.S06:'')}}</td>
@@ -239,7 +240,7 @@
<style scoped>
#sheet{
- width: 100%;
+ width: 98%;
height: 100%;
text-align: center;
}
@@ -262,11 +263,11 @@
table{
border-collapse: collapse;
- border: 1px solid black;
+ //border: 1px solid black;
width: 100%;
text-align: center;
}
-table, th, td {
+tr, th, td {
border: 1px solid black;
border-collapse: collapse;
}
@@ -291,4 +292,9 @@
.notChangeRow{
white-space: nowrap;
}
+@media print {
+ @page {
+ margin: 5mm; /* 璁剧疆鎵撳嵃椤甸潰鐨勮竟璺� */
+ }
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0