From f47d5f26a54cf2e72cd741bca541ded5f6a4b743 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 20 十一月 2023 11:32:28 +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 | 43 ++++---------------------------------------
src/views/quality/finishedProductInspection/index.vue | 15 ++-------------
2 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index d0994b0..628ee2a 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,7 +1,7 @@
<template>
<div class="WordSection1" align=center style="word-wrap:break-word;text-justify-trim:punctuation">
<div align="center" >
- <table style="border-collapse:collapse;table-layout:fixed;page-break-after: always;" width="629">
+ <table style="border-collapse:collapse;table-layout:fixed;page-break-after: always;margin-top: 60px;" width="629">
<tr class="xl6524921" height=20 style='mso-height-source:userset;height:30.0pt'>
<td colspan=3 rowspan=2 style='width:160pt;height: 60pt;border: 1pt solid windowtext'>
<span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
@@ -625,7 +625,7 @@
if(list && list.length<2){
list.forEach(item=>{
if(item.children && item.children.length < rowNum){
- rowNum = 15 - item.children.length
+ rowNum = 20 - item.children.length
for(let j=0;j<item.children.length;j++){
let arr = []
if(item.children[j].inspectionValue){
@@ -690,8 +690,9 @@
}
</script>
-<style lang="scss">
+
+<style lang="scss" >
.xl6524921 {
padding: 0px;
mso-ignore: padding;
@@ -1941,41 +1942,5 @@
mso-pattern: auto;
white-space: nowrap;
}
-@font-face{
- font-family:寰蒋闆呴粦;
- panose-1:2 1 6 0 3 1 1 1 1 1;
-}
-@font-face{
- font-family:"Cambria Math";
- panose-1:2 4 5 3 5 4 6 3 2 4;
-}
-@font-face{
- font-family:Calibri;
- panose-1:2 15 5 2 2 2 4 3 2 4;
-}
-@font-face{
- font-family:"\@寰蒋闆呴粦";
- panose-1:2 1 6 0 3 1 1 1 1 1;
-}
-/* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal{
- margin:0cm;
- text-align:justify;
- text-justify:inter-ideograph;
- font-size:10.5pt;
- font-family:"Calibri",sans-serif;
-}
-/* Page Definitions */
-@page WordSection1{
- size:595.3pt 841.9pt;
- margin:72.0pt 2.0cm 2.0cm 2.0cm;
- layout-grid:15.6pt;
-}
-div.WordSection1{
- page : WordSection1;
-}
-.procedure {
- word-wrap:break-word;
-}
</style>
\ No newline at end of file
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 808f453..a7c0cc2 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -211,25 +211,14 @@
}
},
methods: {
- closedown(){
- // this.printFormData = []
- this.printDialogVisible = false;
- },
//鎵撳嵃鎸夐挳
printFun() {
- // const printSettings = {
- // paper: {
- // width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
- // height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
- // orientation: 'portrait', // 绔栧悜鎵撳嵃
- // }}
-
PrintJS({
printable: "printRaw",
type: "html",
maxWidth: 1000,
- // printSettings,
- style: '@page {margin: 10mm 5mm;size:A4;}',
+ // header: "浜у搧妫�娴嬫姤鍛�",
+ style: '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;}',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
--
Gitblit v1.9.3