From 0339d5d661aee771a160c541444d2bd7eec973e9 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 18 十一月 2023 15:15:29 +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 |  320 +++++++++++++++++++++++++++++------------------------
 src/views/quality/finishedProductInspection/index.vue                   |    4 
 2 files changed, 177 insertions(+), 147 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index df1bb35..1a8a7bb 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,156 +1,157 @@
-<template>
-    <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'>
-                        <img width=174 height=58 src="../../../../public/img/image001.jpg">
-                    </span>
+<template class="WordSection1">
+<div   align=center  style="word-wrap:break-word;text-justify-trim:punctuation">
+        <div align="center" >
+            <table style='border-collapse:collapse;table-layout:fixed;width:629pt;page-break-after: always;margin-left: 25pt;margin-top: 80px;'>
+                <tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
+                    <td  colspan=3 rowspan=2  style='width:160pt;height: 60pt;border: 1pt solid windowtext'>
+                        <span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
+                            <img width=174 height=58 src="../../../../public/img/image001.jpg">
+                        </span>
+                    </td>
+                    <td colspan=6 class=xl6624921  style='border-right:.5pt solid black;border-left:none;width:260pt;height: 60pt'>璁板綍鍚嶇О:杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃</td>
+                    <td colspan=3 class=xl6624921   style='border-left:none;width: 160pt;height: 60pt'>淇濆瓨鏈熼檺:25骞�</td>
+                    <td rowspan=2 colspan=3 class=xl6824921 width=235 style='width:136pt;height: 60pt' >鐗堟湰鍙�: A/0</td>
+                </tr>
+                <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
+                    <td colspan=6 height=33 class=xl6624921 style='border-right:.5pt solid black;height:25.05pt;border-left:none'>
+                        璁板綍缂栧彿:ZTT/QR-8.6-05锛圓/0)
+                    </td>
+                    <td colspan=3  class=xl6624921 style='border-top:none;border-left:none'>
+                        褰掓。閮ㄩ棬:璐ㄩ噺淇濊瘉閮�
+                    </td>
+                    <td colspan=2  class=xl6824921 style='border-top:none'></td>
+                </tr>
+                <tr class=xl6524921  style='mso-height-source:userset;height:25.05pt'>
+                    <td colspan=16  class=xl7424921 width=1194 style='height:25.05pt;  width:897pt'>
+                        杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃
+                    </td>
+                </tr>
+                <tr class=xl6524921  style='mso-height-source:userset;height:40.05pt'>
+                    <td colspan=2 class=xl7624921 style='border-right:.5pt solid black;  height:40.05pt'>
+                        椤圭洰鍚嶇О:
+                    </td>
+                    <td colspan=5 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>銆�
+                        <p class="MsoNormal" align="center" style="text-align:center">
+                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="deviceStr"></span>
+                        </p>
                 </td>
-                <td colspan=6 class=xl6624921 width=399 style='border-right:.5pt solid black;border-left:none;width:250pt'>璁板綍鍚嶇О:杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃</td>
-                <td colspan=3 class=xl6624921 width=226 style='border-left:none;width: 150pt'>淇濆瓨鏈熼檺:25骞�</td>
-                <td rowspan=2 colspan=3 class=xl6824921 width=235 style='width:126pt' >鐗堟湰鍙�: A/0</td>
-            </tr>
-            <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
-                <td colspan=6 height=33 class=xl6624921 style='border-right:.5pt solid black;height:25.05pt;border-left:none'>
-                    璁板綍缂栧彿:ZTT/QR-8.6-05锛圓/0)
-                </td>
-                <td colspan=3  class=xl6624921 style='border-top:none;border-left:none'>
-                    褰掓。閮ㄩ棬:璐ㄩ噺淇濊瘉閮�
-                </td>
-                <td colspan=2  class=xl6824921 style='border-top:none'></td>
-            </tr>
-            <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
-                <td colspan=16 height=33 class=xl7424921 width=1194 style='height:25.05pt;  width:897pt'>
-                    杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃
-                </td>
-            </tr>
-            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
-                <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;  height:40.05pt'>
-                    椤圭洰鍚嶇О:
-                </td>
-                <td colspan=5 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>銆�
+                    <td   colspan=2  class=xl6924921 style='border-top:none;border-left:none'>妫�楠屼緷鎹�:</td>
+                    <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
+    銆�             </td>
+                </tr>
+                <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+                    <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;  height:40.05pt'>
+                        浜у搧鍚嶇О:
+                    </td>
+                    <td  colspan=4 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
+                        <p class="MsoNormal" align="center" style="text-align:center">
+                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="product"></span>
+                        </p>
+                    </td>
+                    <td  colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鍨嬪彿:</td>
+                    <td colspan=3  class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
                     <p class="MsoNormal" align="center" style="text-align:center">
-                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="deviceStr"></span>
+                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="typedata"></span>
                     </p>
-            </td>
-                <td   colspan=2  class=xl6924921 style='border-top:none;border-left:none'>妫�楠屼緷鎹�:</td>
-                <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
-銆�             </td>
-            </tr>
-            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
-                <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;  height:40.05pt'>
-                    浜у搧鍚嶇О:
                 </td>
