From 7c4b02892b24bc2d219217b5f9e352d0eb531c4e Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期六, 18 十一月 2023 10:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/index.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index c354f84..22736a6 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -205,7 +205,7 @@
watch:{
printFormData(newVal){
if(newVal){
- console.log("pData鍙樺寲--",newVal);
+ // console.log("pData鍙樺寲--",newVal);
this.printFormData = newVal
}
}
@@ -217,11 +217,19 @@
},
//鎵撳嵃鎸夐挳
printFun() {
- this.printDialogVisible = false;
+ const printSettings = {
+ paper: {
+ width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
+ height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
+ orientation: 'portrait', // 绔栧悜鎵撳嵃
+ }}
+
PrintJS({
printable: "printRaw",
type: "html",
+ header:"",
maxWidth: 950,
+ printSettings,
style: '@page {margin: 2.0mm 2.0mm}',
targetStyles: ["*"],
// importCSS: true,
@@ -236,22 +244,20 @@
this.printFormData = res.data.data
this.printFormData.createTime = row.createTime
this.printFormData.updateTime = row.updateTime
- console.log(this.printFormData,"7777777777=====");
this.printDialogVisible = true
}).catch(error=>{
- console.log(error);
})
},
exportExcel(){
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