From 4fe3408a25c6de80018d1e413c6397bf420093f6 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 25 Apr 2024 22:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A41=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/LogList.vue | 27 ++++++++++++-------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/jshERP-web/src/views/system/LogList.vue b/jshERP-web/src/views/system/LogList.vue
index e14da5c2..3eb3e82d 100644
--- a/jshERP-web/src/views/system/LogList.vue
+++ b/jshERP-web/src/views/system/LogList.vue
@@ -20,7 +20,7 @@
                 <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-range-picker
                     style="width: 100%"
-                    v-model="defaultTimeStr"
+                    v-model="queryParam.createTimeRange"
                     format="YYYY-MM-DD"
                     :placeholder="['开始时间', '结束时间']"
                     @change="onDateChange"
@@ -93,7 +93,7 @@
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
-  import { getBeforeFormatDate } from '@/utils/util'
+  import { getFormatDate, getPrevMonthFormatDate } from '@/utils/util'
   import {getAction } from '@/api/manage'
   import moment from 'moment'
 
@@ -113,12 +113,10 @@
           clientIp:'',
           tenantLoginName:'',
           tenantType:'',
-          beginTime: getBeforeFormatDate(30),
-          endTime: moment().format('YYYY-MM-DD'),
+          beginTime: getPrevMonthFormatDate(1),
+          endTime: getFormatDate(),
+          createTimeRange: [moment(getPrevMonthFormatDate(1)), moment(getFormatDate())],
         },
-        dateFormat: 'YYYY-MM-DD',
-        currentDay: moment().format('YYYY-MM-DD'),
-        defaultTimeStr: '',
         tabKey: "1",
         isManage: false,
         // 表头
@@ -160,13 +158,14 @@
     },
     created() {
       this.initUserInfo()
-      this.defaultTimeStr = [moment(getBeforeFormatDate(30), this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     methods: {
       onDateChange: function (value, dateString) {
-        console.log(dateString[0],dateString[1]);
-        this.queryParam.beginTime=dateString[0];
-        this.queryParam.endTime=dateString[1];
+        this.queryParam.beginTime=dateString[0]
+        this.queryParam.endTime=dateString[1]
+        if(dateString[0] && dateString[1]) {
+          this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
+        }
       },
       onDateOk(value) {
         console.log(value);
@@ -179,10 +178,10 @@
           clientIp:'',
           tenantLoginName:'',
           tenantType:'',
-          beginTime: getBeforeFormatDate(30),
-          endTime: moment().format('YYYY-MM-DD')
+          beginTime: getPrevMonthFormatDate(1),
+          endTime: getFormatDate(),
+          createTimeRange: [moment(getPrevMonthFormatDate(1)), moment(getFormatDate())],
         }
-        this.defaultTimeStr = [moment(getBeforeFormatDate(30), this.dateFormat), moment(this.currentDay, this.dateFormat)]
         this.loadData(1);
       },
       initUserInfo() {