From 683b37bc31e2c80636f19d18812b348e9ede8a0a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 15 十一月 2023 10:24:16 +0800
Subject: [PATCH] s
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 113 ++++++++++++++++++++-----------------
src/views/equipment/equipment/index.vue | 11 +--
2 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 9be5723..2b59511 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -289,15 +289,10 @@
printFun() {
// this.printDialogVisible = false;
this.diaPrintTab = false;
+ console.log(printRaw);
PrintJS({
- printable: "printRaw",
- type: "html",
- // maxWidth: 900,
- // // header: "鍘熸潗鏂欐娴嬫姤鍛�",
- // style:"@page {margin:2.4cm 2cm ;resolution: 300dpi;}",
- // targetStyles: ["*"],
- // ignoreElements: ["no-ignore"],q
- // orientation: 'portrait'
+ printable: "printRaw",//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
maxWidth:450,
targetStyles:['*'],
style:"@page {margin:0 ;resolution: 300dpi;portrait}",
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index 1285e78..afe65a7 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -64,62 +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=2 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'>01</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>02</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>03</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>04</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>05</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>06</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>07</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>08</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>09</td>
- <td colspan=2 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 father" :key="index">
+ <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 class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋" v-text="item.rpFather"></span></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=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 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'>
+ <!-- <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;
@@ -135,7 +142,7 @@
<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'>
<td colspan=2 rowspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
@@ -553,7 +560,7 @@
childrenData: [],
typedata:null,
num:null,
- father:[],
+ prjdata:[],
}
},
created(){
@@ -569,8 +576,8 @@
this.number = this.tableData.quantity
this.typedata = this.tableData.specs
this.tableData.children.forEach(el =>{
- this.father.push(el.father)
- console.log("-----",this.father);
+ this.prjdata.push(el)
+ console.log("-----",this.prjdata);
})
},
--
Gitblit v1.9.3