群发范围调整

src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue

@@ -20,7 +20,13 @@
             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 class="num">
+              <span v-if="tabIndex==0">{{ item.groupOwnerCount || 0 }}</span>
+              <span v-else>{{ item.receiveExecutorCount || 0 }} </span>
+            </span>名成员完成群发，目前已完成
+            <span class="num">{{ item.completionRate }}%</span>
+          </div>
           <div>
             创建部门：
             <span v-if="item.createUserDeptName">{{ item.createUserDeptName }}</span>

src/project/huizhili/AppCooperationPropaganda/detail.vue

@@ -45,8 +45,13 @@
     <div class="info">
       <div class="scope">
         <span>群发范围</span>
-        <span v-if="data.sendScope==0">全部{{ data.receiveGroupCount || 0}}个居民群</span>
-        <span v-if="data.sendScope==1 || data.sendScope==2">按条件筛选的{{ data.receiveGroupCount || 0}}个居民群</span>
+        <div>
+          <span v-if="data.sendScope==0">全部</span><span v-if="data.sendScope==1 || data.sendScope==2">按条件筛选的</span>
+          <span v-if="type=='ResidentsGroup'">{{ data.receiveGroupCount || 0}}</span>
+          <span v-if="type=='Residents'">{{ resSum || 0}}</span>
+          <span v-if="type=='CircleOfFriends'">{{ cirSum || 0}}</span>
+          <span v-if="type=='ResidentsGroup'">个居民群</span><span v-if="type=='Residents'">个居民</span><span v-if="type=='CircleOfFriends'">个朋友圈</span>
+        </div>
       </div>
       <div class="content">
         <p>群发内容</p>
@@ -108,6 +113,8 @@ export default {
       options: '',
       approver: [],  //审批人
       type: '',
+      resSum: 0,
+      cirSum: 0,
     } 
   },
   onLoad(o) {
@@ -135,6 +142,8 @@ export default {
           this.webpage = res.data.contents.filter(v=> v.msgType == 4)
           this.miniapp = res.data.contents.filter(v=> v.msgType == 5)
           this.approver = res.data.examines
+          this.resSum = res.data.groupList.reduce((pre, cur) => pre + cur.customerCount, 0)
+          this.cirSum = res.data.executorList.reduce((pre, cur) => pre + cur.customerCount, 0)
           // if(res.data.status==1) {  // 拒绝
           //   this.approver = res.data.examines.filter(e=> e.examineStatus == 2)
           // } else {  // 通过
@@ -253,11 +262,11 @@ export default {
     .scope {
       display: flex;
       margin-bottom: 16px;
-      span:first-child {
+      & > span {
         width: 160px;
         color: #999;
       }
-      span:last-child {
+      & > div {
         width: calc(100% - 160px);
       }
     }

src/project/huizhili/AppCooperationPropaganda/sendScoped.vue

@@ -60,7 +60,8 @@ export default {
       this.$loading()
       if(this.sendType == 'ResidentsGroup') {
         this.getWxGroups()
-      } else if(this.sendType == 'Residents' || this.sendType == 'CircleOfFriends') {
+      }
+      if(this.sendType == 'Residents' || this.sendType == 'CircleOfFriends') {
         this.getSendScope()
       }
       uni.setStorageSync('sendScope', this.sendScope)