From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 15e6758..ceb9705 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -10,13 +10,13 @@
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
</a-form-item>
</a-col>
- <a-col :lg="3" :md="3" :sm="3" :xs="3">
+ <a-col :lg="2" :md="3" :sm="3" :xs="3">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
</a-col>
- <a-col :lg="3" :md="3" :sm="3" :xs="3">
+ <a-col :lg="2" :md="3" :sm="3" :xs="3">
<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
</a-col>
- <a-col :lg="3" :md="3" :sm="3" :xs="3">
+ <a-col :lg="2" :md="3" :sm="3" :xs="3">
<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
</a-col>
</a-row>
@@ -329,6 +329,8 @@
dateParamChange(v1, v2) {
this.queryParam.startTime = v2[0]
this.queryParam.endTime = v2[1]
+ // 鐐瑰嚮鏃堕棿閫夋嫨鍣ㄧ殑娓呯┖鎸夐挳鏃朵細瑙﹀彂姝ゅ垽鏂�(鐐瑰嚮閲嶇疆鎸夐挳涓嶄細瑙﹀彂)锛屽疄鐜伴噸缃垪琛ㄥ姛鑳斤紝鍒囧疄鏀瑰彉鍒楄〃鏄剧ず鏁堟灉
+ if(!this.queryParam.startTime&&!this.queryParam.endTime)this.searchReset()
},
efficiencyOptionsOnChange(checkedList) {
let index = checkedList.indexOf('lyl')
@@ -343,14 +345,21 @@
this.checkedList = checkedList
},
searchQuery() {
- if(this.queryParam.typeTree == "1"){
- this.queryParam.parentId = this.queryParamEquip.parentId
- this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+ if(this.dates != ''){
+ if(this.queryParam.typeTree == "1"){
+ this.queryParam.parentId = this.queryParamEquip.parentId
+ this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+ }else{
+ this.queryParam.parentId = this.queryParamPeople.parentId
+ this.queryParam.equipmentId = ""
+ }
+ this.loadData()
}else{
- this.queryParam.parentId = this.queryParamPeople.parentId
- this.queryParam.equipmentId = ""
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨鏃堕棿"
+ });
}
- this.loadData()
// this.onClearSelected()
},
searchReset() {
--
Gitblit v1.9.3