From 185c03ebd1dd8127df2aed18f575f39cd3e352ec Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 23 十一月 2023 14:30:50 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/index.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 99b0d0b..bdad739 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -94,12 +94,20 @@
column: [
{
minWidth: '120',
- prop: 'code',
- label: '鍘熸潗鏂欑紪鐮�',
+ prop: 'rawInsNo',
+ label: '鍘熸潗鏂欐楠岀紪鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
render: { fun: this.addOrUpdateHandle }
+ },
+ {
+ minWidth: '120',
+ prop: 'code',
+ label: '鍘熸潗鏂欑紪鐮�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -218,6 +226,7 @@
show: {
val: [
'1',
+ '0'
],
key: 'judgeState'
}
@@ -261,7 +270,6 @@
//鏌ョ湅鎶ュ憡鎸夐挳
previewFun(row){
getObj(row.id).then(res=>{
- console.log(res);
this.printFormData = res.data.data
this.printDialogVisible = true
}).catch(error=>{
@@ -274,9 +282,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'
--
Gitblit v1.9.3