From 4652431ce329b4dec6c4dcc0758d5c4ff97e0666 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 11 十一月 2023 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/index.vue | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 3206e04..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: {
@@ -210,17 +210,7 @@
}
},
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;
@@ -234,7 +224,9 @@
orientation: 'portrait'
});
},
+ //鏌ョ湅鎶ュ憡鎸夐挳
showPrint(row){
+ console.log('----------');
queryById(row.id).then(res=>{
this.printFormData = res.data.data
this.printDialogVisible = true
--
Gitblit v1.9.3