From d49f39681a68fd819ac687d67b6352ba386d0d13 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 12:12:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/quality/processconfiguration/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 74e8b89..11b510d 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -290,7 +290,7 @@
}
},
materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}],
- StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'}],
+ StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插畬鎴�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
},
@@ -322,7 +322,8 @@
text: '瀹℃牳缁撴灉',
type: 'text',
size: 'small',
- fun: this.AuditResult
+ fun: this.AuditResult,
+ showFun: (row)=>{return row.type != '鍘熸潗鏂欐楠�'}
})
}
this.table.operator = arr.length>0 ? arr : null
@@ -393,7 +394,7 @@
return "<span style='color:#34BD66;'>宸叉彁浜ゅ鏍�</span>"
}
if(cellValue == 2){
- return "<span style='color:#34BD66;'>宸插鐞�</span>"
+ return "<span style='color:#34BD66;'>宸插畬鎴�</span>"
}
}
},
--
Gitblit v1.9.3