|
@@ -9,10 +9,9 @@
|
|
|
<a-form-item label="创建时间">
|
|
|
<a-range-picker
|
|
|
id="dowloadFIle-beginDate"
|
|
|
- showTime
|
|
|
:disabled-date="disabledDate"
|
|
|
v-model="time"
|
|
|
- format="YYYY-MM-DD HH:mm:ss"
|
|
|
+ format="YYYY-MM-DD"
|
|
|
@change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -70,18 +69,19 @@ export default {
|
|
|
mixins: [commonMixin],
|
|
|
components: { STable, VSelect },
|
|
|
data () {
|
|
|
- const startDate = moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD HH:mm:ss')
|
|
|
+ const startDate = getDate.getRecentday().starttime
|
|
|
+ const endDate = getDate.getRecentday().endtime
|
|
|
return {
|
|
|
spinning: false,
|
|
|
tableHeight: 0,
|
|
|
// 默认时间
|
|
|
time: [
|
|
|
startDate,
|
|
|
- getDate.getRecentTime().endtime
|
|
|
+ endDate
|
|
|
],
|
|
|
queryParam: { // 查询条件
|
|
|
beginDate: startDate, // 开始时间
|
|
|
- endDate: getDate.getRecentTime().endtime, // 结束时间
|
|
|
+ endDate: endDate, // 结束时间
|
|
|
fileName: '', // 文件名称
|
|
|
taskState: undefined // 状态
|
|
|
},
|
|
@@ -123,7 +123,7 @@ export default {
|
|
|
methods: {
|
|
|
// 禁用时间
|
|
|
disabledDate (current) {
|
|
|
- return current && (current < moment(getDate.getRecentTime().starttime).subtract('days', 2) || current > moment().endOf('day'))
|
|
|
+ return current && (current < moment(getDate.getRecentday().starttime) || current > moment().endOf('day'))
|
|
|
},
|
|
|
// 下载文件
|
|
|
dowloadExcel (url) {
|
|
@@ -131,8 +131,8 @@ export default {
|
|
|
},
|
|
|
// 时间 change
|
|
|
dateChange (date, dateString) {
|
|
|
- this.queryParam.beginDate = dateString[0] ? moment(dateString[0]).format('YYYY-MM-DD HH:mm:ss') : ''
|
|
|
- this.queryParam.endDate = dateString[1] ? moment(dateString[1]).format('YYYY-MM-DD HH:mm:ss') : ''
|
|
|
+ this.queryParam.beginDate = dateString[0] ? moment(dateString[0]).format('YYYY-MM-DD 00:00:00') : ''
|
|
|
+ this.queryParam.endDate = dateString[1] ? moment(dateString[1]).format('YYYY-MM-DD 23:59:59') : ''
|
|
|
},
|
|
|
// 查询
|
|
|
searchForm () {
|
|
@@ -140,9 +140,9 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.time = [moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD HH:mm:ss'), getDate.getRecentTime().endtime]
|
|
|
- this.queryParam.beginDate = moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD HH:mm:ss')
|
|
|
- this.queryParam.endDate = getDate.getRecentTime().endtime
|
|
|
+ this.time = [getDate.getRecentday().starttime, getDate.getRecentday().endtime]
|
|
|
+ this.queryParam.beginDate = getDate.getRecentday().starttime
|
|
|
+ this.queryParam.endDate = getDate.getRecentday().endtime
|
|
|
this.queryParam.fileName = ''
|
|
|
this.queryParam.type = undefined
|
|
|
this.queryParam.taskState = undefined
|