From 8dc474768e47ecfcb2f590e7d5c704b46f7a612a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 16:10:39 +0800
Subject: [PATCH] modified: src/api/plan/customerorder.js modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: vue.config.js
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 28 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index fd826ba..afe65a7 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -64,34 +64,69 @@
</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=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>閫氭柇: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
-border-left:none'>绾垮簭: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
+ <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 9" 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 colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>缁濈紭鐢甸樆鈮�</p><p>______00M惟</p><p>_____00VDC</p></td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>娴嬭瘯缁�</p><p>鏋滄渶灏�</p><p>鍊�</p></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td>
- <td colspan=3 rowspan="3" class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
+ <td rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span style="font-family:瀹嬩綋">{{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 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{item.children[0].inspectionValue}}</span>
+ </td>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <p v-if="item.children[0].testState==1" class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">鍚堟牸</span></p>
+ <p v-else class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">涓嶅悎鏍�</span></p>
+ </td>
</tr>
- <tr class=xl6524921 height=53 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 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span style="font-family:瀹嬩綋"></span>
+ </p>
+ </td> -->
+ <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 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{el.inspectionValue}}</span>
+ </td>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <p v-if="el.testState==1" class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">鍚堟牸</span></p>
+ <p v-else class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">涓嶅悎鏍�</span></p>
+ </td>
+ </tr>
+ </tbody>
+
+
+ <!-- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
<td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
border-left:none'></td>
<td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
@@ -107,9 +142,9 @@
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
<td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
border-left:none'></td>
- </tr>
+ </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 rowspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
height:40.05pt'>閫氭柇/绾垮簭</td>
<td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
@@ -482,8 +517,8 @@
<td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
height:40.05pt'><p>鍙戝嚭浜у搧涓嶅緱鍑虹幇浠讳綍褰㈠紡鐨勪緵搴斿晢淇℃伅锛屽寘鎷紗鐩樹笂鐨勬爣绛俱�佺數缂�</p><p>涓婁緵搴斿晢鍚嶇О绛�</p></td>
<td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
+ border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td> -->
+ <!-- </tr> -->
<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> 妫�楠�/鏃堕棿:</p></td>
@@ -525,6 +560,7 @@
childrenData: [],
typedata:null,
num:null,
+ prjdata:[],
}
},
created(){
@@ -539,6 +575,11 @@
this.product = this.tableData.material
this.number = this.tableData.quantity
this.typedata = this.tableData.specs
+ this.tableData.children.forEach(el =>{
+ this.prjdata.push(el)
+ console.log("-----",this.prjdata);
+ })
+
},
},
watch:{
--
Gitblit v1.9.3