From e1e5ccdfef4aefc70f2df86a97cb50ae4e3d2706 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 20 十一月 2023 09:47:43 +0800
Subject: [PATCH] modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: vue.config.js
---
src/views/quality/finishedProductInspection/index.vue | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 8a5c22b..808f453 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -16,12 +16,12 @@
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>
<span slot="footer" class="dialog-footer">
- <el-button @click="()=>{printDialogVisible = false;this.printFormData=null}">鍙� 娑�</el-button>
+ <el-button @click="()=>{printDialogVisible = false;printFormData=null}">鍙� 娑�</el-button>
<el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
</span>
</el-dialog>
@@ -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: {
@@ -182,6 +182,7 @@
show: {
val: [
'1',
+ '0'
],
key: 'result'
}
@@ -201,39 +202,59 @@
}
},
created() { },
+ watch:{
+ printFormData(newVal){
+ if(newVal){
+ // console.log("pData鍙樺寲--",newVal);
+ this.printFormData = newVal
+ }
+ }
+ },
methods: {
+ closedown(){
+ // this.printFormData = []
+ this.printDialogVisible = false;
+ },
//鎵撳嵃鎸夐挳
printFun() {
- this.printDialogVisible = false;
+ // const printSettings = {
+ // paper: {
+ // width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
+ // height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
+ // orientation: 'portrait', // 绔栧悜鎵撳嵃
+ // }}
+
PrintJS({
printable: "printRaw",
type: "html",
- maxWidth: 700,
- style: '@page {margin: 0 5mm}',
+ maxWidth: 1000,
+ // printSettings,
+ style: '@page {margin: 10mm 5mm;size:A4;}',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
});
},
+ //鏌ョ湅鎶ュ憡鎸夐挳
showPrint(row){
queryById(row.id).then(res=>{
- console.log(res);
+ this.printFormData = res.data.data
+ this.printFormData.createTime = row.createTime
+ this.printFormData.updateTime = row.updateTime
this.printDialogVisible = true
}).catch(error=>{
- console.log(error);
})
},
exportExcel(){
- console.log("============");
let queryParam=this.$refs.finishedProduct.getQueryParam();
delete queryParam.criteria
- console.log(queryParam);
+ // console.log(queryParam);
exportExaminationProducts(queryParam).then((res)=>{
transform(res)
})
},
deleteHandle(row){
- console.log(row.id)
+ // console.log(row.id)
this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
--
Gitblit v1.9.3