From 9c3cda89b53b134b95142116c7d1a72eb1a8f5b3 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 16 十一月 2023 18:31:02 +0800
Subject: [PATCH] modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 104 ++++++++++++++++++++++++++++++++++++++++-----------
src/views/quality/finishedProductInspection/index.vue | 5 ++
2 files changed, 85 insertions(+), 24 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index ed0ed6f..fed98cc 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -122,12 +122,10 @@
<span style="font-family:瀹嬩綋">{{testValue}}</span>
</td>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- <p v-if="el.iresult==1" class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif">鍚堟牸</span></p>
- <p v-if="el.iresult==0" 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> -->
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">{{ el.iresult | formatState}}</span></p>
+
+
</td>
</tr>
</tbody>
@@ -590,30 +588,30 @@
</div>
<div>
<div class="chilen">
- <p ><span class="x1111113">鎵� 鍑�:<br>Approved by</span></p>
- <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="x1111113">鎵� 鍑�:<br> 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>
</div>
<div class="chilen">
- <p ><span class="x1111113">鏍搁獙鍛�:<br>Inspected by</span></p>
- <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="x1111113">鏍搁獙鍛�:<br> 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>
</div>
- <div style="display: flex;margin-left: 290px;">
- <p ><span class="x1111113">妫�楠屽憳锛�<br>Tested by</span></p>
- <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <div style="display: flex;margin-left: 280px;">
+ <p ><span class="x1111113">妫�楠屽憳锛�<br> Tested by</span></p>
+ <p ><span class="time">{{username}}</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>Delivery Date</span></p>
- <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></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>
</div>
<div class="cldata">
<p ><span class="x1111113">娴嬭瘯鏃ユ湡:<br>Testing Date</span></p>
- <p v-for="pel in prjdata"><span class="ziti"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></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>
</div>
</div>
</div>
</div>
<div class="pagefooting">
- <p><span style="font-size:8pt;font-family:瀹嬩綋;color: 0, 32, 96;">
+ <p><span style="font-size:8pt;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>
@@ -648,15 +646,32 @@
material:null,
materialCode:null,
quantity:null,
+ username:null,
+ }
+ },
+ filters:{
+ formatState(state){
+ if(state){
+ if(state == "1"){
+ return "鍚堟牸"
+ }
+ if(state == "0"){
+ return "涓嶅悎鏍�"
+ }
+ return null
+ }
+ return null
}
},
created(){
this.tableData = this.formData
+ console.log(this.tableData,"=======================77777777");
this.initData()
this.initprjdata(this.prjdata)
},
methods:{
initData(){
+ let ii = []
console.log("<------------------------------->");
this.deviceStr = this.tableData.projectName
this.product = this.tableData.material
@@ -667,9 +682,14 @@
this.quantity = this.tableData.quantity
console.log(this.tableData,"--------------------11111");
this.tableData.children.forEach(el =>{
- console.log(el,"-->-->");
this.prjdata.push(el)
- })
+ el.children.forEach(kl =>{
+ if(kl.userName){
+ ii.push(kl.userName)
+ }
+ })
+ })
+ this.username = Array.from(new Set(ii)).join(",")
},
initprjdata(list){
console.log(list,"uuuuuuuuuuuuuuuuu");
@@ -679,7 +699,7 @@
iname: '',
inote: '',
inspectionValue: '',
- iresult: '',
+ : '',
required: '',
iunit: '',
itype: '',
@@ -1885,9 +1905,47 @@
margin-left: 140px;
}
.ziti{
- font-size: 38pt;
- font-family: 瀹嬩綋;
+ display: flex;
+ margin-left: 140px;
+
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 20pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+.time{
+ display: flex;
margin-left: 80px;
+ margin-top: 20px;
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 20pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 榛戜綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+
}
.chilen{
display: flex;
@@ -1908,7 +1966,7 @@
font-weight: 400;
font-style: normal;
text-decoration: none;
- font-family: 瀹嬩綋;
+ font-family: 榛戜綋;
mso-generic-font-family: auto;
mso-font-charset: 134;
mso-number-format: General;
@@ -1926,7 +1984,7 @@
font-weight: 400;
font-style: normal;
text-decoration: none;
- font-family: 瀹嬩綋;
+ font-family: 榛戜綋;
mso-generic-font-family: auto;
mso-font-charset: 134;
mso-number-format: General;
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index a1713f8..c354f84 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -225,15 +225,18 @@
style: '@page {margin: 2.0mm 2.0mm}',
targetStyles: ["*"],
// importCSS: true,
+ fontSize: '30px',
ignoreElements: ["no-ignore"],
orientation: 'portrait'
});
},
//鏌ョ湅鎶ュ憡鎸夐挳
showPrint(row){
- console.log('----------');
queryById(row.id).then(res=>{
this.printFormData = res.data.data
+ this.printFormData.createTime = row.createTime
+ this.printFormData.updateTime = row.updateTime
+ console.log(this.printFormData,"7777777777=====");
this.printDialogVisible = true
}).catch(error=>{
console.log(error);
--
Gitblit v1.9.3