From 6bae45dfd31d647e4abc4e0246f495a29cc6896f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 11:20:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/task/index.vue |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 8900d6a..8ff5809 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -5,7 +5,20 @@
       :query-form-config="queryFormConfig"
       @handleQuery="getList(1)"
       @clear="clear"
-    />
+      @changeForm='changeForm'
+    >
+      <template #fastdate>
+        <el-radio-group
+          v-model="filters.fastdate"
+          size="small"
+          @input="changeRadio"
+        >
+          <el-radio-button label="0">褰撳ぉ</el-radio-button>
+          <el-radio-button label="6">杩�7澶�</el-radio-button>
+          <el-radio-button label="29">杩�30澶�</el-radio-button>
+        </el-radio-group>
+      </template>
+    </QueryForm>
     <!--  -->
     <el-tabs v-model="filters.queryType" @tab-click="(e) => getList(1)">
       <el-tab-pane label="寰呭鐞�" name="0">
@@ -112,11 +125,11 @@
     <VisReportDetail v-if="isShowReport" ref="VisReportDetailRef" />
     <DangetDetail v-if="isShowDanger" ref="DangetDetailRef" />
     <!-- 鐢ㄨ溅鐢宠 -->
-    <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="getList"/>
+    <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="getList" />
     <!-- 闅愭偅 -->
-    <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="getList"/>
+    <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="getList" />
     <!-- 棰勭害璇︽儏 -->
-     <OperaVisitsDesWindow ref="OperaVisitsDesWindow" />
+    <OperaVisitsDesWindow ref="OperaVisitsDesWindow" />
   </div>
 </template>
 
@@ -129,6 +142,7 @@
 import OperaCarUseBookWindow from '@/components/business/OperaCarUseBookWindow'
 import OperaHiddenDangerWindow from '@/components/business/OperaHiddenDangerWindow'
 import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
+import dayjs from 'dayjs'
 import {
   taskCenterHead,
   taskCenterPage
@@ -150,7 +164,8 @@
       isShowReport: false,
       isShowDanger: false,
       filters: {
-        queryType: '0'
+        queryType: '0',
+        fastdate: 0
       },
       queryFormConfig: {
         formItems: [
@@ -170,6 +185,11 @@
           {
             filed: 'selDate',
             type: 'daterange',
+            label: '璧峰鏃ユ湡'
+          },
+          {
+            type: 'slot',
+            filed: 'fastdate',
             label: ''
           }
         ],
@@ -194,9 +214,16 @@
     }
   },
   created () {
+    // this.getHeadData()
+    this.changeRadio('0')
     this.getList()
   },
   methods: {
+    changeRadio (day) {
+      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
+      this.$set(this.filters, 'selDate', arr)
+      this.getList()
+    },
     handleDetail (row) {
       if (row.objType === 2) {
         this.$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)
@@ -225,6 +252,12 @@
           this.$refs.DetailRef.getDetail()
           this.$refs.DetailRef.isShowModal = true
         })
+      }
+    },
+    changeForm (str) {
+      if (str === 'selDate') {
+        this.$set(this.filters, 'fastdate', null)
+        this.getList()
       }
     },
     getList (page) {
@@ -259,7 +292,8 @@
     },
     clear () {
       this.filters = {
-        queryType: '0'
+        queryType: '0',
+        fastdate: 0
       }
       this.getList(0)
     },

--
Gitblit v1.9.3