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 | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index def20b0..22736a6 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -21,7 +21,7 @@
<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>
@@ -205,45 +205,59 @@
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}',
+ header:"",
+ maxWidth: 950,
+ printSettings,
+ style: '@page {margin: 2.0mm 2.0mm}',
targetStyles: ["*"],
+ // importCSS: true,
+ fontSize: '30px',
ignoreElements: ["no-ignore"],
orientation: 'portrait'
});
},
//鏌ョ湅鎶ュ憡鎸夐挳
showPrint(row){
- console.log('----------');
queryById(row.id).then(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(){
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