From 7c65f31e65d1a4c3ed49cdec68656a8281d1f56e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 24 十一月 2023 13:48:26 +0800
Subject: [PATCH] modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-print.vue
---
src/views/quality/rawMaterial/index.vue | 15 +++++++--------
src/views/quality/rawMaterial/rawMaterial-print.vue | 38 ++++++++++++++++++++++++--------------
2 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index f9a611a..51299fe 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -38,11 +38,11 @@
@refreshDataList="getData"
></RawMaterialForm>
<el-dialog
- top="10vh"
+ top="7vh"
title="鎵撳嵃棰勮"
:visible.sync="printDialogVisible"
- width="60%">
- <div style="width:100%;height: 60vh;overflow-y: scroll;">
+ width="70%">
+ <div style="width:90%;margin-left:5%;height: 60vh;overflow-y: scroll;">
<printTemplate id="printRaw" :formData="printFormData"></printTemplate>
</div>
<span slot="footer" class="dialog-footer">
@@ -305,13 +305,12 @@
type: "html",
// header: "鍘熸潗鏂欐娴嬫姤鍛�",
targetStyles: ["*"],
- style: `@page {margin: 0mm 5mm;size: A4;};
- html {zoom:100%;};
+ style: `@page {margin: 0mm 5mm;size: A4;}
+ html {zoom:100%;}
@media print {
html,body{
- width:880pt;
- height:900pt;
- margin:0;
+ width:200mm;
+ height:297mm;
}
}`,
ignoreElements: ["no-ignore"],
diff --git a/src/views/quality/rawMaterial/rawMaterial-print.vue b/src/views/quality/rawMaterial/rawMaterial-print.vue
index 5c1bef4..c93f0d2 100644
--- a/src/views/quality/rawMaterial/rawMaterial-print.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-print.vue
@@ -1,6 +1,7 @@
<template>
<div>
- <div style="margin-top:20pt;word-wrap:break-word;text-justify-trim:punctuation" :key="i" v-for="(project,i) in projectList">
+ <div class="page" style="word-wrap:break-word;text-justify-trim:punctuation" :key="i" v-for="(project,i) in projectList">
+ <div style="width:100%;height:10pt"></div>
<div class="WordSection1" style="layout-grid:15.6pt;">
<div align="center">
<table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" width="629"
@@ -154,14 +155,14 @@
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">
+ <td width="408" colspan="14" 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">
+ <td width="74" rowspan="2" colspan="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"
@@ -169,14 +170,14 @@
</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">
+ <td width="145" colspan="5" 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">
+ <td width="59" colspan="4" 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>
@@ -184,23 +185,23 @@
</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>
+ style="font-size:9.0pt;font-family:"Arial",sans-serif">{{(item+(i*columnLength)) | formateNum}}</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">
+ <td width="85" colspan="2" :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">
+ <td width="60" colspan="3" 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">
+ <td width="59" colspan="4" 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>
@@ -208,7 +209,7 @@
<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">
+ <td width="74" colspan="2" 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"
@@ -218,11 +219,11 @@
</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">
+ <td width="60" colspan="3" 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">
+ <td width="59" colspan="4" 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>
@@ -230,7 +231,7 @@
<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">
+ <td width="43" colspan="2" 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}}
@@ -361,7 +362,7 @@
projectList: [],
deviceStr: null,
childrenData: [],
- columnLength: 12,
+ columnLength: 8,
}
},
filters:{
@@ -376,6 +377,12 @@
return null
}
return null
+ },
+ formateNum(val){
+ if(val!=null && val < 10){
+ return '0'+val
+ }
+ return val
}
},
methods:{
@@ -519,6 +526,9 @@
.pageTr{
page-break-inside: avoid;
}
+.page{
+ page-break-inside: avoid;
+}
div.WordSection1{
page : WordSection1;
}
--
Gitblit v1.9.3