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

---
 src/views/quality/finishedProductInspection/finishedProducter-print.vue |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index 1a8a7bb..266bcc3 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -149,6 +149,7 @@
             </table>
             
         </div>
+        <div v-for="pel in prjdata">
         <template>
             <div style="page-break-after: always;">
             <div >
@@ -176,7 +177,7 @@
                     <div>
                     <div class="bodycs-2">
                         <p ><span class=x1111112  style='margin-left: 40px;'>妫�楠岄」鐩�:<br>&nbsp;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,20 +189,20 @@
                     </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>
                         <div class="chilen">
                         <p ><span class="x1111113">鎵�  鍑�:<br>&nbsp;&nbsp;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>&nbsp;&nbsp;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>&nbsp;Tested by</span></p> 
@@ -209,11 +210,11 @@
                         </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>
@@ -486,6 +487,7 @@
             </div>
             </div>
         </template>
+        </div>
 </div>
 </template>
 
@@ -579,7 +581,7 @@
                             itype: '',
                             testValueList: new Array(this.columnLength)
                         }
-                        let rowNum = 30
+                        let rowNum = 15
                         let columnNum = this.columnLength
             if(list && list.length<2){
                 list.forEach(item=>{

--
Gitblit v1.9.3