From e5486974dcbbfc0549c41eca4f87c7730f0aa981 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 17:56:09 +0800
Subject: [PATCH] 	modified:   src/views/quality/finishedProductInspection/finishedProduct-form.vue 	modified:   src/views/quality/finishedProductInspection/index.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue

---
 src/views/quality/finishedProductInspection/index.vue |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 8a5c22b..3206e04 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -182,6 +182,7 @@
                         show: {
                             val: [
                                 '1',
+                                '0'
                             ],
                             key: 'result'
                         }
@@ -201,7 +202,25 @@
 			}
 		},
 		created() { },
+        watch:{
+        printFormData(newVal){
+            if(newVal){
+                this.printFormData = newVal
+            }
+        }
+    },
 		methods: {
+            //鏌ョ湅鎶ュ憡鎸夐挳
+            // 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;
@@ -217,14 +236,13 @@
             },
             showPrint(row){
                 queryById(row.id).then(res=>{
-                    console.log(res);
+                    this.printFormData = res.data.data
                     this.printDialogVisible = true
                 }).catch(error=>{
                     console.log(error);
                 })
             },
             exportExcel(){
-                console.log("============");
                 let queryParam=this.$refs.finishedProduct.getQueryParam();
                 delete queryParam.criteria
                 console.log(queryParam);

--
Gitblit v1.9.3