From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

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

diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 8900d6a..d4a61d0 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">
@@ -23,32 +36,8 @@
         </template>
       </el-tab-pane>
       <el-tab-pane :value="headData.noticeDealNum" label="宸插鐞�" name="1">
-        <template #label>
-          <span
-            >宸插鐞�
-            <el-badge
-              v-if="headData.noticeDealNum"
-              :value="headData.noticeDealNum"
-              class="item"
-              type="danger"
-            >
-            </el-badge>
-          </span>
-        </template>
       </el-tab-pane>
       <el-tab-pane :value="headData.noticeCreateNum" label="鎴戝彂璧风殑" name="2">
-        <template #label>
-          <span
-            >鎴戝彂璧风殑
-            <el-badge
-              v-if="headData.noticeCreateNum"
-              :value="headData.noticeCreateNum"
-              class="item"
-              type="danger"
-            >
-            </el-badge>
-          </span>
-        </template>
       </el-tab-pane>
       <el-tab-pane :value="headData.noticeCopyNum" label="鎶勯�佹垜鐨�" name="3">
         <template #label>
@@ -112,11 +101,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,8 +118,9 @@
 import OperaCarUseBookWindow from '@/components/business/OperaCarUseBookWindow'
 import OperaHiddenDangerWindow from '@/components/business/OperaHiddenDangerWindow'
 import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
+import dayjs from 'dayjs'
 import {
-  taskCenterHead,
+  taskCenterHeadPC,
   taskCenterPage
 } from '@/api'
 export default {
@@ -150,7 +140,8 @@
       isShowReport: false,
       isShowDanger: false,
       filters: {
-        queryType: '0'
+        queryType: '0',
+        fastdate: 0
       },
       queryFormConfig: {
         formItems: [
@@ -158,7 +149,6 @@
             filed: 'type',
             type: 'select',
             label: '浠诲姟绫诲瀷',
-            clearable: false,
             options: [
               { label: '璁垮鐢宠', value: '0' },
               { label: '璁垮鎶ュ', value: '1' },
@@ -168,8 +158,14 @@
             ]
           },
           {
-            filed: 'selDate',
-            type: 'daterange',
+            filed: 'selTime',
+            type: 'datetimerange',
+            label: '璧锋鏃堕棿',
+            pickerOptions: {}
+          },
+          {
+            type: 'slot',
+            filed: 'fastdate',
             label: ''
           }
         ],
@@ -194,9 +190,16 @@
     }
   },
   created () {
+    // this.getHeadData()
+    this.changeRadio('0')
     this.getList()
   },
   methods: {
+    changeRadio (day) {
+      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
+      this.$set(this.filters, 'selTime', arr)
+      this.getList()
+    },
     handleDetail (row) {
       if (row.objType === 2) {
         this.$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)
@@ -227,13 +230,19 @@
         })
       }
     },
+    changeForm (str) {
+      if (str === 'selTime') {
+        this.$set(this.filters, 'fastdate', null)
+        this.getList()
+      }
+    },
     getList (page) {
       this.getHeadData()
       console.log(this.filters)
       const { filters, pagination } = this
-      if (filters.selDate && filters.selDate.length > 0) {
-        filters.startDate = filters.selDate[0]
-        filters.endDate = filters.selDate[1]
+      if (filters.selTime && filters.selTime.length > 0) {
+        filters.startDate = filters.selTime[0]
+        filters.endDate = filters.selTime[1]
       } else {
         filters.startDate = null
         filters.endDate = null
@@ -251,15 +260,22 @@
       })
     },
     getHeadData () {
-      taskCenterHead({
-        isDetail: '1'
-      }).then(res => {
+      const {filters} = this
+      if (filters.selTime && filters.selTime.length > 0) {
+        filters.startDate = filters.selTime[0]
+        filters.endDate = filters.selTime[1]
+      } else {
+        filters.startDate = null
+        filters.endDate = null
+      }
+      taskCenterHeadPC({ ...filters, queryType: Number(filters.queryType), isDetail: '1' }).then(res => {
         this.headData = res
       })
     },
     clear () {
       this.filters = {
-        queryType: '0'
+        queryType: '0',
+        fastdate: 0
       }
       this.getList(0)
     },

--
Gitblit v1.9.3