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/rawMaterial/index.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 1234672..b5ba1b6 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -214,7 +214,14 @@
text: '鎵撳嵃',
type: 'text',
size: 'small',
- fun: this.previewFun
+ fun: this.previewFun,
+ show: {
+ val: [
+ '1',
+ '0'
+ ],
+ key: 'judgeState'
+ }
},
{
text: '浣滃簾',
@@ -267,9 +274,9 @@
PrintJS({
printable: "printRaw",
type: "html",
- maxWidth: 900,
+ maxWidth: 880,
// header: "鍘熸潗鏂欐娴嬫姤鍛�",
- style: '@page {margin: 0 5mm}',
+ style: '@page {margin: 10mm 5mm;}',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
@@ -324,6 +331,7 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ console.log(row);
this.$router.push({
name: 'rawMaterialForm',
query: {
--
Gitblit v1.9.3