From 32cf5898f8754f241eecb637da418a77514ffb4a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 16 十一月 2023 16:22:21 +0800
Subject: [PATCH] modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-print.vue
---
src/views/quality/rawMaterial/rawMaterial-print.vue | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-print.vue b/src/views/quality/rawMaterial/rawMaterial-print.vue
index 744c074..c61f311 100644
--- a/src/views/quality/rawMaterial/rawMaterial-print.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-print.vue
@@ -71,19 +71,19 @@
style="width:620pt;border-collapse:collapse;border:1pt solid windowtext">
<tbody>
<tr>
- <td width="121" colspan="2" style="width:110pt;border:solid windowtext 1.0pt;padding:0.2cm 1.4pt 0.2cm 1.4pt">
+ <td width="121" colspan="2" style="width:120pt;height:50pt;border:solid windowtext 1.0pt;padding:1pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">闆朵欢鍚嶇О</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Part Description</span>
</p>
</td>
- <td width="127" colspan="4" style="width:95.5pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="127" colspan="5" style="width:95.5pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center">
<span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="tableData.name"></span>
</p>
</td>
- <td width="113" colspan="4" style="width:84.95pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="113" colspan="3" style="width:84.95pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">鍨�</span><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">
@@ -107,18 +107,18 @@
</td>
</tr>
<tr>
- <td width="101" colspan="2" style="width:110pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 1.4pt 0.2cm 1.4pt">
+ <td width="101" colspan="2" style="width:110pt;height:50pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 1.4pt 0.2cm 1.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠屼华鍣�</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Inspection
instrument</span></p>
</td>
- <td width="127" colspan="4" style="width:95.5pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="127" colspan="5" style="width:95.5pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<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 width="113" colspan="4" style="width:84.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="113" colspan="3" style="width:84.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠屾暟閲�</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
@@ -163,7 +163,7 @@
</td>
</tr>
<tr>
- <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.4cm 5.4pt 0.4cm 5.4pt">
+ <td width="145" colspan="3" style="width:109.1pt;height:40pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.4cm 5.4pt 0.4cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">鎶�鏈姹�</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
@@ -171,10 +171,10 @@
Requirement</span></p>
</td>
<td width="59" colspan="3" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 4.4pt 0.2cm 4.4pt">
- <p class="MsoNormal" align="center" style="text-align:center">
+ <div class="MsoNormal" align="center" style="text-align:center">
<span style="font-size:9.0pt;font-family:瀹嬩綋">鍏樊</span>
- <span lang="EN-US" style="font-size:9.0pt;font-family:"Arial",sans-serif">TOL</span>
- </p>
+ <p lang="EN-US" style="font-size:9.0pt;text-align: center;font-family:"Arial",sans-serif">TOL</p>
+ </div>
</td>
<td width="43" v-for="(item,index) in columnLength" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
@@ -436,20 +436,17 @@
}
}
this.projectList = list
- console.log("list----",list)
}
},
created(){
this.tableData = this.formData
this.initData()
this.initProjectList(this.projectList)
- console.log("aa--",this.tableData)
},
watch:{
formData(newVal){
if(newVal){
this.projectList = []
- console.log(newVal)
this.tableData = newVal
this.initData()
this.initProjectList(this.projectList)
--
Gitblit v1.9.3