From 945e8607b6cc9ebc814ba2244c6d3ea3d839d9dd Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 12 Dec 2022 09:32:15 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/manage/components/CheckinExport.vue | 19 +++++++++--
 .../js/pages/manage/components/TaskExport.vue | 32 +++++++++++++++++++
 resources/assets/sass/pages/page-setting.scss | 14 --------
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/CheckinExport.vue b/resources/assets/js/pages/manage/components/CheckinExport.vue
index 3b6e3154d..8c6aa5cd0 100644
--- a/resources/assets/js/pages/manage/components/CheckinExport.vue
+++ b/resources/assets/js/pages/manage/components/CheckinExport.vue
@@ -15,7 +15,7 @@
                     format="yyyy/MM/dd"
                     style="width:100%"
                     :placeholder="$L('请选择签到日期')"/>
-                <div class="form-tip page-setting-checkin-export-common">
+                <div class="form-tip checkin-export-quick-select">
                     {{$L('快捷选择')}}:
                     <em @click="formData.date=dateShortcuts('prev')">{{$L('上个月')}}</em>
                     <em @click="formData.date=dateShortcuts('this')">{{$L('这个月')}}</em>
@@ -28,7 +28,7 @@
                     format="HH:mm"
                     style="width:100%"
                     :placeholder="$L('请选择班次时间')"/>
-                <div class="form-tip page-setting-checkin-export-common">
+                <div class="form-tip checkin-export-quick-select">
                     {{$L('快捷选择')}}:
                     <em @click="formData.time=['8:30', '18:00']">8:30-18:00</em>
                     <em @click="formData.time=['9:00', '18:00']">9:00-18:00</em>
@@ -43,6 +43,21 @@
     </Modal>
 </template>
 
+<style lang="scss">
+.checkin-export-quick-select {
+    display: flex;
+    align-items: center;
+    > em {
+        cursor: pointer;
+        color: #2b85e4;
+        margin-left: 8px;
+        font-style: normal;
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+}
+</style>
 <script>
 import UserInput from "../../../components/UserInput";
 export default {
diff --git a/resources/assets/js/pages/manage/components/TaskExport.vue b/resources/assets/js/pages/manage/components/TaskExport.vue
index dbef29999..f60530bfa 100644
--- a/resources/assets/js/pages/manage/components/TaskExport.vue
+++ b/resources/assets/js/pages/manage/components/TaskExport.vue
@@ -6,6 +6,7 @@
         <Form ref="exportTask" :model="formData" label-width="auto" @submit.native.prevent>
             <FormItem :label="$L('导出成员')">
                 <UserInput v-model="formData.userid" :multiple-max="20" :placeholder="$L('请选择成员')"/>
+                <div class="form-tip">{{$L('每次最多选择导出20个成员')}}</div>
             </FormItem>
             <FormItem :label="$L('时间范围')">
                 <DatePicker
@@ -14,6 +15,11 @@
                     format="yyyy/MM/dd"
                     style="width:100%"
                     :placeholder="$L('请选择时间')"/>
+                <div class="form-tip checkin-export-quick-select">
+                    {{$L('快捷选择')}}:
+                    <em @click="formData.time=dateShortcuts('prev')">{{$L('上个月')}}</em>
+                    <em @click="formData.time=dateShortcuts('this')">{{$L('这个月')}}</em>
+                </div>
             </FormItem>
             <FormItem prop="type" :label="$L('导出时间类型')">
                 <RadioGroup v-model="formData.type">
@@ -29,6 +35,21 @@
     </Modal>
 </template>
 
+<style lang="scss">
+.checkin-export-quick-select {
+    display: flex;
+    align-items: center;
+    > em {
+        cursor: pointer;
+        color: #2b85e4;
+        margin-left: 8px;
+        font-style: normal;
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+}
+</style>
 <script>
 import UserInput from "../../../components/UserInput";
 export default {
@@ -62,6 +83,17 @@ export default {
     },
 
     methods: {
+        dateShortcuts(act) {
+            const lastSecond = (e) => {
+                return $A.Date($A.formatDate("Y-m-d 23:59:29", Math.round(e / 1000)))
+            };
+            if (act === 'prev') {
+                return [$A.getData('上个月', true), lastSecond($A.getData('上个月结束', true))];
+            } else if (act === 'this') {
+                return [$A.getData('本月', true), lastSecond($A.getData('本月结束', true))]
+            }
+        },
+
         onExport() {
             if (this.loadIng > 0) {
                 return;
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 45aaa8d95..dd87289c8 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -307,20 +307,6 @@
     }
 }
 
-.page-setting-checkin-export-common {
-    display: flex;
-    align-items: center;
-    > em {
-        cursor: pointer;
-        color: #2b85e4;
-        margin-left: 8px;
-        font-style: normal;
-        &:hover {
-            text-decoration: underline;
-        }
-    }
-}
-
 @media (max-width: 768px) {
     .page-setting {
         .setting-head {