From a97aa64a397fcee3985b7c2af4b63074ff447bca Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 2 Mar 2023 14:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89loadind?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropagandaBeta.vue          | 147 +++++++++++-------
 .../addPropaganda.vue                         |   8 +-
 .../AppCooperationPropaganda/scopedSelect.vue |   2 -
 3 files changed, 96 insertions(+), 61 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
index 6a8a6232..52b1281c 100644
--- a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
@@ -12,19 +12,21 @@
       </div>
     </AiTopFixed>
     <div class="resident_list" v-if="list.length">
-      <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.choiceTime }}</span></div>
-        <div>共需<span class="num">{{ item.groupOwnerCount || 0 }}</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
-        <div>
-          创建部门：
-          <span v-if="item.createUserDeptName">{{ item.createUserDeptName }}</span>
-          <!-- <span v-if="item.createUserSecondDept"><AiOpenData type="departmentName" :openid="item.createUserSecondDept" style="display: inline-block" /></span> -->
+      <div class="card" v-for="(item,index) in list" :key="index">
+        <div class="card_top" @click="toDetail(item)">
+          <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.choiceTime }}</span></div>
+          <div>共需<span class="num">{{ item.groupOwnerCount || 0 }}</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
+          <div>
+            创建部门：
+            <span v-if="item.createUserDeptName">{{ item.createUserDeptName }}</span>
+          </div>
         </div>
+        <div class="card_bottom" v-if="item.status == 4 && item.createUserId == user.wxUserId" @click="stopBtn(item.id)">关闭任务</div>
       </div>
     </div>
     <AiEmpty description="暂无数据" v-if="!list.length"/>
@@ -93,6 +95,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: 'AppCooperationPropagandaBeta',
   appName: '协同宣发',
@@ -131,6 +134,9 @@ export default {
       sendType: 'ResidentsGroup',
     }
   },
+  computed: {
+    ...mapState(['user'])
+  },
   methods: {
     tabClick(item,index) {
       this.list = []
@@ -229,6 +235,28 @@ export default {
     },
     toAdd() {
       uni.navigateTo({url: `./addPropaganda?type=${this.sendType}`})
+    },
+    stopBtn(id) {
+      this.$confirm('确定停止该任务吗？').then(() => {
+        let url = ''
+        if(this.tabIndex==0) {
+          url = `/app/appmasssendingtask/closeTask`
+        } else {
+          url = `/app/whchatmomentstask/closeTask`
+        }
+        this.$http.post(url,null,{
+          params: {
+            id: id
+          }
+        }).then(res=> {
+          if(res?.code==0) {
+            this.$u.toast('已关闭该任务')
+            setTimeout(()=>{
+              this.getList()
+            }, 400)
+          }
+        })
+      })
     }
   },
   onShow() {
@@ -313,55 +341,66 @@ export default {
     .card {
       background: #FFF;
       border-radius: 16px;
-      padding: 30px;
       margin-bottom: 24px;
-      & > div {
-        padding: 10px 0;
-      }
-      .num {
-        color: #3AA0FF;
-      }
-      .card_title {
-        display: flex;
-        justify-content: space-between;
-        .card_left {
-          font-size: 32px;
-          color: #000000;
-          font-weight: 600;
+      .card_top {
+        padding: 30px;
+        box-sizing: border-box;
+        & > div {
+          padding: 10px 0;
         }
-        .card_right {
-          span {
-            display: inline-block;
-            width: 16px;
-            height: 16px;
-            // background: #3399FF;
-            border-radius: 50%;
-            margin-right: 10px;
+        .num {
+          color: #3AA0FF;
+        }
+        .card_title {
+          display: flex;
+          justify-content: space-between;
+          .card_left {
+            font-size: 32px;
+            color: #000000;
+            font-weight: 600;
           }
+          .card_right {
+            span {
+              display: inline-block;
+              width: 16px;
+              height: 16px;
+              // background: #3399FF;
+              border-radius: 50%;
+              margin-right: 10px;
+            }
 
-          .status0 {
-            background: #FFA938;
-          }
-          .status1 {
-            background: #FF6758;
-          }
-          .status2 {
-            background: #3399FF;
-          }
-          .status3 {
-            background: #FF6758;
-          }
-          .status4 {
-            background: #3399FF;
-          }
-          .status5 {
-            background: #1CCEB0;
-          }
-          .status6 {
-            background: #666666;
+            .status0 {
+              background: #FFA938;
+            }
+            .status1 {
+              background: #FF6758;
+            }
+            .status2 {
+              background: #3399FF;
+            }
+            .status3 {
+              background: #FF6758;
+            }
+            .status4 {
+              background: #3399FF;
+            }
+            .status5 {
+              background: #1CCEB0;
+            }
+            .status6 {
+              background: #666666;
+            }
           }
         }
       }
+      .card_bottom {
+        text-align: center;
+        height: 80px;
+        line-height: 80px;
+        color: #1365DD;
+        font-weight: 600;
+        border-top: 1px solid #d4d4d4;
+      }
     }
   }
 
diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
index 02a9e4fa..49ce715b 100644
--- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
@@ -10,8 +10,8 @@
       <div @click="toSleectScoped">
         <span>
           <span v-if="type=='ResidentsGroup'">
-            <span class="color_gray" v-if="!form.wxGroups.length">请选择</span>
-            <span v-else>预计送达{{ form.wxGroups.length }}个居民群</span>
+            <span class="color_gray" v-if="sum==0">请选择</span>
+            <span v-else>预计送达{{ sum }}个居民群</span>
           </span>
           <span v-if="type!='ResidentsGroup'">
             <span class="color_gray" v-if="sum==0">请选择</span>
@@ -529,7 +529,6 @@ export default {
     },
 
     getDeptUser() {
-      uni.showLoading({title: '加载中'})
       this.selectEnterpriseContact({
         fromDepartmentId: 0,
         mode: "multi",
@@ -543,7 +542,6 @@ export default {
               examineUserId: e.id
             }
           })
-          uni.hideLoading()
         }
       }).catch((err) => {
         this.$u.toast(err)
@@ -585,7 +583,7 @@ export default {
       this.forms.executorList = this.form.wxGroups
       this.sum = this.form.wxGroups.reduce((pre, cur) => pre + cur.customerCount, 0)
     } else if(this.type == 'ResidentsGroup') {
-      
+      this.sum = this.form.wxGroups.reduce((pre, cur) => pre + cur.groupCount, 0)
     }
     this.forms.taskTitle = this.form.taskTitle
     const girdArr = uni.getStorageSync('girdSelect')
diff --git a/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue b/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
index 0d47763e..c5d81783 100644
--- a/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
@@ -92,7 +92,6 @@ export default {
     },
 
     getDeptUser() {
-      uni.showLoading({title: '加载中'})
       this.selectEnterpriseContact({
         fromDepartmentId: 0, // 从最上层开始
         mode: "multi",  // 多选
@@ -102,7 +101,6 @@ export default {
         if(res?.departmentList) {
           this.deptListArr = res.departmentList
         }
-        uni.hideLoading()
       }).catch((err) => {
         this.$u.toast(err)
       })