From d8531973c376e44b27567dd9b35200a6d42e4c61 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 29 十一月 2023 10:44:48 +0800
Subject: [PATCH] 	modified:   src/views/quality/package/index.vue 	modified:   src/views/warehouse/pallettransports/index.vue

---
 src/views/quality/finishedProductInspection/index.vue |   36 +++++++++++++++++-------------------
 1 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 22736a6..fe633e3 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -37,6 +37,7 @@
     import { transform } from '@/util/fileTransform'
     import printTemplate from './finishedProducter-print.vue'
     import PrintJS from 'print-js'
+import { title } from 'process'
 	export default {
 		components: {
 			finishedProductInspectionAdd,
@@ -72,14 +73,22 @@
                     data: [],
                     // 鏍囬
                     column: [
+                         {
+                            minWidth: '120',
+                            prop: 'finInsNo',
+                            label: '浜у搧妫�楠岀紪鍙�',
+                            isTrue: true,
+                            isSearch: true,
+                            searchInfoType: 'text',
+                            render: { fun: this.addOrUpdateHandle }
+                        },
                         {
                             minWidth: '120',
                             prop: 'orderNumber',
                             label: '璁㈠崟鍙�',
                             isTrue: true,
                             isSearch: true,
-                            searchInfoType: 'text',
-                            render: { fun: this.addOrUpdateHandle }
+                            searchInfoType: 'text'
                         },
                         {
                             minWidth: '120',
@@ -211,29 +220,18 @@
         }
     },
 		methods: {
-            closedown(){
-                // this.printFormData = []
-                this.printDialogVisible = false;
-            },
             //鎵撳嵃鎸夐挳
             printFun() {
-                const printSettings = {
-                        paper: {
-                        width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
-                        height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
-                        orientation: 'portrait', // 绔栧悜鎵撳嵃
-                        }}
-                        
+                const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 榛戜綋;!important;}' ;
                 PrintJS({
                     printable: "printRaw",
                     type: "html",
-                    header:"",
-                    maxWidth: 950,
-                    printSettings,
-                    style: '@page {margin: 2.0mm 2.0mm}',
+                    scanStyles: false,
+                    maxWidth: 1200,
+                    header: "浜у搧妫�娴嬫姤鍛�",
+                    style:style,
+                    css:'./title.css',
                     targetStyles: ["*"],
-                    // importCSS: true,
-                    fontSize: '30px',
                     ignoreElements: ["no-ignore"],
                     orientation: 'portrait'
                 });

--
Gitblit v1.9.3