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/index.vue |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 72df78d..9d582da 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -217,14 +217,21 @@
             },
             //鎵撳嵃鎸夐挳
             printFun() {
-            this.printDialogVisible = false;
+                const printSettings = {
+                        paper: {
+                        width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
+                        height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
+                        orientation: 'portrait', // 绔栧悜鎵撳嵃
+                        }}
+                        
                 PrintJS({
                     printable: "printRaw",
                     type: "html",
-                    maxWidth: 950,
-                    style: '@page {margin: 2.0mm 2.0mm}',
+                    header:"",
+                    maxWidth: 1000,
+                    printSettings,
+                    style: '@page {margin: 2.0mm 2.0mm;size:A4;}',
                     targetStyles: ["*"],
-                    // importCSS: true,
                     fontSize: '30px',
                     ignoreElements: ["no-ignore"],
                     orientation: 'portrait'
@@ -236,10 +243,8 @@
                     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);
                 })
             },
             exportExcel(){

--
Gitblit v1.9.3