From 2e9cc2d66b417b08045f2748283db972bdbcaa56 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 18 十一月 2023 11:21:10 +0800
Subject: [PATCH] 	modified:   src/views/quality/finishedProductInspection/finishedProducter-print.vue 	modified:   src/views/quality/finishedProductInspection/index.vue

---
 src/views/quality/finishedProductInspection/finishedProducter-print.vue |   24 +++++++++++++++++-------
 src/views/quality/finishedProductInspection/index.vue                   |    5 ++---
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index 9690378..df1bb35 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,6 +1,6 @@
 <template>
-    <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 65pt;margin-left: 10pt;">
-        <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:629pt'>
+    <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 65pt;margin-left: 15pt;">
+        <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:629pt;page-break-after: always;'>
             <tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
                 <td  colspan=3 rowspan=2 height=40 width=122 style='width:150pt;border: 1pt solid windowtext'>
                     <span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
@@ -149,7 +149,8 @@
     <!-- <div v-for="items in prjdata">
         <div v-for="aa in items.length"> -->
         <template>
-            <div style="margin-top: 100pt;width: 75%;">
+            <div style="page-break-after: always;">
+            <div>
                 <div class="head" id="head">
                     <div class="head-1">
                         <img width=174 height=58 src="../../../../public/img/image002.png">
@@ -223,10 +224,12 @@
                     </span></p>      
                 </div>      
             </div>
+            </div>
         </template>
 
         <template>
-            <div style="margin-top: 100pt;width: 75%;">
+            <div style="page-break-after: always;">
+            <div >
                 <div class="head">
                     <div class="head-1">
                         <img width=174 height=58 src="../../../../public/img/image002.png">
@@ -269,10 +272,12 @@
                     <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                     </span></p>            
             </div>
+            </div>
         </template>
 
         <template>
-            <div style="margin-top: 100pt;width: 75%;">
+            <div style="page-break-after: always;" >
+            <div >
                 <div class="head">
                     <div class="head-1">
                         <img width=174 height=58 src="../../../../public/img/image002.png">
@@ -343,10 +348,12 @@
                     <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                     </span></p>            
             </div>
+            </div>
         </template>
 
         <template>
-            <div style="margin-top: 100pt;width: 75%;">
+            <div style="page-break-after: always;">
+            <div >
                 <div class="head">
                     <div class="head-1">
                         <img width=174 height=58 src="../../../../public/img/image002.png">
@@ -412,10 +419,12 @@
                     <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                     </span></p>            
             </div>
+            </div>
         </template>
 
         <template>
-            <div style="margin-top: 100pt;width: 75%;">
+            <div style="page-break-after: always;">
+            <div >
                 <div class="head">
                     <div class="head-1">
                         <img width=174 height=58 src="../../../../public/img/image002.png">
@@ -474,6 +483,7 @@
                     <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                     </span></p>            
             </div>
+            </div>
         </template>
         <!-- </div>
     </div>  -->
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 22736a6..9d582da 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -228,11 +228,10 @@
                     printable: "printRaw",
                     type: "html",
                     header:"",
-                    maxWidth: 950,
+                    maxWidth: 1000,
                     printSettings,
-                    style: '@page {margin: 2.0mm 2.0mm}',
+                    style: '@page {margin: 2.0mm 2.0mm;size:A4;}',
                     targetStyles: ["*"],
-                    // importCSS: true,
                     fontSize: '30px',
                     ignoreElements: ["no-ignore"],
                     orientation: 'portrait'

--
Gitblit v1.9.3