From 2aae6733da1982cf560bf5bbf8c8a102ca3feee3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 十二月 2023 17:16:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/index.vue | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 602aa4b..696ffb0 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -37,7 +37,7 @@
import { transform } from '@/util/fileTransform'
import printTemplate from './finishedProducter-print.vue'
import PrintJS from 'print-js'
-import { title } from 'process'
+ import { title } from 'process'
export default {
components: {
finishedProductInspectionAdd,
@@ -85,7 +85,7 @@
{
minWidth: '120',
prop: 'orderNumber',
- label: '璁㈠崟鍙�',
+ label: '鎶ュ伐鍗曞彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
@@ -107,6 +107,14 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
+ },
+ {
+ minWidth: '120',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -172,11 +180,11 @@
},
],
toolbar: [
- {
+ /* {
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- },
+ }, */
{
text: '瀵煎嚭',
type: 'primary',
@@ -226,10 +234,11 @@
PrintJS({
printable: "printRaw",
type: "html",
- // scanStyles: false,
- maxWidth: 1000,
- // header: "浜у搧妫�娴嬫姤鍛�",
+ scanStyles: false,
+ maxWidth: 1200,
+ header: "浜у搧妫�娴嬫姤鍛�",
style:style,
+ css:'./title.css',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
--
Gitblit v1.9.3