|
@@ -23,11 +23,17 @@
|
|
|
v-model="condition"
|
|
|
@keyup.enter.native="$refs.aside.params.content.where.condition=condition;$refs.aside.params.content.pageNumber=1;$refs.aside.listData()"
|
|
|
@clear="$refs.aside.params.content.where.condition=condition;$refs.aside.params.content.pageNumber=1;$refs.aside.listData()" clearable></el-input>
|
|
|
- <el-button size="small" type="primary" @click="dateChange(1)">今天</el-button>
|
|
|
+<!-- <el-button size="small" type="primary" @click="dateChange(1)">今天</el-button>
|
|
|
<el-button size="small" type="primary" @click="dateChange(2)">最近三天</el-button>
|
|
|
- <el-button size="small" type="primary" class="inline-16" @click="dateChange(3)">最近一周</el-button>
|
|
|
+ <el-button size="small" type="primary" class="inline-16" @click="dateChange(3)">最近一周</el-button>-->
|
|
|
+ <el-button-group class="inline-24">
|
|
|
+ <el-button size="small" :type="number === 1?'primary':''" @click="dateChange(1)">今天</el-button>
|
|
|
+ <el-button size="small" :type="number === 2?'primary':''" @click="dateChange(2)">最近三天</el-button>
|
|
|
+ <el-button size="small" :type="number === 3?'primary':''" @click="dateChange(3)">最近一周</el-button>
|
|
|
+ </el-button-group>
|
|
|
<span style="line-height: 30px;vertical-align: center" class="search__label" >时间筛选:</span>
|
|
|
<el-date-picker
|
|
|
+ style="margin-right: 24px"
|
|
|
v-model="date"
|
|
|
@change="dateChange"
|
|
|
type="daterange"
|
|
@@ -37,6 +43,7 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
+ <el-button size="small" type="text" @click="onClear">清空</el-button>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
<div class="content-left">
|
|
@@ -64,7 +71,7 @@ export default {
|
|
|
currentItem:1,
|
|
|
condition:'',
|
|
|
date:'',
|
|
|
-
|
|
|
+ number:0
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -107,6 +114,7 @@ export default {
|
|
|
this.$refs.aside.params.content.where.begindate = ''
|
|
|
this.$refs.aside.params.content.where.enddate = ''
|
|
|
this.date = ''
|
|
|
+ this.number = 1
|
|
|
}else if (val === 2){
|
|
|
this.$refs.aside.params.content.where.lastthreedays = 1
|
|
|
this.$refs.aside.params.content.where.lastWeek = 0
|
|
@@ -114,6 +122,7 @@ export default {
|
|
|
this.$refs.aside.params.content.where.begindate = ''
|
|
|
this.$refs.aside.params.content.where.enddate = ''
|
|
|
this.date = ''
|
|
|
+ this.number = 2
|
|
|
}else if (val === 3){
|
|
|
this.$refs.aside.params.content.where.lastWeek = 1
|
|
|
this.$refs.aside.params.content.where.lastthreedays = 0
|
|
@@ -121,10 +130,12 @@ export default {
|
|
|
this.$refs.aside.params.content.where.begindate = ''
|
|
|
this.$refs.aside.params.content.where.enddate = ''
|
|
|
this.date = ''
|
|
|
+ this.number = 3
|
|
|
}else {
|
|
|
this.$refs.aside.params.content.where.lastWeek = 0
|
|
|
this.$refs.aside.params.content.where.lastthreedays = 0
|
|
|
this.$refs.aside.params.content.where.today = 0
|
|
|
+ this.number = 0
|
|
|
if (this.date !== '' && this.date !== undefined && this.date!== null){
|
|
|
this.$refs.aside.params.content.where.begindate = this.date[0]
|
|
|
this.$refs.aside.params.content.where.enddate = this.date[1]
|
|
@@ -134,10 +145,21 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ this.$refs.aside.params.content.pageNumber=1
|
|
|
+ this.$refs.aside.listData()
|
|
|
+ },
|
|
|
+ /*清空时间筛选*/
|
|
|
+ onClear(){
|
|
|
+ this.$refs.aside.params.content.where.lastWeek = 0
|
|
|
+ this.$refs.aside.params.content.where.lastthreedays = 0
|
|
|
+ this.$refs.aside.params.content.where.today = 0
|
|
|
+ this.number = 0
|
|
|
+ this.date = ''
|
|
|
+ this.$refs.aside.params.content.where.begindate = ''
|
|
|
+ this.$refs.aside.params.content.where.enddate = ''
|
|
|
this.$refs.aside.params.content.pageNumber=1
|
|
|
this.$refs.aside.listData()
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
mounted () {
|
|
|
this.$nextTick(() => {
|