From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 268 +++++++++++++++++++++++++++++------------------------
1 files changed, 146 insertions(+), 122 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index 1a8a7bb..e4755d6 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,68 +1,68 @@
-<template class="WordSection1">
-<div align=center style="word-wrap:break-word;text-justify-trim:punctuation">
+<template>
+<div class="WordSection1" 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'>
+ <table style="border-collapse:collapse;table-layout:fixed;page-break-after: always;margin-top: 0px;" width="629">
+ <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>
+ <td colspan=6 class="xl6624921" style='border-right:.5pt solid black;border-left:none;width:380pt;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" style='width:136pt;height: 60pt' >鐗堟湰鍙�: A/0</td>
</tr>
- <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
+ <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)
+ 璁板綍缂栧彿:{{ tableData.finInsNo }}
</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'>
+ <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'>
+ <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'>銆�
+ <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:"Arial",sans-serif" v-text="deviceStr"></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 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'>{{ tableData.dname }}
銆� </td>
</tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <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=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:"Arial",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'>
+ <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:"Arial",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'>
+ <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:"Arial",sans-serif" v-text="number"></span>
</p>
</td>
</tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <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>
@@ -71,7 +71,7 @@
</td>
</tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <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>
@@ -89,7 +89,7 @@
<tbody v-for="(item,index) in prjdata" :key="index">
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <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>
@@ -112,7 +112,7 @@
<span lang="EN-US" style="font-family:"Arial",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'>
+ <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>
@@ -130,9 +130,9 @@
</td>
</tr>
</tbody>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <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> 妫�楠�/鏃堕棿:<span>{{tableData.createTime}}</span></p></td>
+ <p> 妫�楠�/鏃堕棿:<span>{{tableData.updateTime}}</span></p></td>
<td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt;text-align: left;'>
<p> 瀹℃壒:<span>{{username}}</span></p></td>
</tr>
@@ -149,10 +149,11 @@
</table>
</div>
+ <div v-for="pel in prjdata">
<template>
- <div style="page-break-after: always;">
+ <div align="center" style="page-break-after: always;border-collapse:collapse;table-layout:fixed;page-break-after: always;" width="629">
<div >
- <div class="head" id="head">
+ <div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
</div>
@@ -165,18 +166,19 @@
<div class="bodycs">
<p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
<span class=x1111112 >Test Report</span><br>
- <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p style=" border-top: 1px solid black;width: 900pt;margin-top: -1px;"></p>
</span></p>
</div>
- <div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
- <p style="margin-left: 350px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡鏃ユ湡<br> Report Date</span></p>
- <p style="margin-left: 180px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�1/8<br> Page</span></p>
+ <div style="margin-left:40pt">
+ <div class="bodycs-1">
+ <p ><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:{{ tableData.finInsNo }}<br>Report No.锛�</span></p>
+ <p style="margin-left: 200px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡鏃ユ湡:{{ tableData.updateTime }}<br> Report Date</span></p>
+ <p style="margin-left: 200px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�1/8<br> Page</span></p>
</div>
<div>
<div class="bodycs-2">
<p ><span class=x1111112 style='margin-left: 40px;'>妫�楠岄」鐩�:<br> Test Item</span></p>
- <p v-for="pel in prjdata"><span class="ziti">{{pel.father}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 80px;"></span></span></p>
+ <p ><span class="ziti">{{pel.father}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 80px;"></span></span></p>
</div>
<div class="bodycs-3">
<p ><span class=x1111112 style='margin-left: 36px;'>鏍峰搧鍚嶇О:<br>Description</span></p>
@@ -188,38 +190,51 @@
</div>
<div class="bodycs-3">
<p ><span class=x1111112 style='margin-left: 36px;'>鏍峰搧鏁伴噺:<br>Quantity</span></p>
- <p v-for="pel in prjdata"><span class="ziti">{{quantity}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="ziti">{{quantity}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
<div class="bodycs-3">
<p ><span class=x1111112 style='margin-left: 36px;'>妫�楠岀被鍒�:<br>Type of Test</span></p>
- <p v-for="pel in prjdata"><span class="ziti">浜у搧妫�楠�</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="ziti">浜у搧妫�楠�</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
+ <div>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div>
<div class="chilen">
<p ><span class="x1111113">鎵� 鍑�:<br> Approved by</span></p>
- <p v-for="pel in prjdata"><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
<div class="chilen">
<p ><span class="x1111113">鏍搁獙鍛�:<br> Inspected by</span></p>
- <p v-for="pel in prjdata"><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
<div style="display: flex;margin-left: 280px;">
<p ><span class="x1111113">妫�楠屽憳锛�<br> Tested by</span></p>
<p ><span class="time">{{username}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
+ <div>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div class="cldata">
<p ><span class="x1111113">閫佹牱鏃ユ湡:<br>Delivery Date</span></p>
- <p v-for="pel in prjdata"><span class="time">{{tableData.updateTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="time">{{tableData.updateTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
<div class="cldata">
<p ><span class="x1111113">娴嬭瘯鏃ユ湡:<br>Testing Date</span></p>
- <p v-for="pel in prjdata"><span class="time">{{tableData.createTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="time">{{tableData.createTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
+ </div>
</div>
</div>
</div>
<div class="pagefooting">
- <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ <p><span style="font-size:14pt;font-family:瀹嬩綋;color: cornflowerblue;">
鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
@@ -246,7 +261,7 @@
<span class=x1111112 >Test Report</span><br>
</span></p>
<div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:{{ tableData.finInsNo }}<br>Report No.锛�</span></p>
<p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�2/8<br> Page</span></p>
</div>
</div>
@@ -267,8 +282,16 @@
</div>
</div>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <br><br><br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div class="pagefooting">
- <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ <p><span style="font-size:14pt;font-family:瀹嬩綋;color: cornflowerblue;">
鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
@@ -292,47 +315,64 @@
<div class="bodycs">
<p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
<span class=x1111112 >Test Report</span><br>
+ <p style=" border-top: 1px solid black;width: 900pt;margin-top: -1px;"></p>
</span></p>
<div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:{{ tableData.finInsNo }}<br>Report No.锛�</span></p>
<p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�3/8<br> Page</span></p>
</div>
</div>
- <div>
- <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
- <p class="x1111113" ><span style="display: flex;margin-top: 40px;margin-left: 40px;">鎶ュ憡姝ｆ枃锛�</span></p>
+
+
+ <div>
+ <p class=x1111112 style="display: flex;margin-left: 40px;">1.娴嬭瘯璁惧</p>
+ <div class="bodycs" style="margin-top: 80px;" v-if='ela.iname !== "" ' v-for="ela in pel.children">
+ <div class="bodycs-1" style="margin-top: 10px;">
+ <p style="margin-left: 40px;font-size:12pt;font-family:榛戜綋">妫�楠岄」鐩細<span style="width: 60px;"> {{ela.iname}}<br><span>璁惧鍚嶇О锛歿{ ela.ename }}</span><br>Name of Equipment</span></p>
+ <p style="padding-left: 100px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧鍨嬪彿:{{ ela.specifications }}<br> Model</span></p>
+ <p style="padding-left: 100px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧缂栧彿:{{ ela.code}}<br>Serial No.</span></p>
+ <p style="margin-left: 110px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>鏍″噯鏈夋晥鏈�:{{ ela.date }}<br>Calibration Due Date</span></p>
+ </div>
+ </div>
+ <!-- <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
+ </div> -->
</div>
- <div class="bodycs" style="margin-top: 30px;">
- <p class=x1111112><span>{{iname}}<br>
+
+
+
+ <div style="display: flex;margin-top: 60px;">
+ <p ><span><span class=x1111112 style="margin-left: 40px;">2.鍙傝�冩爣鍑哛eference standards</span>
+ <!--
+ <br>鏈妫�娴嬫墍渚濇嵁鐨勬妧鏈枃浠讹紙浠ｅ彿銆佸悕绉帮級锛�<br>Reference documents for this testing -->
</span></p>
- <div class="bodycs-1" style="margin-top: 10px;">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">1.娴嬭瘯璁惧<br> 璁惧鍚嶇О<br>Name of Equipment</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧鍨嬪彿<br> Model</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧缂栧彿<br>Serial No.</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>鏍″噯鏈夋晥鏈�<br>Calibration Due Date</span></p>
- </div>
- <div>
- <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
- </div>
</div>
- <div style="margin-top: 50px;display: flex;">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">2.鍙傝�冩爣鍑哛eference standards <br>鏈妫�娴嬫墍渚濇嵁鐨勬妧鏈枃浠讹紙浠ｅ彿銆佸悕绉帮級锛�<br>Reference documents for this testing </span></p>
- </div>
+ <br>
+ <br>
+
+ <p style="font-size:18pt;font-family:瀹嬩綋">鏈妫�楠屽弬鑰冪殑鎶�鏈枃浠舵槸:<span>{{tableData.dname}}锛岀紪鍙�:{{tableData.dnumber }}</span></p>
<div>
<p style=" border-top: 1px solid black;width: 96%;margin-top: 1px;"></p>
</div>
- <div style="margin-top: 50px;display: flex;">
- <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">3.鐜鏉′欢Environmental conditions锛�</span></p>
+
+ <div style="margin-top: 80px;display: flex;">
+ <p class=x1111112 style="margin-left: 40px;"><span >3.鐜鏉′欢Environmental conditions锛�</span></p>
</div>
<div style="display: flex;">
<p style="margin-left: 50px;"><span >娓╁害(Temperature)锛氣剝 </span></p>
<p style="margin-left: 450px;"><span >鐩稿婀垮害(R.H.)锛�%</span></p>
</div>
<div style="margin-top: 50px;display: flex;">
- <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">4.娴嬭瘯鐩殑Test purpose锛�</span></p>
+ <p class=x1111112 style="margin-left: 40px;"><span>4.娴嬭瘯鐩殑Test purpose锛�</span></p>
</div>
- <div style="margin-top: 50px;display: flex;">
- <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">5.娴嬭瘯鏂规硶Test method锛�</span></p>
+ <div v-for="ela in pel.children" v-if='ela.iname !== "" ' style="display: flex;margin-left: 40px;">
+ <p>妫�楠岄」鐩細{{ ela.iname }},娴嬭瘯鐩殑鏄細{{ ela.method }}</p>
+ </div>
+ <div style="margin-top: 80px;display: flex;">
+ <p class=x1111112 style="margin-left: 40px;"><span>5.娴嬭瘯鏂规硶Test method锛�</span></p>
+ </div>
+ <div v-for="ela in pel.children" v-if='ela.iname !== "" ' style="display: flex;margin-left: 40px;">
+ <p>妫�楠岄」鐩細{{ ela.iname }},娴嬭瘯鐩殑鏄細{{ ela.purpose }}</p>
</div>
<div>
<br>
@@ -344,7 +384,7 @@
</div>
</div>
<div class="pagefooting">
- <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ <p><span style="font-size:14pt;font-family:瀹嬩綋;color: cornflowerblue;">
鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
@@ -370,7 +410,7 @@
<span class=x1111112 >Test Report</span><br>
</span></p>
<div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:{{ tableData.finInsNo }}<br>Report No.锛�</span></p>
<p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�4/8<br> Page</span></p>
</div>
</div>
@@ -379,20 +419,20 @@
<p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">6.娴嬭瘯缁撴灉Test result锛�</span></p>
</div>
<div>
- <table border="2px" style="width: 800px;height: 100px;margin-top: 10px;">
+ <table border="2px" style="width: 800px;height: 100px;margin-top: 10px;" >
<tr style="height: 80px;">
<td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯椤圭洰</span></td>
<td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">鏍峰搧鏁伴噺</span></td>
<td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯缁撴灉</span></td>
</tr>
- <tr style="height: 100px;">
- <td></td>
- <td></td>
+ <tr style="height: 100px;" v-if='ela.iname !== "" ' v-for="ela in pel.children">
+ <td class="x1111113" style="text-align: center;">{{ ela.iname }}</td>
+ <td class="x1111113" style="text-align: center;">{{ tableData.quantity }}</td>
<td></td>
</tr>
- <tr style="height: 80px;">
+ <!-- <tr style="height: 80px;">
<td colspan=3></td>
- </tr>
+ </tr> -->
</table>
</div>
<div>
@@ -412,10 +452,17 @@
<span
style='mso-spacerun:yes'> </span>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
</div>
</div>
<div class="pagefooting">
- <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ <p><span style="font-size:14pt;font-family:瀹嬩綋;color: cornflowerblue;">
鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
@@ -441,7 +488,7 @@
<span class=x1111112 >Test Report</span><br>
</span></p>
<div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:{{ tableData.finInsNo }}<br>Report No.锛�</span></p>
<p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�5/8<br> Page</span></p>
</div>
</div>
@@ -458,6 +505,13 @@
<br>
<br>
<span> </span>
+ </div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
</div>
<div>
<p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">9.娴嬭瘯鍚庢鏌osttest check锛�</span></p>
@@ -478,14 +532,22 @@
</div>
</div>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div class="pagefooting">
- <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ <p><span style="font-size:14pt;font-family:瀹嬩綋;color: cornflowerblue;">
鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
</div>
</div>
</template>
+ </div>
</div>
</template>
@@ -542,7 +604,6 @@
initData(){
let ii = []
let pp = []
- console.log("<-------------------->");
this.deviceStr = this.tableData.projectName
this.product = this.tableData.material
this.number = this.tableData.quantity
@@ -550,7 +611,6 @@
this.material = this.tableData.material
this.materialCode = this.tableData.materialCode
this.quantity = this.tableData.quantity
- console.log(this.tableData,"-----------11111");
this.tableData.children.forEach(el =>{
this.prjdata.push(el)
el.children.forEach(kl =>{
@@ -566,7 +626,6 @@
this.iname = Array.from(new Set(pp)).join(",")
},
initprjdata(list){
- console.log(list,"uuuuuuuuuuuuuuuuu");
const data = {
eId: '',
ename: '',
@@ -579,12 +638,12 @@
itype: '',
testValueList: new Array(this.columnLength)
}
- let rowNum = 30
+ let rowNum = 20
let columnNum = this.columnLength
if(list && list.length<2){
list.forEach(item=>{
if(item.children && item.children.length < rowNum){
- rowNum = 15 - item.children.length
+ rowNum = 20 - item.children.length
for(let j=0;j<item.children.length;j++){
let arr = []
if(item.children[j].inspectionValue){
@@ -639,7 +698,6 @@
formData(newVal){
if(newVal){
this.prjdata = []
- console.log("formData鍙樺寲--",newVal)
this.tableData = newVal
this.initData()
this.initprjdata(this.prjdata)
@@ -649,8 +707,9 @@
}
</script>
-<style lang="scss">
+
+<style lang="scss" >
.xl6524921 {
padding: 0px;
mso-ignore: padding;
@@ -1758,6 +1817,7 @@
.head{
display: flex;
+ width: 900pt;
.head-1{
padding: 40px;
}
@@ -1769,7 +1829,7 @@
}
}
.bodycss{
- // margin-left: 85px;
+ margin-left: 85px;
}
.bodycs{
// margin-left: 135px;
@@ -1899,41 +1959,5 @@
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
--
Gitblit v1.9.3