From 3fbd3713082275f5af20797e11db0ece0ab83350 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 18 十一月 2023 11:31:38 +0800
Subject: [PATCH] 	modified:   src/views/quality/rawMaterial/index.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-print.vue 	modified:   vue.config.js

---
 src/views/quality/rawMaterial/index.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 6133ce1..b5ba1b6 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -214,7 +214,14 @@
                     text: '鎵撳嵃',
                     type: 'text',
                     size: 'small',
-                    fun: this.previewFun
+                    fun: this.previewFun,
+                    show: {
+                        val: [
+                            '1',
+                            '0'
+                        ],
+                        key: 'judgeState'
+                    }
                 },
                 {
                     text: '浣滃簾',
@@ -255,7 +262,6 @@
         //鏌ョ湅鎶ュ憡鎸夐挳
         previewFun(row){
             getObj(row.id).then(res=>{
-                console.log(res);
                 this.printFormData = res.data.data
                 this.printDialogVisible = true
             }).catch(error=>{
@@ -268,9 +274,9 @@
             PrintJS({
                 printable: "printRaw",
                 type: "html",
-                maxWidth: 900,
+                maxWidth: 880,
                 // header: "鍘熸潗鏂欐娴嬫姤鍛�",
-                style: '@page {margin: 0 5mm}',
+                style: '@page {margin: 10mm 5mm;}',
                 targetStyles: ["*"],
                 ignoreElements: ["no-ignore"],
                 orientation: 'portrait'
@@ -325,6 +331,7 @@
         },
         // 鏂板 / 淇敼
         addOrUpdateHandle(row) {
+            console.log(row);
             this.$router.push({
                 name: 'rawMaterialForm',
                 query: { 

--
Gitblit v1.9.3