From c825c201696b2eeb3e2faccda7f17f376ac1e097 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 24 十一月 2023 13:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 18
.gitignore | 4
vue.config.js | 5
src/views/quality/rawMaterial/index.vue | 95 ++++--
src/views/quality/rawMaterial/rawMaterial-print.vue | 736 +++++++++++++++++++++++++-----------------------
5 files changed, 455 insertions(+), 403 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8142978..d6143ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
# Editor directories and files
.idea
.vscode
+.nvmdrc
*.suo
*.ntvs*
*.njsproj
@@ -29,6 +30,3 @@
# Lock File
package-lock.json
yarn.lock
-
-# config.js
-vue.config.js
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index bdad739..f9a611a 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -69,6 +69,7 @@
resultData:[],
addOrUpdateVisible: false,
type: [1],
+ multipleSelection: [],
prelang: 'rawMaterial',
ajaxFun: getRawInspectList,
options: {
@@ -213,11 +214,17 @@
},
],
toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }],
+ {
+ text: '鏂板',
+ type: 'primary',
+ fun: this.addOrUpdateHandle
+ },
+ {
+ text: '涓嬭浇妫�楠屾姤鍛�',
+ type: 'primary',
+ fun: this.downloadReport
+ }
+ ],
operator: [{
text: '鎵撳嵃',
type: 'text',
@@ -253,9 +260,7 @@
RawMaterialForm,
printTemplate,
},
- created() {
-
- },
+ created() { },
computed: {
...mapGetters(['permissions'])
},
@@ -267,6 +272,22 @@
}
},
methods:{
+ downloadReport(){
+ let selection = this.multipleSelection
+ if(!selection || selection.length < 1){
+ this.$message.error("璇峰厛閫夋嫨妫�楠屾暟鎹�")
+ return
+ }else{
+ let arr = selection.filter(s=>{
+ return s.judgeState==null || s.judgeState==''
+ })
+ if(arr.length > 0){
+ this.$message.error("鍙兘閫夋嫨宸叉娴嬬殑鏁版嵁")
+ return
+ }
+ console.log(selection)
+ }
+ },
//鏌ョ湅鎶ュ憡鎸夐挳
previewFun(row){
getObj(row.id).then(res=>{
@@ -282,10 +303,17 @@
PrintJS({
printable: "printRaw",
type: "html",
- maxWidth: 880,
// header: "鍘熸潗鏂欐娴嬫姤鍛�",
- style: '@page {margin: 10mm 5mm;}',
targetStyles: ["*"],
+ style: `@page {margin: 0mm 5mm;size: A4;};
+ html {zoom:100%;};
+ @media print {
+ html,body{
+ width:880pt;
+ height:900pt;
+ margin:0;
+ }
+ }`,
ignoreElements: ["no-ignore"],
orientation: 'portrait'
});
@@ -368,37 +396,36 @@
},
getData() {
this.$refs.rawMaterialTable.getDataList()
-
},
// table鑷甫浜嬩欢
handleSelectionChange(val) {
+ this.multipleSelection = val
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
- var stateArr = val.map(function(value, index) {
- return value.coState
- })
+ // var stateArr = val.map(function(value, index) {
+ // return value.coState
+ // })
// 閫変腑鐘舵�佹暟缁勫厓绱犲幓閲�
- var uniqueStateArr = []
- for (var i = 0; i < stateArr.length; i++) {
- if (uniqueStateArr.indexOf(stateArr[i]) == -1) {
- uniqueStateArr.push(stateArr[i])
- }
- }
+ // var uniqueStateArr = []
+ // for (var i = 0; i < stateArr.length; i++) {
+ // if (uniqueStateArr.indexOf(stateArr[i]) == -1) {
+ // uniqueStateArr.push(stateArr[i])
+ // }
+ // }
// 寰幆鑷畾涔夋寜閽紝鍒ゆ柇姣忎釜鎸夐挳鐨刾ermitArr鏄惁瀹屽叏鍖呭惈閫変腑鐘舵�侊紝鑻ュ畬鍏ㄥ寘鍚紝鍒欐寜閽寒锛屽惁鍒欐寜閽伆
- for (var i = 0; i < this.stateTagArr.length; i++) {
- if (
- uniqueStateArr.every((val) =>
- this.stateTagArr[i].permitArr.length <= 0
- ? true
- : this.stateTagArr[i].permitArr.includes(val)
- )
- ) {
- this.stateTagArr[i].disabled = false
- } else {
- this.stateTagArr[i].disabled = true
- }
- }
- this.multipleSelection = val
+ // for (var i = 0; i < this.stateTagArr.length; i++) {
+ // if (
+ // uniqueStateArr.every((val) =>
+ // this.stateTagArr[i].permitArr.length <= 0
+ // ? true
+ // : this.stateTagArr[i].permitArr.includes(val)
+ // )
+ // ) {
+ // this.stateTagArr[i].disabled = false
+ // } else {
+ // this.stateTagArr[i].disabled = true
+ // }
+ // }
},
}
}
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index ba1914e..62a368f 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -392,9 +392,11 @@
let resultVal = '1'
this.list.forEach(item=>{
if(item.children){
- if(obj.testState == 0){
- resultVal = '0'
- }
+ item.children.forEach(ele=>{
+ if(ele.testState == 0){
+ resultVal = '0'
+ }
+ })
}
})
this.resultVal = resultVal
@@ -424,13 +426,15 @@
number: this.unqualifiedNum,
}
updateRawInspectsById(data).then(res => {
- if(res.data.code == 0){
+ if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
this.$message.success("涓婃姤鎴愬姛");
- this.dialogVisible = false
+ }else{
+ this.$message.error("涓婃姤澶辫触锛�",res.data.data);
}
+ this.dialogVisible = false
+ this.checkTestState()
});
- this.checkTestState()
},
addTeatValueColumn(){
this.empiricalValueAdd = this.empiricalValueAdd + 1;
@@ -497,7 +501,6 @@
}
},
updateTestValue(row,index){
- console.log(row);
if(row.rpId == null){
return
}
@@ -590,7 +593,6 @@
}
},
changeState(row, index) {
- console.log(row)
if (row.rpId != null && row.rpId != '') {
let val = row.testValueList.join(",")
if (val === undefined || val === '' || val === null) {
diff --git a/src/views/quality/rawMaterial/rawMaterial-print.vue b/src/views/quality/rawMaterial/rawMaterial-print.vue
index a13a09a..5c1bef4 100644
--- a/src/views/quality/rawMaterial/rawMaterial-print.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-print.vue
@@ -1,326 +1,333 @@
<template>
-<div style="word-wrap:break-word;text-justify-trim:punctuation">
- <div class="WordSection1" style="layout-grid:15.6pt;">
- <div align="center">
- <table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" width="629"
- style="width:620pt;border-collapse:collapse;border:1pt solid windowtext">
- <tbody>
- <tr>
- <td width="199" rowspan="2" style="width:149.45pt;border: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-size:12.0pt;font-family:"Arial",sans-serif"><img width="174"
- height="58" id="logo" src="../../../../public/img/image001.jpg"
- alt="IMG_256"></span></p>
- </td>
- <td width="226" style="width:169.65pt;border:solid windowtext 1.0pt;border-left:
- 1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+<div>
+ <div style="margin-top:20pt;word-wrap:break-word;text-justify-trim:punctuation" :key="i" v-for="(project,i) in projectList">
+ <div class="WordSection1" style="layout-grid:15.6pt;">
+ <div align="center">
+ <table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" width="629"
+ style="width:620pt;border-collapse:collapse;border:1pt solid windowtext">
+ <tbody>
+ <tr>
+ <td width="199" rowspan="2" style="width:149.45pt;border: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-size:12.0pt;font-family:"Arial",sans-serif"><img width="174"
+ height="58" id="logo" src="../../../../public/img/image001.jpg"
+ alt="IMG_256"></span></p>
+ </td>
+ <td width="226" style="width:169.65pt;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:10.0pt;font-family:瀹嬩綋">璁板綍鍚嶇О锛氭楠岃褰曡〃</span></p>
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-size:10.0pt;font-family:"Arial",sans-serif">Table: Inspection
+ Record</span></p>
+ </td>
+ <td width="204" style="width:152.8pt;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:10.0pt;font-family:瀹嬩綋">淇濆瓨鏈熼檺锛�</span><span lang="EN-US"
+ style="font-size:10.0pt;font-family:"Arial",sans-serif">25</span><span
+ style="font-size:10.0pt;font-family:瀹嬩綋">骞�</span></p>
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-size:10.0pt;font-family:"Arial",sans-serif">Storage Life: 25
+ years</span></p>
+ </td>
+ </tr>
+ <tr>
+ <td width="226" style="width:169.65pt;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:10.0pt;font-family:瀹嬩綋">璁板綍缂栧彿锛�</span><a name="OLE_LINK1"><span
+ lang="EN-US"
+ style="font-size:10.0pt;font-family:"Arial",sans-serif">ZTT/QR-8.6-07</span></a><span
+ style="font-size:10.0pt;font-family:瀹嬩綋">锛�</span><span lang="EN-US"
+ style="font-size:10.0pt;font-family:"Arial",sans-serif">A/0</span><span
+ style="font-size:10.0pt;font-family:瀹嬩綋">锛�</span></p>
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-size:10.0pt;font-family:"Arial",sans-serif">Record No.:
+ ZTT/QR-8.6-07</span></p>
+ </td>
+ <td width="204" style="width:152.8pt;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:10.0pt;font-family:瀹嬩綋">褰掓。閮ㄩ棬锛氳川閲忎繚璇侀儴</span></p>
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-size:10.0pt;font-family:"Arial",sans-serif">Department: QC</span>
+ </p>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <p class="MsoNormal" align="center" style="margin-top:7.8pt;margin-bottom:3pt;text-align:center">
+ <span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif"> </span>
+ <span style="font-size:10.0pt;font-family:瀹嬩綋">妫�楠岃褰曡〃</span><span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif">-</span>
+ <span style="font-size:10.0pt;font-family:瀹嬩綋">鏈哄姞宸ヤ欢</span><span style="font-size:10.0pt;font-family:"Arial",sans-serif"> </span><span style="font-size:10.0pt;font-family:瀹嬩綋">锛�</span><span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif">Inpection Record-machining </span>
+ <span style="font-size:10.0pt;font-family:瀹嬩綋">锛�</span><span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif"> </span>
+ <span style="font-size:10.0pt;font-family:瀹嬩綋">椤电爜锛�</span>
+ <span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif"> Page No.</span>
+ <span style="font-size:10.0pt;font-family:瀹嬩綋">锛夛細</span>
+ <span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif">
+ {{i+1}}
+ </span>
+ </p>
+ <div align="center">
+ <table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" width="628"
+ style="width:620pt;border-collapse:collapse;border:1pt solid windowtext">
+ <tbody>
+ <tr>
+ <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="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="project.name"></span>
+ </p>
+ </td>
+ <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">
+ </span><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">Model</span></p>
+ </td>
+ <td width="86" colspan="4" style="width:64.65pt;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="project.specs"></span></p>
+ </td>
+ <td width="72" colspan="2" style="width:54.35pt;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></p>
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-size:9.0pt;font-family:"Arial",sans-serif">Order No.</span></p>
+ </td>
+ <td width="128" colspan="3" style="width:96.0pt;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="project.rmessage.split(',')[0]"></span></p>
+ </td>
+ </tr>
+ <tr>
+ <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="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="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"
+ style="font-size:9.0pt;font-family:"Arial",sans-serif">Quantity to
+ check</span></p>
+ </td>
+ <td width="86" colspan="4" style="width:64.65pt;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="project.number"></span></p>
+ </td>
+ <td width="72" colspan="2" style="width:54.35pt;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"
+ style="font-size:9.0pt;font-family:"Arial",sans-serif">Supplier</span></p>
+ </td>
+ <td width="128" colspan="3" style="width:96.0pt;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="project.supplier"></span></p>
+ </td>
+ </tr>
+ <tr>
+ <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 0.4pt 0.2cm 0.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 Item</span>
+ </p>
+ </td>
+ <td width="408" colspan="15" style="width:306.35pt;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"
+ style="font-size:9.0pt;font-family:"Arial",sans-serif">Test result (Measured
+ value)</span></p>
+ </td>
+ <td width="74" rowspan="2" style="width:55.8pt;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 3.4pt 0.2cm 3.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">Conclusion</span></p>
+ </td>
+ </tr>
+ <tr>
+ <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"
+ style="font-size:9.0pt;font-family:"Arial",sans-serif">Technical
+ 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">
+ <div class="MsoNormal" align="center" style="text-align:center">
+ <span style="font-size:9.0pt;font-family:瀹嬩綋">鍏樊</span>
+ <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"
+ style="font-size:9.0pt;font-family:"Arial",sans-serif">{{item>9||i>0?(item+(i*columnLength)):'0'+item}}</span></p>
+ </td>
+ </tr>
+ </tbody>
+ <tbody v-for="(item,index) in project.children" :key="index">
+ <tr style="height:19.85pt">
+ <td width="85" :rowspan="item.children.length" style="width:63.95pt;border:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <p class="MsoNormal" align="center" style="text-align:center"><span
+ style="font-family:瀹嬩綋" v-text="item.rpFather"></span></p>
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif"></span></p>
+ </td>
+ <td width="60" colspan="2" style="width:65.15pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif" v-text="item.children[0].rpName"></span></p>
+ </td>
+ <td width="59" colspan="3" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif" v-text="item.children[0].required"></span></p>
+ </td>
+ <td width="43" v-for="(val,index) in item.children[0].testValList" :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;height:19.85pt">
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">{{val}}</span></p>
+ </td>
+ <td width="74" style="width:70pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.1cm 2.4pt 0.1cm 2.4pt;height:19.85pt">
+ <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-if="item.children[0].testState=='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>
+ </td>
+ </tr>
+ <tr class="pageTr" style="height:19.85pt" v-for="(j,index) in (item.children.slice(1))" :key="index">
+ <td width="60" colspan="2" style="width:45.15pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">{{j.rpName}}</span></p>
+ </td>
+ <td width="59" colspan="3" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">{{j.required}}</span></p>
+ </td>
+ <td width="59" v-for="(testValue,index) in j.testValList" :key="index" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">{{testValue}}</span></p>
+ </td>
+ <td width="43" colspan="1" style="width:70pt;border:1pt solid windowtext;padding:0.1cm 2.4pt 0.1cm 2.4pt;height:19.85pt">
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">
+ {{ j.testState | formatState}}
+ </span>
+ </p>
+ </td>
+ </tr>
+ </tbody>
+ <!-- bottom -->
+ <tr style="height:40.95pt" class="pageTr">
+ <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
+ border-top:1pt solid windowtext;padding:0cm 5.4pt 0cm 5.4pt;height:40.95pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-size:10.0pt;font-family:瀹嬩綋">璁板綍鍚嶇О锛氭楠岃褰曡〃</span></p>
+ style="font-family:瀹嬩綋">澶�</span><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">
+ </span><span style="font-family:瀹嬩綋">娉�</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-size:10.0pt;font-family:"Arial",sans-serif">Table: Inspection
- Record</span></p>
+ style="font-family:"Arial",sans-serif">Remark</span></p>
</td>
- <td width="204" style="width:152.8pt;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:10.0pt;font-family:瀹嬩綋">淇濆瓨鏈熼檺锛�</span><span lang="EN-US"
- style="font-size:10.0pt;font-family:"Arial",sans-serif">25</span><span
- style="font-size:10.0pt;font-family:瀹嬩綋">骞�</span></p>
+ <td width="483" colspan="16" style="width:362.15pt;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;height:40.95pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-size:10.0pt;font-family:"Arial",sans-serif">Storage Life: 25
- years</span></p>
+ style="font-family:"Arial",sans-serif"> </span></p>
</td>
</tr>
<tr>
- <td width="226" style="width:169.65pt;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="145" colspan="3" style="width:109.1pt;border:none;
+ border-top: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:10.0pt;font-family:瀹嬩綋">璁板綍缂栧彿锛�</span><a name="OLE_LINK1"><span
- lang="EN-US"
- style="font-size:10.0pt;font-family:"Arial",sans-serif">ZTT/QR-8.6-07</span></a><span
- style="font-size:10.0pt;font-family:瀹嬩綋">锛�</span><span lang="EN-US"
- style="font-size:10.0pt;font-family:"Arial",sans-serif">A/0</span><span
- style="font-size:10.0pt;font-family:瀹嬩綋">锛�</span></p>
+ style="font-family:瀹嬩綋">妫�楠屽憳</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-size:10.0pt;font-family:"Arial",sans-serif">Record No.:
- ZTT/QR-8.6-07</span></p>
+ style="font-family:"Arial",sans-serif">Inspector</span></p>
</td>
- <td width="204" style="width:152.8pt;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:10.0pt;font-family:瀹嬩綋">褰掓。閮ㄩ棬锛氳川閲忎繚璇侀儴</span></p>
+ <td width="120" colspan="4" style="width:90.25pt;border-top:1pt solid windowtext;border-left:
+ 1pt solid windowtext;border-bottom:none;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-size:10.0pt;font-family:"Arial",sans-serif">Department: QC</span>
+ style="font-family:"Arial",sans-serif" v-text="tableData.createUser"></span></p>
+ </td>
+ <td width="82" colspan="4" style="width:61.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
+ border-bottom:none;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-family:瀹嬩綋">鏃�</span><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">
+ </span><span style="font-family:瀹嬩綋">鏈�</span></p>
+ <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">Date</span></p>
+ </td>
+ <td width="80" colspan="3" style="width:60.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
+ border-bottom:none;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="tableData.creatTime.split(' ')[0]"></span></p>
+ </td>
+ <td width="83" dis colspan="3" style="width:62.25pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:none;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-family:瀹嬩綋">瀹�</span>
+ <span lang="EN-US" style="font-family:"Arial",sans-serif"> </span>
+ <span style="font-family:瀹嬩綋">鏍�</span>
+ </p>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">Audit</span>
+ </p>
+ </td>
+ <td width="117" colspan="2" style="width:88.1pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:none;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"> </span>
</p>
</td>
</tr>
- </tbody>
+ <tr height="0">
+ <td width="85" style="border:none"></td>
+ <td width="16" style="border:none"></td>
+ <td width="44" style="border:none"></td>
+ <td width="59" style="border:none"></td>
+ <td width="23" style="border:none"></td>
+ <td width="19" style="border:none"></td>
+ <td width="18" style="border:none"></td>
+ <td width="27" style="border:none"></td>
+ <td width="43" style="border:none"></td>
+ <td width="6" style="border:none"></td>
+ <td width="6" style="border:none"></td>
+ <td width="32" style="border:none"></td>
+ <td width="43" style="border:none"></td>
+ <td width="6" style="border:none"></td>
+ <td width="40" style="border:none"></td>
+ <td width="32" style="border:none"></td>
+ <td width="11" style="border:none"></td>
+ <td width="43" style="border:none"></td>
+ <td width="74" style="border:none"></td>
+ </tr>
</table>
</div>
- <p class="MsoNormal" align="center" style="margin-top:7.8pt;margin-bottom:3pt;text-align:center">
- <span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif"> </span>
- <span style="font-size:10.0pt;font-family:瀹嬩綋">妫�楠岃褰曡〃</span><span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif">-</span>
- <span style="font-size:10.0pt;font-family:瀹嬩綋">鏈哄姞宸ヤ欢</span><span style="font-size:10.0pt;font-family:"Arial",sans-serif"> </span><span style="font-size:10.0pt;font-family:瀹嬩綋">锛�</span><span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif">Inpection Record-machining </span>
- <span style="font-size:10.0pt;font-family:瀹嬩綋">锛�</span><span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif"> </span>
- <span style="font-size:10.0pt;font-family:瀹嬩綋">椤电爜锛�</span><span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif"> Page No.</span><span style="font-size:10.0pt;font-family:瀹嬩綋">锛夛細</span><span lang="EN-US" style="font-size:10.0pt;font-family:"Arial",sans-serif"> </span>
- </p>
- <div align="center">
- <table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" width="628"
- style="width:620pt;border-collapse:collapse;border:1pt solid windowtext">
- <tbody>
- <tr>
- <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="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="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">
- </span><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">Model</span></p>
- </td>
- <td width="86" colspan="4" style="width:64.65pt;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.specs"></span></p>
- </td>
- <td width="72" colspan="2" style="width:54.35pt;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></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-size:9.0pt;font-family:"Arial",sans-serif">Order No.</span></p>
- </td>
- <td width="128" colspan="3" style="width:96.0pt;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.rmessage.split(',')[0]"></span></p>
- </td>
- </tr>
- <tr>
- <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="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="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"
- style="font-size:9.0pt;font-family:"Arial",sans-serif">Quantity to
- check</span></p>
- </td>
- <td width="86" colspan="4" style="width:64.65pt;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="tableData.number"></span></p>
- </td>
- <td width="72" colspan="2" style="width:54.35pt;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"
- style="font-size:9.0pt;font-family:"Arial",sans-serif">Supplier</span></p>
- </td>
- <td width="128" colspan="3" style="width:96.0pt;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="tableData.supplier"></span></p>
- </td>
- </tr>
- <tr>
- <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 0.4pt 0.2cm 0.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 Item</span>
- </p>
- </td>
- <td width="408" colspan="15" style="width:306.35pt;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"
- style="font-size:9.0pt;font-family:"Arial",sans-serif">Test result (Measured
- value)</span></p>
- </td>
- <td width="74" rowspan="2" style="width:55.8pt;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 3.4pt 0.2cm 3.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">Conclusion</span></p>
- </td>
- </tr>
- <tr>
- <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"
- style="font-size:9.0pt;font-family:"Arial",sans-serif">Technical
- 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">
- <div class="MsoNormal" align="center" style="text-align:center">
- <span style="font-size:9.0pt;font-family:瀹嬩綋">鍏樊</span>
- <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"
- style="font-size:9.0pt;font-family:"Arial",sans-serif">{{item>9?item:'0'+item}}</span></p>
- </td>
- </tr>
- </tbody>
- <tbody v-for="(item,index) in projectList" :key="index">
- <tr style="height:19.85pt">
- <td width="85" :rowspan="item.children.length" style="width:63.95pt;border:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋" v-text="item.rpFather"></span></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"></span></p>
- </td>
- <td width="60" colspan="2" style="width:65.15pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif" v-text="item.children[0].rpName"></span></p>
- </td>
- <td width="59" colspan="3" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif" v-text="item.children[0].required"></span></p>
- </td>
- <td width="43" v-for="(val,index) in item.children[0].testValueList" :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;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">{{val}}</span></p>
- </td>
- <td width="74" style="width:70pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.1cm 2.4pt 0.1cm 2.4pt;height:19.85pt">
- <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-if="item.children[0].testState=='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>
- </td>
- </tr>
- <tr class="pageTr" style="height:19.85pt" v-for="(j,index) in (item.children.slice(1))" :key="index">
- <td width="60" colspan="2" style="width:45.15pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">{{j.rpName}}</span></p>
- </td>
- <td width="59" colspan="3" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">{{j.required}}</span></p>
- </td>
- <td width="59" v-for="(testValue,index) in j.testValueList" :key="index" style="width:44.4pt;border:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">{{testValue}}</span></p>
- </td>
- <td width="43" colspan="1" style="width:70pt;border:1pt solid windowtext;padding:0.1cm 2.4pt 0.1cm 2.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif">
- {{ j.testState | formatState}}
- </span>
- </p>
- </td>
- </tr>
- </tbody>
- <!-- bottom -->
- <tr style="height:40.95pt" class="pageTr">
- <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
- border-top:1pt solid windowtext;padding:0cm 5.4pt 0cm 5.4pt;height:40.95pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋">澶�</span><span lang="EN-US"
- style="font-family:"Arial",sans-serif">
- </span><span style="font-family:瀹嬩綋">娉�</span></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">Remark</span></p>
- </td>
- <td width="483" colspan="16" style="width:362.15pt;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;height:40.95pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- </tr>
- <tr>
- <td width="145" colspan="3" style="width:109.1pt;border:none;
- border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋">妫�楠屽憳</span></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">Inspector</span></p>
- </td>
- <td width="120" colspan="4" style="width:90.25pt;border-top:1pt solid windowtext;border-left:
- 1pt solid windowtext;border-bottom:none;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="tableData.createUser"></span></p>
- </td>
- <td width="82" colspan="4" style="width:61.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:none;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-family:瀹嬩綋">鏃�</span><span lang="EN-US"
- style="font-family:"Arial",sans-serif">
- </span><span style="font-family:瀹嬩綋">鏈�</span></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">Date</span></p>
- </td>
- <td width="80" colspan="3" style="width:60.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:none;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="tableData.creatTime.split(' ')[0]"></span></p>
- </td>
- <td width="83" colspan="3" style="width:62.25pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:none;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-family:瀹嬩綋">瀹�</span>
- <span lang="EN-US" style="font-family:"Arial",sans-serif"> </span>
- <span style="font-family:瀹嬩綋">鏍�</span>
- </p>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif">Audit</span>
- </p>
- </td>
- <td width="117" colspan="2" style="width:88.1pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:none;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"> </span>
- </p>
- </td>
- </tr>
- <tr height="0">
- <td width="85" style="border:none"></td>
- <td width="16" style="border:none"></td>
- <td width="44" style="border:none"></td>
- <td width="59" style="border:none"></td>
- <td width="23" style="border:none"></td>
- <td width="19" style="border:none"></td>
- <td width="18" style="border:none"></td>
- <td width="27" style="border:none"></td>
- <td width="43" style="border:none"></td>
- <td width="6" style="border:none"></td>
- <td width="6" style="border:none"></td>
- <td width="32" style="border:none"></td>
- <td width="43" style="border:none"></td>
- <td width="6" style="border:none"></td>
- <td width="40" style="border:none"></td>
- <td width="32" style="border:none"></td>
- <td width="11" style="border:none"></td>
- <td width="43" style="border:none"></td>
- <td width="74" style="border:none"></td>
- </tr>
- </table>
- </div>
- <p class="MsoNormal"><span lang="EN-US"> </span></p>
+ <p class="MsoNormal"><span lang="EN-US"> </span></p>
+ </div>
</div>
</div>
</template>
@@ -332,6 +339,19 @@
type: Object,
default:()=>{
return {}
+ }
+ }
+ },
+ created(){
+ this.tableData = this.formData
+ this.initData()
+ },
+ watch:{
+ formData(newVal){
+ if(newVal){
+ this.projectList = []
+ this.tableData = newVal
+ this.initData()
}
}
},
@@ -361,21 +381,71 @@
methods:{
initData(){
let deviceNameList = []
+ let maxLen = 0
+ let pageSize = 0
if(this.tableData.children){
this.tableData.children.forEach(e => {
- this.projectList.push(e)
if(e.children){
e.children.forEach(o =>{
+ if(o.testValue){
+ let testValList = o.testValue.split(",")
+ if( testValList.length > maxLen){
+ maxLen = testValList.length
+ }
+ }
if(o.deviceName){
deviceNameList.push(o.deviceName)
}
})
}
- });
+ })
+ pageSize = Math.ceil(Number(maxLen)/Number(this.columnLength))
+ this.tableData.children.forEach(ele=>{
+ if(ele.children){
+ ele.children.forEach(obj =>{
+ let testValList = []
+ if(obj.testValue){
+ testValList = obj.testValue.split(",")
+ }
+ let size = (this.columnLength*pageSize) - (testValList.length)
+ obj.testValList = testValList
+ for(var i=0;i<size;i++){
+ obj.testValList.push('')
+ }
+ })
+ }
+ })
}
+ this.pageDataFun(pageSize,this.tableData)
this.deviceStr = Array.from(new Set(deviceNameList)).join(",")
},
- initProjectList(list){
+ //鑾峰彇姣忛〉鐨勬楠岄」鐩�
+ pageDataFun(pageSize,data){
+ let tabData = []
+ if(pageSize>0 && data){
+ for(var i=0;i<pageSize;i++){
+ let obj = JSON.parse(JSON.stringify(data))
+ if(obj.children){
+ obj.children.forEach(o=>{
+ if(o.children){
+ o.children.forEach(e=>{
+ if(e.testValList){
+ let colLen = this.columnLength
+ let start = colLen*i
+ let end = ((1+i)*colLen)
+ e.testValList = e.testValList.slice(start,end)
+ tabData.push(obj)
+ }
+ })
+ }
+ })
+ this.initRow(obj.children)
+ }
+ }
+ }
+ this.projectList = tabData
+ },
+ initRow(list){
const data = {
deviceId: '',
deviceName: '',
@@ -384,27 +454,13 @@
rpUnit: '',
testState: null,
userName: '',
- testValueList: new Array(this.columnLength)
+ testValList: new Array(this.columnLength)
}
let rowNum = 15
- let columnNum = this.columnLength
if(list && list.length<2){
list.forEach(item=>{
if(item.children && item.children.length < rowNum){
rowNum-=item.children.length
- for(let j=0;j<item.children.length;j++){
- let arr = []
- if(item.children[j].testValue){
- arr = item.children[j].testValue.split(",")
- }
- item.children[j].testValueList = arr
- if(item.children[0].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< rowNum;i++){
item.children.push(data)
}
@@ -415,20 +471,6 @@
list.forEach(item=>{
if(item.children){
size+=item.children.length
- item.children.forEach(obj=>{
- if(obj.testValue){
- let testValueList = obj.testValue.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 < rowNum){
@@ -438,24 +480,8 @@
}
}
}
- this.projectList = list
- }
+ },
},
- created(){
- this.tableData = this.formData
- this.initData()
- this.initProjectList(this.projectList)
- },
- watch:{
- formData(newVal){
- if(newVal){
- this.projectList = []
- this.tableData = newVal
- this.initData()
- this.initProjectList(this.projectList)
- }
- }
- }
}
</script>
diff --git a/vue.config.js b/vue.config.js
index f851bb6..a215c16 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,10 +3,9 @@
* https://cli.vuejs.org/zh/config/
*/
// const url = 'http://192.168.0.23:9999'
+// const url = 'http://192.168.83.249:9999'
- // const url = 'http://192.168.0.60:9999'
- // const url = 'http://localhost:9999'
-const url = 'http://localhost:9999'
+// const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3