lilei 5 mesi fa
parent
commit
f98b97e2f5
1 ha cambiato i file con 10 aggiunte e 9 eliminazioni
  1. 10 9
      src/views/dowloadFile/list.vue

+ 10 - 9
src/views/dowloadFile/list.vue

@@ -69,18 +69,19 @@ export default {
   mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
-    const startDate = moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD')
+    const startDate = getDate.getRecentday().starttime
+    const endDate = getDate.getRecentday().endtime
     return {
       spinning: false,
       tableHeight: 0,
       // 默认时间
       time: [
         startDate,
-        moment(getDate.getRecentTime().endtime).format('YYYY-MM-DD')
+        endDate
       ],
       queryParam: { //  查询条件
         beginDate: startDate, // 开始时间
-        endDate: moment(getDate.getRecentTime().endtime).format('YYYY-MM-DD'), // 结束时间
+        endDate: endDate, // 结束时间
         fileName: '', // 文件名称
         taskState: undefined // 状态
       },
@@ -122,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).subtract('days', 1) || current > moment().endOf('day'))
     },
     // 下载文件
     dowloadExcel (url) {
@@ -130,8 +131,8 @@ export default {
     },
     //  时间  change
     dateChange (date, dateString) {
-      this.queryParam.beginDate = dateString[0] ? moment(dateString[0]).format('YYYY-MM-DD') : ''
-      this.queryParam.endDate = dateString[1] ? moment(dateString[1]).format('YYYY-MM-DD') : ''
+      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 () {
@@ -139,9 +140,9 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.time = [moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD'), moment(getDate.getRecentTime().endtime).format('YYYY-MM-DD')]
-      this.queryParam.beginDate = moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD')
-      this.queryParam.endDate = moment(getDate.getRecentTime().endtime).format('YYYY-MM-DD')
+      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