From f3a5877f84dd9e38a5ad58adeb4398dbcff01b91 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 18 十一月 2023 14:18:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 vue.config.js                                       |    4 ++--
 src/views/quality/rawMaterial/index.vue             |    2 +-
 src/views/quality/rawMaterial/rawMaterial-print.vue |   24 +++++++++++++-----------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 57528ab..b5ba1b6 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -276,7 +276,7 @@
                 type: "html",
                 maxWidth: 880,
                 // header: "鍘熸潗鏂欐娴嬫姤鍛�",
-                style: '@page {margin: 0 5mm;}',
+                style: '@page {margin: 10mm 5mm;}',
                 targetStyles: ["*"],
                 ignoreElements: ["no-ignore"],
                 orientation: 'portrait'
diff --git a/src/views/quality/rawMaterial/rawMaterial-print.vue b/src/views/quality/rawMaterial/rawMaterial-print.vue
index e246703..a13a09a 100644
--- a/src/views/quality/rawMaterial/rawMaterial-print.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-print.vue
@@ -1,6 +1,6 @@
 <template>
 <div style="word-wrap:break-word;text-justify-trim:punctuation">
-    <div class="WordSection1" style="layout-grid:15.6pt;margin-top: 20pt;">
+    <div class="WordSection1" style="layout-grid:15.6pt;">
         <div align="center">
             <table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" width="629"
                 style="width:620pt;border-collapse:collapse;border:1pt solid windowtext">
@@ -184,17 +184,17 @@
                 </tbody>
                 <tbody v-for="(item,index) in projectList" :key="index">
                     <tr style="height:19.85pt">
-                        <td width="85" :rowspan="item.children.length" style="width:63.95pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                        <td width="85" :rowspan="item.children.length" style="width:63.95pt;border:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-family:瀹嬩綋" v-text="item.rpFather"></span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif"></span></p>
                         </td>
-                        <td width="60" colspan="2" style="width:65.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                        <td width="60" colspan="2" style="width:65.15pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif" v-text="item.children[0].rpName"></span></p>
                         </td>
-                        <td width="59" colspan="3" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                        <td width="59" colspan="3" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif"  v-text="item.children[0].required"></span></p>
                         </td>
@@ -211,21 +211,20 @@
                                     style="font-family:&quot;Arial&quot;,sans-serif"></span></p>
                         </td>
                     </tr>
-                    <tr style="height:19.85pt" v-for="(j,index) in (item.children.slice(1))" :key="index">
-                        <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-                        border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                    <tr class="pageTr" style="height:19.85pt" v-for="(j,index) in (item.children.slice(1))" :key="index">
+                        <td width="60" colspan="2" style="width:45.15pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif">{{j.rpName}}</span></p>
                         </td>
-                        <td width="59" colspan="3" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                        <td width="59" colspan="3" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif">{{j.required}}</span></p>
                         </td>
-                        <td width="59" v-for="(testValue,index) in j.testValueList" :key="index" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                        <td width="59" v-for="(testValue,index) in j.testValueList" :key="index" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif">{{testValue}}</span></p>
                         </td>
-                        <td width="43" colspan="1" style="width:70pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.1cm 2.4pt 0.1cm 2.4pt;height:19.85pt">
+                        <td width="43" colspan="1" style="width:70pt;border:1pt solid windowtext;padding:0.1cm 2.4pt 0.1cm 2.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center">
                                 <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">
                                     {{ j.testState | formatState}}
@@ -235,7 +234,7 @@
                     </tr>
                 </tbody>
                     <!-- bottom -->
-                <tr style="height:40.95pt">
+                <tr style="height:40.95pt" class="pageTr">
                     <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
   border-top:1pt solid windowtext;padding:0cm 5.4pt 0cm 5.4pt;height:40.95pt">
                         <p class="MsoNormal" align="center" style="text-align:center"><span
@@ -491,6 +490,9 @@
 	margin:72.0pt 2.0cm 2.0cm 2.0cm;
 	layout-grid:15.6pt;
 }
+.pageTr{
+    page-break-inside: avoid;
+}
 div.WordSection1{
     page : WordSection1;
 }
diff --git a/vue.config.js b/vue.config.js
index d12b323..94a4809 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,10 +2,10 @@
  * 閰嶇疆鍙傝��:
  * https://cli.vuejs.org/zh/config/
  */
-const url = 'http://192.168.0.23:9999'
+// const url = 'http://192.168.0.23:9999'
 
   // const url = 'http://192.168.0.60:9999'
-  // const url = 'http://localhost:9999'
+  const url = 'http://localhost:9999'
 
 // const url = 'http://ztt-gateway:9999'
 const localUrl = 'http://localhost:8089'

--
Gitblit v1.9.3