From 33c054fb8479c7439c9031aeb84a895718e6465e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 25 十二月 2025 15:25:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
index badc31c..68c2e67 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -284,8 +284,9 @@
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
<td colspan="3">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td v-if="itemTr.qrcodeList.length*1>1" colspan="8">澶氬眰鍚堝苟锛岃鎯呰浜у搧鍚嶇О</td>
- <td v-else colspan="8">{{ itemTr.glass_child }}</td>
+ <td v-if="!company.processFontSize" colspan="3">{{ itemTr.glass_child }}</td>
+ <td v-else-if="itemTr.qrcodeList.length*1>1" colspan="8">澶氬眰鍚堝苟锛岃鎯呰浜у搧鍚嶇О</td>
+ <td v-else colspan="8" style="font-size: 18px;">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
<td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
<td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
@@ -294,7 +295,7 @@
<td rowspan='2'>搴忓彿</td>
<td rowspan='2'>缂栧彿</td>
<td rowspan="2">灞傚彿</td>
- <td rowspan='2'>瀹�(寮ч暱)*楂�</td>
+ <td rowspan='2' class="tdNowrap">瀹�(寮ч暱)*楂�</td>
<td rowspan='2'>鏁伴噺</td>
<td rowspan='2'>闈㈢Н</td>
<td rowspan='2'>鍛ㄩ暱</td>
@@ -426,12 +427,10 @@
* {
margin: 0;
padding: 0;
- text-align: center;
}
-#printButton {
- margin-top: -40px;
- width: 100px;
+td,input{
+ text-align: center;
}
#printFlowCard {
@@ -439,20 +438,23 @@
//font-weight: bolder; height: 600px;
}
+#contentDiv {
+ width: 100%;
+}
+
#contentTable {
border-collapse: collapse;
border: 1px solid black;
width: 100%;
-
}
#contentTable thead {
- font-size: 12px;
+ font-size: 13px;
font-weight: bolder;
}
#contentTable thead div {
- font-size: 14px;
+ font-size: 15px;
font-weight: bolder;
}
@@ -463,7 +465,7 @@
}
#contentTable tbody {
-
+ white-space: nowrap;
}
.tdNowrap {
@@ -471,7 +473,7 @@
}
#contentTable tfoot {
- font-size: 11px;
+ font-size: 12px;
font-weight: bolder;
}
@@ -480,28 +482,43 @@
background: none;
}
+.nuber_xx span{
+ font-size: 12px;
+}
+
+
@media print {
+ /* 绂佺敤 Chrome 鑷姩椤电爜瑙﹀彂鏉′欢 */
+ * {
+ overflow: visible !important;
+ transform: none !important;
+ filter: none !important;
+ }
+
+ [style*="position: fixed"],
+ .fixed,
+ .header-fixed {
+ position: absolute !important;
+ }
+
@page {
size: auto; /* auto is the initial value */
- margin: 2mm 4mm 0mm 4mm /* this affects the margin in the printer settings */
+ margin: 2mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */
+ @top-right {
+ content: none !important;
+ }
- }
-
- tbody {
- display: table-row-group;
}
table {
page-break-before: always;
- }
-
- table {
page-break-inside: auto;
}
thead {
display: table-header-group;
+ page-break-inside: avoid;
}
tfoot {
@@ -514,6 +531,8 @@
width: 100%;
height: 100%;
}
-
+.picture{
+ page-break-before: always;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0