From d267d7082d3a708e4b2b9f569250a3a588cb54ca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 30 一月 2024 16:54:58 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processconfiguration/index.vue | 11 ++++++++++-
src/views/product/producttraceability/index.vue | 2 +-
src/views/quality/rawMaterial/index.vue | 12 ++++++++++++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/views/product/producttraceability/index.vue b/src/views/product/producttraceability/index.vue
index a86a177..06710eb 100644
--- a/src/views/product/producttraceability/index.vue
+++ b/src/views/product/producttraceability/index.vue
@@ -94,7 +94,7 @@
</div>
</el-col>
</el-row>
- </el-col>changePart
+ </el-col>
<el-col
:span="10"
:offset="1"
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 4338b63..74e8b89 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'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
},
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index b16d9e5..cad0189 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -105,6 +105,17 @@
},
{
minWidth: '120',
+ prop: 'type',
+ label: '妫�楠岀被鍨�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'select',
+ optList: () => {
+ return this.typeList
+ }
+ },
+ {
+ minWidth: '120',
prop: 'code',
label: '鍘熸潗鏂欑紪鐮�',
isTrue: true,
@@ -225,6 +236,7 @@
},
insStateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉娴�',value:'1'},{label:'鏈娴�',value:'0'}],
StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸插悎鏍�',value:'1'},{label:'涓嶅悎鏍�',value:'0'}],
+ typeList: [{label:'鍏ㄩ儴',value:''},{label:'棣栨',value:'棣栨'},{label:'杩旀',value:'杩旀'}],
}
},
components: {
--
Gitblit v1.9.3