From 7ffc7991a25e19c913b382a2245bd97a40511718 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 24 十一月 2023 13:44:29 +0800
Subject: [PATCH] 货盘运输修改

---
 src/views/quality/rawMaterial/index.vue |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 6133ce1..bdad739 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -94,12 +94,20 @@
                 column: [
                     {
                         minWidth: '120',
-                        prop: 'code',
-                        label: '鍘熸潗鏂欑紪鐮�',
+                        prop: 'rawInsNo',
+                        label: '鍘熸潗鏂欐楠岀紪鍙�',
                         isTrue: true,
                         isSearch: true,
                         searchInfoType: 'text',
                         render: { fun: this.addOrUpdateHandle }
+                    },
+                    {
+                        minWidth: '120',
+                        prop: 'code',
+                        label: '鍘熸潗鏂欑紪鐮�',
+                        isTrue: true,
+                        isSearch: true,
+                        searchInfoType: 'text'
                     },
                     {
                         minWidth: '120',
@@ -214,7 +222,14 @@
                     text: '鎵撳嵃',
                     type: 'text',
                     size: 'small',
-                    fun: this.previewFun
+                    fun: this.previewFun,
+                    show: {
+                        val: [
+                            '1',
+                            '0'
+                        ],
+                        key: 'judgeState'
+                    }
                 },
                 {
                     text: '浣滃簾',
@@ -255,7 +270,6 @@
         //鏌ョ湅鎶ュ憡鎸夐挳
         previewFun(row){
             getObj(row.id).then(res=>{
-                console.log(res);
                 this.printFormData = res.data.data
                 this.printDialogVisible = true
             }).catch(error=>{
@@ -268,9 +282,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'

--
Gitblit v1.9.3