From d485e884a63698aef54db9912a52ccb300ce9c08 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 15:48:52 +0800
Subject: [PATCH] 修改
---
src/views/quality/finishedProductInspection/index.vue | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 72df78d..ac81d80 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,
@@ -72,14 +73,22 @@
data: [],
// 鏍囬
column: [
- {
+ {
minWidth: '120',
- prop: 'orderNumber',
- label: '璁㈠崟鍙�',
+ prop: 'finInsNo',
+ label: '浜у搧妫�楠岀紪鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
render: { fun: this.addOrUpdateHandle }
+ },
+ {
+ minWidth: '120',
+ prop: 'orderNumber',
+ label: '鎶ュ伐鍗曞彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -98,6 +107,14 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
+ },
+ {
+ minWidth: '120',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -163,11 +180,11 @@
},
],
toolbar: [
- {
+ /* {
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- },
+ }, */
{
text: '瀵煎嚭',
type: 'primary',
@@ -211,21 +228,18 @@
}
},
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}',
+ scanStyles: false,
+ maxWidth: 1200,
+ header: "浜у搧妫�娴嬫姤鍛�",
+ style:style,
+ css:'./title.css',
targetStyles: ["*"],
- // importCSS: true,
- fontSize: '30px',
ignoreElements: ["no-ignore"],
orientation: 'portrait'
});
@@ -236,10 +250,8 @@
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(){
@@ -273,6 +285,8 @@
name: 'finishedProductForm',
query: {
id: row == null ? null : row.id,
+ },
+ params: {
resultVal: row == null ? null : row.result
}
})
--
Gitblit v1.9.3