From b5c47d12de3c21c4bf0c2508492754630e16dce2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 23 二月 2024 15:29:51 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processconfiguration/index.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index d6d25d3..79b88e5 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -139,6 +139,15 @@
// render: { fun: this.addOrUpdateHandle }
}
},
+ // 妫�楠岀紪鍙�
+ {
+ minWidth: '140',
+ prop: 'inspectNo',
+ label: '妫�楠岀紪鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
// 浜у搧鍚嶇О
{
minWidth: '140',
@@ -281,7 +290,7 @@
}
},
materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}],
- StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插鐞�',value:'2'}],
+ StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插畬鎴�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
},
@@ -304,7 +313,7 @@
fun: this.Submitreview,
show: {
key: 'state',
- val: ['0']
+ val: [0]
}
})
}
@@ -384,7 +393,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