From b9f1bee17be016363031acee63dc41a1d2070a08 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 15 Jul 2022 13:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppPropagandaStatistics.vue               | 37 +++++-----
 .../groupSendResident.vue                     | 74 ++++++++++++++-----
 2 files changed, 77 insertions(+), 34 deletions(-)

diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
index bdd9df2a..9ab6cc7d 100644
--- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
+++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -247,6 +247,8 @@ export default {
       departId: "",
       startTime: "",
       endTime: "",
+      start: "",
+      end: "",
       showStart: false,
       showEnd: false,
       resX: [],
@@ -281,7 +283,8 @@ export default {
     checkTime(index) {
       if (index == 3) {
         this.timeSelect = index;
-        this.customShow = true;
+        this.customShow = true;  
+        
         this.showStart = false;
         this.showEnd = false;
       } else {
@@ -300,18 +303,18 @@ export default {
       this.departId = "";
     },
 
-    // selectConfirm() {
-    //   if (this.timeSelect == 3) {
-    //     this.timeType = this.timeSelect;
-    //     this.startTime = this.start;
-    //     this.endTime = this.end;
-    //     this.getBrokenDate();
-    //   } else {
-    //     this.timeType = this.timeSelect;
-    //     this.getBrokenDate();
-    //   }
-    //   this.filterShow = false;
-    // },
+    selectConfirm() {
+      if (this.timeSelect == 3) {
+        this.timeType = this.timeSelect;
+        this.start = this.startTime;
+        this.end = this.endTime;
+        this.getBrokenDate();
+      } else {
+        this.timeType = this.timeSelect;
+        this.getBrokenDate();
+      }
+      this.filterShow = false;
+    },
 
     confirmStart(val) {
       this.startTime = val.year + '-' + val.month + '-' + val.day
@@ -321,8 +324,8 @@ export default {
     },
 
     handleTime() {
-      this.startTime = this.start;
-      this.endTime = this.end;
+      this.start = this.startTime
+      this.end = this.endTime
       this.customShow = false;
     },
 
@@ -352,8 +355,8 @@ export default {
         .post(`/app/appmasssendingtask/statisticsEffect`, null, {
           params: {
             type: this.timeSelect,
-            startTime: this.startTime,
-            endTime: this.endTime,
+            startTime: this.start,
+            endTime: this.end,
             // departId: this.departId
           },
         })
diff --git a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
index 01629e5d..5fb71a47 100644
--- a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
+++ b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
@@ -3,22 +3,24 @@
     <AiTopFixed>
       <div class="search">
         <div class="searchBox">
-          <u-search placeholder="请输入任务名称" v-model="name" :show-action="false"></u-search>
+          <u-search placeholder="请输入任务名称" v-model="taskTitle" @search="searchBtn" @clear="taskTitle='',current=1, list=[],getList()" :show-action="false"></u-search>
         </div>
         <div class="filterBtn" @click="filterShow = true"><img src="./images/shaixuan.png" alt="">筛选</div>
       </div>
     </AiTopFixed>
-    <div class="resident_list">
+    <div class="resident_list" v-if="list.length">
       <div class="card" @click="toDetail" v-for="(item,index) in list" :key="index">
         <div class="card_title">
-          <div class="card_left">{{ item.content }}</div>
-          <div class="card_right"><span></span>进行中</div>
+          <div class="card_left">{{ item.taskTitle }}</div>
+          <div class="card_right"><span :class="item.status==0? 'status0': item.status==1? 'status1': item.status==2? 'status2':
+           item.status == 3? 'status3':item.status==4? 'status4': 'status5'"></span>{{ $dict.getLabel('mstStatus', item.status) }}</div>
         </div>
         <div>创建时间：<span>{{ item.createTime }}</span></div>
-        <div>共需<span class="num">56</span>名成员完成群发，目前已完成<span class="num">65%</span></div>
+        <div>共需<span class="num">56</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
         <div>创建部门：<span>{{ item.createUserDept }}</span></div>
       </div>
     </div>
+    <AiEmpty description="暂无数据" v-if="!list.length"/>
     <u-popup v-model="filterShow" mode="bottom" border-radius="14">
       <div class="popup">
         <div class="tips"></div>
@@ -35,14 +37,7 @@
         <scroll-view class="select-content" scroll-y="true">
           <div class="type-list">
             <div class="type-title">创建人</div>
-            <!-- <div
-              class="item"
-              v-for="(item, index) in timeList"
-              :key="index"
-              :class="index == timeSelect ? 'active' : ''"
-              @click.stop="checkTime(index)">
-              {{ item }}
-            </div> -->
+            <AiPagePicker class="select" type="sysUser" :selected.sync="createUserId">选择人员</AiPagePicker>
           </div>
           <div class="type-list">
             <div class="type-title">群发时间</div>
@@ -83,18 +78,31 @@ export default {
       filterShow: false,
       startTime: '',
       endTime: '',
+      start: "",
+      end: "",
       showStart: false,
       showEnd: false,
+      taskTitle: '',
+      createUserId: [],
     }
   },
   methods: {
     toDetail() {
       uni.navigateTo({url: `./groupSendDetail`})
     },
+    searchBtn() {
+      this.current = 1
+      this.list = [],
+      this.getList()
+    },
     getList() {
       this.$http.post(`/app/appmasssendingtask/list`, null, {
         params: {
           current: this.current,
+          taskTitle: this.taskTitle,
+          createUserId: this.createUserId,
+          startTime: this.start,
+          endTime: this.end,
         }
       }).then(res=> {
         if(res?.data) {
@@ -103,12 +111,18 @@ export default {
         console.log(res);
       })
     },
+    
     filterBtn() {},
     reset() {
       this.startTime = '',
       this.endTime = ''
     },
-    selectConfirm() {},
+    selectConfirm() {
+      this.start = this.startTime,
+      this.end = this.endTime
+      this.filterShow = false
+      this.getList()
+    },
     confirmStart(val) {
       this.startTime = val.year + '-' + val.month + '-' + val.day
     },
@@ -118,8 +132,10 @@ export default {
   },
   onShow() {
     document.title = '群发居民群'
-    this.current = 1
-    this.getList()
+    this.$dict.load('mstStatus').then(() => {
+      this.getList()
+    })
+    
   },
   onReachBottom() {
     this.current ++
@@ -173,10 +189,32 @@ export default {
             display: inline-block;
             width: 16px;
             height: 16px;
-            background: #3399FF;
+            // background: #3399FF;
             border-radius: 50%;
             margin-right: 10px;
           }
+
+          .status0 {
+            background: #3399FF;
+          }
+          .status1 {
+            background: #FFA938;
+          }
+          .status2 {
+            background: #3399FF;
+          }
+          .status3 {
+            background: #1CCEB0;
+          }
+          .status4 {
+            background: #FF6758;
+          }
+          .status5 {
+            background: #FF6758;
+          }
+          .status6 {
+            background: #999999;
+          }
         }
       }
     }
@@ -270,5 +308,7 @@ export default {
     }
   }
 
+
+
 }
 </style>
\ No newline at end of file