From b69442a151f8a0990cd17acb705f482609e6727d Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 13:11:16 +0800
Subject: [PATCH] modified: package.json modified: src/api/quality/finishedProduct.js modified: src/views/equipment/equipment/index.vue modified: src/views/equipment/metering/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/rawMaterial/rawMaterial-print.vue
---
src/views/quality/finishedProductInspection/index.vue | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index f2e55b3..288adcd 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="70%">
+ width="65%">
<div style="width:100%;height: 60vh;overflow-y: scroll;">
<printTemplate id="printRaw" :formData="printFormData"></printTemplate>
</div>
@@ -33,7 +33,7 @@
import ttable from '@/views/common/ztt-table.vue'
import * as fecha from 'element-ui/lib/utils/date'
import finishedProductInspectionAdd from './finishedProduct-form'
- import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
+ import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
import { transform } from '@/util/fileTransform'
import printTemplate from './finishedProduct-print.vue'
import PrintJS from 'print-js'
@@ -195,9 +195,27 @@
}
},
created() { },
+ watch:{
+ printFormData(newVal){
+ if(newVal){
+ this.printFormData = newVal
+ }
+ }
+ },
methods: {
- //鎵撳嵃鎸夐挳
- printFun() {
+ //鏌ョ湅鎶ュ憡鎸夐挳
+ // 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;
PrintJS({
printable: "printRaw",
@@ -209,8 +227,14 @@
orientation: 'portrait'
});
},
- showPrint(){
- this.printDialogVisible = true
+ 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("============");
--
Gitblit v1.9.3