-                <td  colspan=4 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
+                    <td  colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鏁伴噺:</td>
+                    <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
                     <p class="MsoNormal" align="center" style="text-align:center">
-                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="product"></span>
+                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="number"></span>
                     </p>
                 </td>
-                <td  colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鍨嬪彿:</td>
-                <td colspan=3  class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
-                <p class="MsoNormal" align="center" style="text-align:center">
-                    <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="typedata"></span>
-                </p>
-            </td>
-                <td  colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鏁伴噺:</td>
-                <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
-                 <p class="MsoNormal" align="center" style="text-align:center">
-                    <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="number"></span>
-                </p>
-            </td>
-            </tr>
+                </tr>
 
-            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
-                <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;  height:40.05pt'>
-                    妫�楠屽唴瀹�:
-                </td>
-                <td  colspan=14 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
-                    妫�楠岀粨鏋�
-                </td>
-            </tr>
+                <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+                    <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;  height:40.05pt'>
+                        妫�楠屽唴瀹�:
+                    </td>
+                    <td  colspan=14 class=xl6624921 style='border-right:.5pt solid black;  border-left:none'>
+                        妫�楠岀粨鏋�
+                    </td>
+                </tr>
 
-            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
-                <td colspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;height:40.05pt'>
-                    妫�楠岃姹�
-                </td>
-                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
-                    鏍囧噯鍊�
-                </td>
-                <td  colspan=1 v-for="a in columnLength" class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
-                    {{a>9?item:'0'+a}}
-                </td>
-                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
-                    鍒ゅ畾
-                </td>
-            </tr>
+                <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+                    <td colspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;height:40.05pt'>
+                        妫�楠岃姹�
+                    </td>
+                    <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+                        鏍囧噯鍊�
+                    </td>
+                    <td  colspan=1 v-for="a in columnLength" class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+                        {{a>9?item:'0'+a}}
+                    </td>
+                    <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+                        鍒ゅ畾
+                    </td>
+                </tr>
 
 
 
-            <tbody v-for="(item,index) in prjdata" :key="index">
-            <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
-                <td  :rowspan="item.children.length" height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
-                    <p >
-                        <span  style=" writing-mode: vertical-rl;font-size: 26pt;">{{item.father}}</span>
-                    </p>
-                </td>
-                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
-                    <span style="font-family:瀹嬩綋">{{item.children[0].iname}}</span>
-                </td>
-                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
-                    <span style="font-family:瀹嬩綋">{{item.children[0].required}}</span>
-                </td>
-                <td  colspan=1 v-for="(val,index) in item.children[0].testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
-                    <span style="font-family:瀹嬩綋">{{val}}</span>
-                </td>
+                <tbody v-for="(item,index) in prjdata" :key="index">
+                <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+                    <td  :rowspan="item.children.length" height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+                        <p >
+                            <span  style=" writing-mode: vertical-rl;font-size: 26pt;">{{item.father}}</span>
+                        </p>
+                    </td>
+                    <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+                        <span style="font-family:瀹嬩綋">{{item.children[0].iname}}</span>
+                    </td>
+                    <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+                        <span style="font-family:瀹嬩綋">{{item.children[0].required}}</span>
+                    </td>
+                    <td  colspan=1 v-for="(val,index) in item.children[0].testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+                        <span style="font-family:瀹嬩綋">{{val}}</span>
+                    </td>
 
-                <td  colspan=2  class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
-                    <p v-if="item.children[0].iresult ==1" class="MsoNormal" align="center" style="text-align:center">
-                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">鍚堟牸</span></p>
-                    <p v-if="item.children[0].iresult ==0" class="MsoNormal" align="center" style="text-align:center">
-                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">涓嶅悎鏍�</span></p>
-                </td>
-            </tr>
-            <tr class=xl6524921 height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
-                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
-                    <span style="font-family:瀹嬩綋">{{el.iname}}</span>
-                </td>
-                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
-                    <span style="font-family:瀹嬩綋">{{el.required}}</span>
-                </td>
-                <td  colspan=1  v-for="(testValue,index) in el.testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
-                    <span style="font-family:瀹嬩綋">{{testValue}}</span>
-                </td>
-                <td  colspan=2  class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
-                    <p  class="MsoNormal" align="center" style="text-align:center">
-                        <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">{{ el.iresult | formatState}}</span></p>
+                    <td  colspan=2  class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+                        <p v-if="item.children[0].iresult ==1" class="MsoNormal" align="center" style="text-align:center">
+                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">鍚堟牸</span></p>
+                        <p v-if="item.children[0].iresult ==0" class="MsoNormal" align="center" style="text-align:center">
+                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">涓嶅悎鏍�</span></p>
+                    </td>
+                </tr>
+                <tr class=xl6524921 height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
+                    <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+                        <span style="font-family:瀹嬩綋">{{el.iname}}</span>
+                    </td>
+                    <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+                        <span style="font-family:瀹嬩綋">{{el.required}}</span>
+                    </td>
+                    <td  colspan=1  v-for="(testValue,index) in el.testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+                        <span style="font-family:瀹嬩綋">{{testValue}}</span>
+                    </td>
+                    <td  colspan=2  class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+                        <p  class="MsoNormal" align="center" style="text-align:center">
+                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">{{ el.iresult | formatState}}</span></p>
 
