From aae7cc89326db4c5c1b7cb2deea0ed0e7fde6906 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 16 十一月 2023 09:25:07 +0800
Subject: [PATCH] 	modified:   src/views/plan/customerorder/schedule-table.vue

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

diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 7465498..def20b0 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -16,7 +16,7 @@
             top="10vh"
             title="鎵撳嵃棰勮"
             :visible.sync="printDialogVisible"
-            width="65%">
+            width="70%">
             <div style="width:100%;height: 60vh;overflow-y: scroll;">
                 <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
             </div>
@@ -35,7 +35,7 @@
 	import finishedProductInspectionAdd from './finishedProduct-form'
     import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
     import { transform } from '@/util/fileTransform'
-    import printTemplate from './finishedProduct-print.vue'
+    import printTemplate from './finishedProducter-print.vue'
     import PrintJS from 'print-js'
 	export default {
 		components: {
@@ -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,7 +202,15 @@
 			}
 		},
 		created() { },
+        watch:{
+        printFormData(newVal){
+            if(newVal){
+                this.printFormData = newVal
+            }
+        }
+    },
 		methods: {
+            
             //鎵撳嵃鎸夐挳
             printFun() {
             this.printDialogVisible = false;
@@ -209,16 +224,17 @@
                     orientation: 'portrait'
                 });
             },
+            //鏌ョ湅鎶ュ憡鎸夐挳
             showPrint(row){
+                console.log('----------');
                 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