From 9d1aa995c4802643be2b3cd936ad88ee108d2816 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 24 十一月 2023 11:04:29 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 96 +++++++++++++++++++++++++++--------------------
vue.config.js | 1
src/views/quality/finishedProductInspection/index.vue | 7 ++-
public/title.css | 13 +++++-
4 files changed, 70 insertions(+), 47 deletions(-)
diff --git a/public/title.css b/public/title.css
index 388b928..98a52ae 100644
--- a/public/title.css
+++ b/public/title.css
@@ -1,4 +1,8 @@
-@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;}
+@page {
+ margin: 10mm 5mm;
+ margin-bottom: 0;
+ margin-top:0;
+}
.xl6524921 {
padding: 0px;
mso-ignore: padding;
@@ -1120,7 +1124,6 @@
margin-left: 85px;
}
.bodycs{
- // margin-left: 135px;
margin-top: -30px;
}
.bodycs-1{
@@ -1129,6 +1132,7 @@
height: 60px;
width: auto;
margin-top: -80px;
+
}
.bodycs-2{
display: flex;
@@ -1191,7 +1195,10 @@
margin-left: 130px;
}
.pagefooting{
-
+ font-size:8pt;
+ font-family:瀹嬩綋;
+ margin-right: 15pt;
+ color: deepskyblue;
}
.x1111111{
padding: 0px;
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index d6d0768..173dbf1 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -14,7 +14,7 @@
</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)
+ 璁板綍缂栧彿:{{ tableData.finInsNo }}
</td>
<td colspan=3 class=xl6624921 style='border-top:none;border-left:none'>
褰掓。閮ㄩ棬:璐ㄩ噺淇濊瘉閮�
@@ -36,7 +36,7 @@
</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=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'>
@@ -132,7 +132,7 @@
</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> 妫�楠�/鏃堕棿:<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>
@@ -171,9 +171,9 @@
</div>
<div style="margin-left:40pt">
<div class="bodycs-1">
- <p ><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: 190px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�1/8<br> Page</span></p>
+ <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">
@@ -197,6 +197,12 @@
<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 ><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
@@ -212,8 +218,6 @@
<div>
<br>
<br>
- <br>
- <br><br><br>
<span
style='mso-spacerun:yes'> </span>
</div>
@@ -230,7 +234,7 @@
</div>
</div>
<div class="pagefooting">
- <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;margin-left: 40pt;">
+ <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>
@@ -257,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>
@@ -287,7 +291,7 @@
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>
@@ -314,51 +318,61 @@
<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="display: flex;margin-left: 40px;">1.娴嬭瘯璁惧</p>
- <div class="bodycs" style="margin-top: 80px;" v-for="ela in pel.children">
+ <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: 35px;font-size:12pt;font-family:榛戜綋">妫�楠岄」鐩細<span style="width: 60px;"> {{ela.iname}}<br><span>璁惧鍚嶇О锛歿{ ela.ename }}</span><br>Name of Equipment</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧鍨嬪彿:{{ ela.specifications }}<br> Model</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧缂栧彿:{{ ela.code}}<br>Serial No.</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>鏍″噯鏈夋晥鏈�:{{ ela.date }}<br>Calibration Due Date</span></p>
- </div>
- <div>
- <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
+ <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 style="margin-top: 100px;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 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>
+ <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: 80px;display: flex;">
- <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">3.鐜鏉′欢Environmental conditions锛�</span></p>
+ <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 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 style="font-size:12pt;font-family:榛戜綋">5.娴嬭瘯鏂规硶Test method锛�</span></p>
+ <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>
@@ -370,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>
@@ -396,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>
@@ -405,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>
@@ -448,7 +462,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>
@@ -474,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>
@@ -526,7 +540,7 @@
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>
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 602aa4b..fe633e3 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -226,10 +226,11 @@
PrintJS({
printable: "printRaw",
type: "html",
- // scanStyles: false,
- maxWidth: 1000,
- // header: "浜у搧妫�娴嬫姤鍛�",
+ scanStyles: false,
+ maxWidth: 1200,
+ header: "浜у搧妫�娴嬫姤鍛�",
style:style,
+ css:'./title.css',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
diff --git a/vue.config.js b/vue.config.js
index a4794b5..f851bb6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,6 +5,7 @@
// 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'
--
Gitblit v1.9.3