From 437f00aa150d98af9d36f62350d3ded7fc21b325 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 15 Jul 2022 14:48:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=BE=A4=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groupSendDetail.vue                       | 64 +++++++++++++++----
 .../groupSendResident.vue                     |  8 +--
 2 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue b/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue
index 4a7c76c6..b434bc18 100644
--- a/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue
+++ b/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue
@@ -12,7 +12,7 @@
       <div class="header">
         <div class="header_left">
           <div>防疫宣传群发通知</div>
-          <div>创建时间: 2022-07-12 14:54</div>
+          <div>创建时间: <span>{{ createTime }}</span></div>
         </div>
         <div class="header_right" @click="toDetail">查看详情</div>
       </div>
@@ -29,7 +29,7 @@
               <div>无法送达居民群: <span>10</span></div>
             </div>
           </div>
-          <div class="btn">提醒成员发送</div>
+          <div class="btn" :disabled="flag" @click="remindSend">提醒成员发送</div>
         </div>
       </div>
 
@@ -38,8 +38,8 @@
           <div class="tab">
             <u-subsection :list="subsection" :current="subIndex"></u-subsection>
           </div>
-          <AiTable :data="tableData0" :colConfigs="colConfigs0" v-if="tabIndex == 0"/>
-          <AiTable :data="tableData1" :colConfigs="colConfigs1" v-if="tabIndex == 1"/>
+          <AiTable :data="tableData" :colConfigs="colConfigs0" v-if="tabIndex == 0"/>
+          <AiTable :data="tableData" :colConfigs="colConfigs1" v-if="tabIndex == 1"/>
         </div>
       </div>
     </div>
@@ -60,25 +60,35 @@ export default {
         {name: '无法送达'}
       ],
       subIndex: 0,
-      tableData0: [],
-      tableData1: [],
+      tableData: [],
+      createTime: '',
+      id: '',
+      info: {},
+      flag: false,
+      timer: null,
+      current: 1,
     }
   },
   computed: {
     colConfigs0() {
       return [
-        { label: '成员', prop: '', width: '240rpx', dict: 'householdRelation' },
-        { label: '预计未送达居民', prop: ''},
+        { label: '成员', prop: 'groupOwnerId', width: '240rpx', dict: 'householdRelation' },
+        { label: '预计未送达居民', prop: 'groupCount'},
       ]
     },
     colConfigs1() {
       return [
-        { label: '居民群', prop: '', width: '240rpx', dict: 'householdRelation' },
-        { label: '群人数', prop: '', width: '200rpx' },
-        { label: '群主', prop: '', dict: 'sex' },
+        { label: '居民群', prop: 'groupName', width: '240rpx', dict: 'householdRelation' },
+        { label: '群人数', prop: 'memberCount', width: '200rpx' },
+        { label: '群主', prop: 'groupOwnerId', dict: 'sex' },
       ]
     },
   },
+  onLoad(o) {
+    this.id = o.id
+    this.createTime = o.time
+    this.getStatistics()
+  },
   methods: {
     tabClick(index) {
       this.tabIndex = index
@@ -87,6 +97,38 @@ export default {
     toDetail() {
       uni.navigateTo({url: `./detail`})
     },
+    // 提醒发送
+    remindSend() {
+      if(this.flag) return
+      var n = 60 * 60 * 1000
+      setTimeout(()=> {
+
+      })
+      this.$http.post('/app/appmasssendingtask/remindSend',null,{
+        params: {
+          id: this.id
+        }
+      }).then(res => {
+        console.log(res);
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+
+    getStatistics() {
+      this.$http.post(`/app/appmasssendingtask/detailStatistics`, null, {
+        params: {
+          type: this.tabIndex,
+          sendStatus: this.subIndex,
+          taskId: this.id,
+          current: this.current
+        }
+      }).then(res => {
+        if(res?.data) {
+          this.tableData = res.data.executedList
+        }
+      })
+    },
 
     // 带百分比饼图
     getPieEcharts() {
diff --git a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
index 5fb71a47..7bf24646 100644
--- a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
+++ b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
@@ -9,14 +9,14 @@
       </div>
     </AiTopFixed>
     <div class="resident_list" v-if="list.length">
-      <div class="card" @click="toDetail" v-for="(item,index) in list" :key="index">
+      <div class="card" @click="toDetail(item)" v-for="(item,index) in list" :key="index">
         <div class="card_title">
           <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">{{ item.completionRate || 0 }}%</span></div>
+        <div>共需<span class="num">{{ item.groupOwnerCount }}</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
         <div>创建部门：<span>{{ item.createUserDept }}</span></div>
       </div>
     </div>
@@ -87,8 +87,8 @@ export default {
     }
   },
   methods: {
-    toDetail() {
-      uni.navigateTo({url: `./groupSendDetail`})
+    toDetail(item) {
+      uni.navigateTo({url: `./groupSendDetail?id=${item.id}&time=${item.createTime}`})
     },
     searchBtn() {
       this.current = 1