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/rawMaterial/index.vue | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 063bb40..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: {
@@ -244,7 +256,10 @@
this.table.toolbar.push({
text: '涓嬭浇妫�楠屾姤鍛�',
type: 'primary',
- fun: this.downloadReport
+ loading: false,
+ disabled: false,
+ fun: this.downloadReport,
+
})
}
if(this.permissions.quality_rawMaterial_del){
@@ -284,11 +299,18 @@
selection.forEach(ele=>{
ids.push(ele.id)
})
- downloadReport({ids : ids}).then(res=>{
- transformZip(res)
- }).catch(error=>{
+ this.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').loading = true
+ this.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').disabled = true
+ try{
+ downloadReport({ids : ids}).then(res=>{
+ transformZip(res)
+ })
+ }catch(error){
console.log(error)
- })
+ } finally{
+ this.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').loading = false
+ this.table.toolbar.find((e) => e.text === '涓嬭浇妫�楠屾姤鍛�').disabled = false
+ }
}
},
//鏌ョ湅鎶ュ憡鎸夐挳
@@ -375,7 +397,9 @@
this.$router.push({
name: 'rawMaterialForm',
query: {
- id: row == null ? null : row.id,
+ id: row == null ? null : row.id
+ },
+ params: {
resultVal: row == null ? null : row.judgeState
}
})
@@ -389,7 +413,7 @@
}
},
formatJudgeState(row, column, cellValue){
- if(cellValue != undefined || cellValue != null){
+ if(cellValue != undefined && cellValue != null && cellValue != ''){
if(cellValue == 0){
return "<span style='color:#E84738;'>涓嶅悎鏍�</span>"
}
--
Gitblit v1.9.3