From 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 21 五月 2024 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/index.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index c5af6e0..1152cfb 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -238,6 +238,14 @@
return this.StateList
}
},
+ {
+ minWidth: '120',
+ prop: 'remark',
+ label: '澶囨敞',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
],
toolbar: [],
operator: null,
@@ -277,17 +285,19 @@
})
}
- this.table.operator = [{
- text: '瀹℃牳',
- type: 'text',
- size: 'small',
- fun: this.examineHandle,
- showFun: (row)=>{return row.type==='棣栨'},
- show: {
- key: 'checkState',
- val: ['0']
- }
- }]
+ if(this.permissions.quality_rawMaterial_check){
+ this.table.operator = [{
+ text: '瀹℃牳',
+ type: 'text',
+ size: 'small',
+ fun: this.examineHandle,
+ showFun: (row)=>{return row.type==='棣栨'&& row.insState==='1'},
+ show: {
+ key: 'checkState',
+ val: ['0','2']
+ }
+ }]
+ }
if(this.permissions.quality_rawMaterial_del){
this.table.operator.push({
text: '浣滃簾',
@@ -383,7 +393,7 @@
type: "html",
// header: "鍘熸潗鏂欐娴嬫姤鍛�",
targetStyles: ["*"],
- style: `@page {margin: 0mm 5mm;size: A4;}
+ style: `@page {margin: 0mm 5mm;size: A4 landscape;}
html {zoom:100%;}
@media print {
html,body{
--
Gitblit v1.9.3