From c5a838c8f43a1fbb030abc6c167c8d1c1bebc6d3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 18 十一月 2023 11:31:50 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 86 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index 9fdd394..df1bb35 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,6 +1,6 @@
<template>
- <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 60pt;margin-left: 20pt;">
- <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:629pt'>
+ <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 65pt;margin-left: 15pt;">
+ <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:629pt;page-break-after: always;'>
<tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
<td colspan=3 rowspan=2 height=40 width=122 style='width:150pt;border: 1pt solid windowtext'>
<span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
@@ -77,7 +77,7 @@
<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'>
+ <td colspan=1 v-for="a in columnLength" 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'>
@@ -89,9 +89,9 @@
<tbody v-for="(item,index) in prjdata" :key="index">
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td rowspan=16 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
- <p class="MsoNormal" align="center" style="text-align:centerdisplay:flex ;">
- <span style="font-family:瀹嬩綋; writing-mode: vertical-rl;">{{item.father}}</span>
+ <td :rowspan="item.children.length" height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ <p >
+ <span style=" writing-mode: vertical-rl;font-size: 26pt;">{{item.father}}</span>
</p>
</td>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
@@ -146,10 +146,12 @@
<td width=235 style='width:176pt'></td>
</tr>
</table>
- <div>
+ <!-- <div v-for="items in prjdata">
+ <div v-for="aa in items.length"> -->
<template>
- <div style="margin-top: 100pt;width: 75%;">
- <div class="head">
+ <div style="page-break-after: always;">
+ <div>
+ <div class="head" id="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
</div>
@@ -222,10 +224,12 @@
</span></p>
</div>
</div>
+ </div>
</template>
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div style="page-break-after: always;">
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -268,10 +272,12 @@
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
</div>
+ </div>
</template>
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div style="page-break-after: always;" >
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -342,10 +348,12 @@
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
</div>
+ </div>
</template>
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div style="page-break-after: always;">
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -372,9 +380,9 @@
<div>
<table border="2px" style="width: 800px;height: 100px;margin-top: 10px;">
<tr style="height: 80px;">
- <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
- <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
- <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯椤圭洰</span></td>
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">鏍峰搧鏁伴噺</span></td>
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯缁撴灉</span></td>
</tr>
<tr style="height: 100px;">
<td></td>
@@ -411,10 +419,12 @@
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
</div>
+ </div>
</template>
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div style="page-break-after: always;">
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -473,9 +483,11 @@
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
</div>
+ </div>
</template>
- </div>
- </div>
+ <!-- </div>
+ </div> -->
+</div>
</template>
<script>
@@ -505,6 +517,7 @@
quantity:null,
username:null,
iname:null,
+ columnLength: 9,
}
},
filters:{
@@ -565,28 +578,30 @@
required: '',
iunit: '',
itype: '',
- testValueList: new Array(9)
+ testValueList: new Array(this.columnLength)
}
- if(list && list.length<10){
+ let rowNum = 15
+ let columnNum = this.columnLength
+ if(list && list.length<2){
list.forEach(item=>{
- if(item.children && item.children.length < 7){
- let size = 15 - item.children.length
+ if(item.children && item.children.length < rowNum){
+ rowNum = 15 - item.children.length
for(let j=0;j<item.children.length;j++){
let arr = []
if(item.children[j].inspectionValue){
arr = item.children[j].inspectionValue.split(",")
}
item.children[j].testValueList = arr
- if(item.children[0].testValueList.length<12){
- let num = 9 - item.children[j].testValueList.length
+ if(item.children[j].testValueList.length<columnNum){
+ let num = columnNum - item.children[j].testValueList.length
for(let i=0;i<num;i++){
item.children[j].testValueList.push("")
}
}
}
- for(let i=0;i< size;i++){
+ for(let i=0;i< rowNum;i++){
item.children.push(data)
- item.father
+ // item.father
}
}
})
@@ -595,15 +610,30 @@
list.forEach(item=>{
if(item.children){
size+=item.children.length
+ item.children.forEach(obj=>{
+ if(obj.inspectionValue){
+ let testValueList = obj.inspectionValue.split(",")
+ obj.testValueList = testValueList
+ if(testValueList.length < columnNum){
+ let len = columnNum-testValueList.length
+ for(var i=0;i<len;i++){
+ obj.testValueList.push("")
+ }
+ }
+ }else{
+ obj.testValueList = new Array(12)
+ }
+ })
}
})
- if(size<15){
- let num = 15 - size
+ if(size < rowNum){
+ let num = rowNum - size
for(let i=0;i<num;i++){
list[list.length-1].children.push(data)
}
}
}
+ this.prjdata = list
}
},
watch:{
--
Gitblit v1.9.3