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 | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index b364506..11b510d 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -41,9 +41,9 @@
<el-radio-group v-model="checkList">
<el-radio label="杩斾慨">杩斾慨</el-radio>
<el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
- <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
- <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
- <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
+ <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
</el-radio-group>
</div>
<div v-if="type === '杩囩▼妫�楠�'">
@@ -52,12 +52,12 @@
<div style="padding: 20px;">
<el-radio label="杩斾慨">杩斾慨</el-radio>
<el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
- <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
- <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
+ <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
</div>
<div style="padding: 20px;">
- <el-radio label="杩斿伐">杩斿伐</el-radio>
- <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ <el-radio label="杩斿伐">杩斿伐</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
</div>
</el-row>
</el-radio-group>
@@ -73,7 +73,7 @@
</template>
<script>
-import {
+import {
UnqualifiedList,
pullInsUnapi,
AuditSuggestion,
@@ -138,6 +138,15 @@
return this.materialType
// render: { fun: this.addOrUpdateHandle }
}
+ },
+ // 妫�楠岀紪鍙�
+ {
+ minWidth: '140',
+ prop: 'inspectNo',
+ label: '妫�楠岀紪鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
},
// 浜у搧鍚嶇О
{
@@ -263,7 +272,7 @@
// return this.processModeOptions
// }
// },
-
+
],
toolbar: [
// {
@@ -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'}],
}
},
@@ -301,7 +310,11 @@
text: '鎻愪氦瀹℃牳',
type: 'text',
size: 'small',
- fun: this.Submitreview
+ fun: this.Submitreview,
+ show: {
+ key: 'state',
+ val: [0]
+ }
})
}
if(this.permissions.quality_processconfiguration_result){
@@ -309,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
@@ -369,7 +383,7 @@
this.$refs.processconfiguration.refreshData()
})
},
-
+
//鐘舵��
formatInsState(row, column, cellValue){
if(cellValue != undefined || cellValue != null){
@@ -380,7 +394,7 @@
return "<span style='color:#34BD66;'>宸叉彁浜ゅ鏍�</span>"
}
if(cellValue == 2){
- return "<span style='color:#34BD66;'>宸插鐞�</span>"
+ return "<span style='color:#34BD66;'>宸插畬鎴�</span>"
}
}
},
@@ -391,7 +405,7 @@
}
return "<span style='color:#34BD66;'></span>"
}
- },
+ },
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
// this.$refs.processconfiguration.getDataList()
--
Gitblit v1.9.3