From 5cf1a230144fc023b07c1aeccd8795b9741f7328 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 16:11:04 +0800
Subject: [PATCH] 	modified:   src/views/equipment/equipment/index.vue 	modified:   src/views/quality/finishedProductInspection/index.vue 	modified:   src/views/quality/rawMaterial/index.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue 	modified:   vue.config.js

---
 src/views/quality/finishedProductInspection/index.vue |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index fb3c9ca..b1ee15b 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -178,7 +178,14 @@
                         text: '鎵撳嵃',
                         type: 'text',
                         size: 'small',
-                        fun: this.showPrint
+                        fun: this.showPrint,
+                        show: {
+                            val: [
+                                '1',
+                                '0'
+                            ],
+                            key: 'result'
+                        }
                     },{
                         text: '浣滃簾',
                         type: 'text',
@@ -195,11 +202,25 @@
 			}
 		},
 		created() { },
+        watch:{
+        printFormData(newVal){
+            if(newVal){
+                this.printFormData = newVal
+            }
+        }
+    },
 		methods: {
             //鏌ョ湅鎶ュ憡鎸夐挳
-            showPrint(){
-                
-            },
+            // showPrint(row){
+            //     queryById(row.id).then(res=>{
+            //     console.log(res);
+            //     this.printFormData = res.data.data
+            //     this.printDialogVisible = true
+            // })
+            // .catch(error=>{
+            //     console.log(error);
+            // })
+            // },
             //鎵撳嵃鎸夐挳
             printFun() {
             this.printDialogVisible = false;
@@ -216,6 +237,7 @@
             showPrint(row){
                 queryById(row.id).then(res=>{
                     console.log(res);
+                this.printFormData = res.data.data
                     this.printDialogVisible = true
                 }).catch(error=>{
                     console.log(error);

--
Gitblit v1.9.3