From 04a0f81129eaa83e5adf167c4dcbb990e2eca01d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 30 Mar 2023 12:00:28 +0800
Subject: [PATCH] 144

---
 .../AppIntegratingTask/components/List.vue    | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingTask/components/List.vue b/project/fengdu/app/AppIntegratingTask/components/List.vue
index de85698c..6b14f285 100644
--- a/project/fengdu/app/AppIntegratingTask/components/List.vue
+++ b/project/fengdu/app/AppIntegratingTask/components/List.vue
@@ -11,10 +11,44 @@
       @change="search.current = 1, getList()">
     </ai-title>
     <template #content>
-      <ai-search-bar>
+      <ai-search-bar bottomBorder>
         <template #left>
+          <el-date-picker
+            v-model="search.beginDate"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始日期"
+            @change="search.current = 1, getList()">
+          </el-date-picker>
+          <el-date-picker
+            v-model="search.endDate"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结束日期"
+            @change="search.current = 1, getList()">
+          </el-date-picker>
+          <ai-select
+            v-model="search.status"
+            clearable
+            placeholder="活动状态"
+            :selectList="dict.getDict('fdIntegralTaskStatus')"
+            @change="search.current = 1, getList()">
+          </ai-select>
           <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')" >创建活动</el-button>
         </template>
+        <template #right>
+          <el-input
+            v-model="search.title"
+            size="small"
+            placeholder="活动名称/创建人"
+            clearable
+            v-throttle="() => {getList()}"
+            @clear="search.title = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
       </ai-search-bar>
       <ai-table
         :tableData="tableData"
@@ -61,7 +95,11 @@
           current: 1,
           size: 10,
           total: 0,
-          areaId: ''
+          title: '',
+          areaId: '',
+          status: '',
+          beginDate: '',
+          endDate: ''
         },
         tableData: [],
         img: '',
@@ -79,7 +117,8 @@
     computed: {
       colConfigs() {
         return [
-          { prop: "title", label: "活动名称", align: "left", showOverflowTooltip: true },
+          { prop: "title", label: "活动名称", align: "left" },
+          { prop: "areaName", label: "活动名称", align: "center" },
           { prop: "createUserName", label: "创建人", align: "center" },
           {
             prop: "intoBegintime",