-                    
-                </td>
-            </tr>
-            </tbody>
-            <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
-            <td colspan=8  height=53 class=xl7624921 style='border-right:.5pt solid black;
-  height:40.05pt;text-align: left;'><p>&nbsp;妫�楠�/鏃堕棿:</p></td>
-            <td colspan=8  height=53 class=xl7624921 style='border-right:.5pt solid black;
-  height:40.05pt;text-align: left;'><p> &nbsp;瀹℃壒:</p></td>
-            </tr>
+                        
+                    </td>
+                </tr>
+                </tbody>
+                <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+                <td colspan=8  height=53 class=xl7624921 style='border-right:.5pt solid black;height:40.05pt;text-align: left;'>
+                    <p>&nbsp;妫�楠�/鏃堕棿:<span>{{tableData.createTime}}</span></p></td>
+                <td colspan=8  height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt;text-align: left;'>
+                    <p> &nbsp;瀹℃壒:<span>{{username}}</span></p></td>
+                </tr>
 
-            <tr height=0 style='display:none'>
-                <td width=64 style='width:48pt'></td>
-                <td width=58 style='width:44pt'></td>
-                <td width=137 style='width:103pt'></td>
-                <td width=262 style='width:197pt'></td>
-                <td width=212 style='width:159pt'></td>
-                <td width=226 style='width:170pt'></td>
-                <td width=235 style='width:176pt'></td>
-            </tr>
-        </table>
-    <!-- <div v-for="items in prjdata">
-        <div v-for="aa in items.length"> -->
+                <tr height=0 style='display:none'>
+                    <td width=64 style='width:48pt'></td>
+                    <td width=58 style='width:44pt'></td>
+                    <td width=137 style='width:103pt'></td>
+                    <td width=262 style='width:197pt'></td>
+                    <td width=212 style='width:159pt'></td>
+                    <td width=226 style='width:170pt'></td>
+                    <td width=235 style='width:176pt'></td>
+                </tr>
+            </table>
+            
+        </div>
         <template>
             <div style="page-break-after: always;">
-            <div>
+            <div >
                 <div class="head" id="head">
                     <div class="head-1">
                         <img width=174 height=58 src="../../../../public/img/image002.png">
@@ -485,8 +486,6 @@
             </div>
             </div>
         </template>
-        <!-- </div>
-    </div>  -->
 </div>
 </template>
 
@@ -580,7 +579,7 @@
                             itype: '',
                             testValueList: new Array(this.columnLength)
                         }
-                        let rowNum = 15
+                        let rowNum = 30
                         let columnNum = this.columnLength
             if(list && list.length<2){
                 list.forEach(item=>{
@@ -621,7 +620,7 @@
                                     }
                                 }
                             }else{
-                                obj.testValueList = new Array(12)
+                                obj.testValueList = new Array(20)
                             }
                         })
                     }
@@ -651,10 +650,6 @@
 </script>
 
 <style lang="scss">
-table{
-    mso-displayed-decimal-separator: "\.";
-    mso-displayed-thousand-separator: "\,";
-}
 
 .xl6524921 {
     padding: 0px;
@@ -1904,4 +1899,41 @@
     mso-pattern: auto;
     white-space: nowrap;
 }
+@font-face{
+    font-family:寰蒋闆呴粦;
+	panose-1:2 1 6 0 3 1 1 1 1 1;
+}
+@font-face{
+    font-family:"Cambria Math";
+	panose-1:2 4 5 3 5 4 6 3 2 4;
+}
+@font-face{
+    font-family:Calibri;
+	panose-1:2 15 5 2 2 2 4 3 2 4;
+}
+@font-face{
+    font-family:"\@寰蒋闆呴粦";
+	panose-1:2 1 6 0 3 1 1 1 1 1;
+}
+/* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal{
+    margin:0cm;
+	text-align:justify;
+	text-justify:inter-ideograph;
+	font-size:10.5pt;
+	font-family:"Calibri",sans-serif;
+}
+/* Page Definitions */
+@page WordSection1{
+   size:595.3pt 841.9pt;
+	margin:72.0pt 2.0cm 2.0cm 2.0cm;
+	layout-grid:15.6pt;
+}
+div.WordSection1{
+    page : WordSection1;
+}
+
+.procedure {
+    word-wrap:break-word;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 9d582da..600db99 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -227,12 +227,10 @@
                 PrintJS({
                     printable: "printRaw",
                     type: "html",
-                    header:"",
-                    maxWidth: 1000,
+                    maxWidth: 880,
                     printSettings,
                     style: '@page {margin: 2.0mm 2.0mm;size:A4;}',
                     targetStyles: ["*"],
-                    fontSize: '30px',
                     ignoreElements: ["no-ignore"],
                     orientation: 'portrait'
                 });

--
Gitblit v1.9.3