From 711f1644225a5ff10afa24dec8cafb1eb5343e6a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 22 十一月 2023 10:13:14 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/index.vue | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index c354f84..85b7514 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -37,6 +37,7 @@
import { transform } from '@/util/fileTransform'
import printTemplate from './finishedProducter-print.vue'
import PrintJS from 'print-js'
+import { title } from 'process'
export default {
components: {
finishedProductInspectionAdd,
@@ -205,27 +206,23 @@
watch:{
printFormData(newVal){
if(newVal){
- console.log("pData鍙樺寲--",newVal);
+ // console.log("pData鍙樺寲--",newVal);
this.printFormData = newVal
}
}
},
methods: {
- closedown(){
- // this.printFormData = []
- this.printDialogVisible = false;
- },
//鎵撳嵃鎸夐挳
printFun() {
- this.printDialogVisible = false;
+ const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 榛戜綋;!important;}' ;
PrintJS({
printable: "printRaw",
type: "html",
- maxWidth: 950,
- style: '@page {margin: 2.0mm 2.0mm}',
+ maxWidth: 1000,
+ // header: "浜у搧妫�娴嬫姤鍛�",
+ style:style,
+ // scanStyles: false,
targetStyles: ["*"],
- // importCSS: true,
- fontSize: '30px',
ignoreElements: ["no-ignore"],
orientation: 'portrait'
});
@@ -236,22 +233,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