From cada87c8360e6f65f76cab2557ceb38c69b1df23 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 9 Sep 2022 14:16:22 +0800
Subject: [PATCH 1/6] BUG 31017

---
 src/apps/AppBuilding/list.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppBuilding/list.vue b/src/apps/AppBuilding/list.vue
index 6e4df7e4..c2b4bc8e 100644
--- a/src/apps/AppBuilding/list.vue
+++ b/src/apps/AppBuilding/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="list">
+  <div class="buildingList">
     <AiTopFixed>
       <u-search placeholder="小区名称" :show-action="false" v-model="title" @search="current=1,getList()"/>
     </AiTopFixed>
@@ -27,7 +27,7 @@
 import {mapState} from 'vuex'
 
 export default {
-
+  name: "buildingList",
   data() {
     return {
       title: '',
@@ -97,8 +97,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.list {
+.buildingList {
   padding-bottom: 20px;
+
   .list-content {
     padding: 32px 32px 0;
     background-color: #F5F5F5;

From 598a6561922ba3639bbd27428902785fed476d11 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 9 Sep 2022 14:19:19 +0800
Subject: [PATCH 2/6] BUG 31018

---
 src/apps/AppBroadcast/AppPlayList/AppPlayList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppBroadcast/AppPlayList/AppPlayList.vue b/src/apps/AppBroadcast/AppPlayList/AppPlayList.vue
index 41bcdfb9..6db7768b 100644
--- a/src/apps/AppBroadcast/AppPlayList/AppPlayList.vue
+++ b/src/apps/AppBroadcast/AppPlayList/AppPlayList.vue
@@ -8,7 +8,7 @@
         <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
       </div>
     </AiTopFixed>
-    <div class="list">
+    <div class="playList">
       <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" >
         <div class="left">
           <p>{{ item.sourceName }}</p>
@@ -129,7 +129,7 @@ export default {
       }
     }
   }
-  .list{
+  .playList{
     padding-left: 32px;
     background-color: #fff;
     .item{

From 7945028589c90f9926b67cb3e71c2573302361be Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 9 Sep 2022 16:55:42 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropaganda.vue              |  10 ++
 .../addPropaganda.vue                         |  71 +++++++++++-
 .../AppCooperationPropaganda/scopedSelect.vue |  67 ++++++++----
 .../AppCooperationPropaganda/sendScoped.vue   | 103 ++++++++++++++----
 .../AppCooperationPropaganda/tagsList.vue     |  97 +++++++----------
 5 files changed, 246 insertions(+), 102 deletions(-)

diff --git a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
index 46306e20..3c4acd59 100644
--- a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
+++ b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -135,6 +135,16 @@ export default {
     tabClick(item,index) {
       this.tabIndex = index;
       this.sendType = item.value
+      uni.clearStorageSync('userSelect')
+      uni.clearStorageSync('wxGroupsUser')
+      uni.clearStorageSync('girdSelect')
+      uni.clearStorageSync('deptList')
+      uni.clearStorageSync('sendScope')
+      uni.clearStorageSync('ResidentTags')
+      uni.clearStorageSync('ResidentTagsRemove')
+      uni.clearStorageSync('circleTags')
+      uni.clearStorageSync('circleTagsRemove')
+      this.getList()
     },
     toDetail(item) {
       uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
diff --git a/src/apps/AppCooperationPropaganda/addPropaganda.vue b/src/apps/AppCooperationPropaganda/addPropaganda.vue
index f9b41d9b..ca2e4f16 100644
--- a/src/apps/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/apps/AppCooperationPropaganda/addPropaganda.vue
@@ -10,7 +10,7 @@
       <div @click="toSleectScoped">
         <span>
           <span class="color_gray" v-if="!form.sendScope">请选择</span>
-          <span v-if="form.sendScope">预计送达{{ form.wxGroups.length }}名成员</span>
+          <span v-if="form.sendScope">预计送达{{ form.wxGroups.length || forms.executorList }}名成员</span>
           <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
         </span>
       </div>
@@ -139,13 +139,57 @@ export default {
       type: '',
       form: {
         taskTitle: '',
-        wxGroups: [], // 发送范围
         contents: [], // 发送内容
         enableExamine: '0', // 是否需要审批  0否 1是
         examines: [], // 审批人
         choiceTime: '', // 定时发送时间
         sendScope: '', // 0：全部居民群、1：按部门选择、2：按网格选择
         sendType: '0', // 0：立即发送、1：定时发送
+        wxGroups: [  // 发送范围
+          {
+            corpId: "ww596787bb70f08288",
+            errorCode: null,
+            errorMsg: null,
+            groupCount: 1,
+            groupIds: "wrytYEDgAAA5MGVJ3Ttb6ycbmxJ2Zv-Q",
+            groupNames: "111",
+            groupOwnerId: "d41d8cd98f00b204e9800998ecf8427e",
+            groupOwnerName: "张硕",
+            id: null,
+            msgId: null,
+            sendStatus: null,
+            sendTime: null,
+            taskId: null,
+          },
+          {
+            corpId: "ww596787bb70f08288",
+            errorCode: null,
+            errorMsg: null,
+            groupCount: 4,
+            groupIds: "wrytYEDgAA-Llt9H1jr40WT1_RfOstWQ,wrytYEDgAADava7QSJGicwZg09nG_GXg,wrytYEDgAAKG6qd39fHWFkrTiT9vsSQQ,wrytYEDgAAPxVpqyzf4kwzwvtdE0nqbQ",
+            groupNames: "慧政务需求沟通,临汾市政法委企微项目沟通,淄博企微项目沟通群,未命名群聊",
+            groupOwnerId: "XieJin",
+            groupOwnerName: "谢晋",
+            id: null,
+            msgId: null,
+            sendStatus: null,
+            sendTime: null,
+            taskId: null,
+          }
+        ],  // 送达居民群
+      },
+      forms: {
+        taskTitle: '',
+        taskType: '',
+        executorList: [], // 任务执行人集合(群发朋友圈的执行人)
+        groupList: [],  // 添加人集合
+        contentList: [], // 发送内容
+        enableExamine: '0', // 是否需要审批  0否 1是
+        examineList: [], // 审批人
+        choiceTime: '', // 定时发送时间
+        sendScope: '', // 0：全部居民群、1：按部门选择、2：按网格选择
+        sendType: '0', // 0：立即发送、1：定时发送
+        gender: '', // 性别：0-女、1-男、2-全部
         wxGroups: [
           {
             corpId: "ww596787bb70f08288",
@@ -334,8 +378,12 @@ export default {
       this.form.choiceTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second
     },
 
+
     confirm() {
+      
       if(this.flag) return
+
+      if(this.type=='ResidentsGroup') {
       // 文本
       const firstContent = [
         { 
@@ -409,8 +457,19 @@ export default {
       }).catch((err)=>{
         this.flag = false
         this.$u.toast(err)
-      }) 
+      })
+      } else {
+        this.$http.post(`/app/whchatmomentstask/addOrUpdate`, { ...this.form }).then(res=>{
+        if(res?.code ==0) {
+          this.flag = false
+          this.$u.toast("新增成功")
 
+        }
+      }).catch((err)=>{
+        this.flag = false
+        this.$u.toast(err)
+      })
+      }
     },
 
     getDeptUser() {
@@ -432,6 +491,12 @@ export default {
   onLoad(o) {
     this.type = o.type;
     document.title = this.type=='ResidentsGroup'? "群发居民群": this.type=='Residents'? "群发居民": "群发朋友圈"
+    if(this.type=='Residents') {
+      this.forms.taskType = 1
+    } else if(this.type=='CircleOfFriends') {
+      this.forms.taskType = 0
+    }
+    this.forms.taskTitle = this.form.taskTitle
   },
   onShow() {
     this.form.wxGroups = uni.getStorageSync('wxGroupsUser') || []
diff --git a/src/apps/AppCooperationPropaganda/scopedSelect.vue b/src/apps/AppCooperationPropaganda/scopedSelect.vue
index 50b07f57..403dcf97 100644
--- a/src/apps/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/apps/AppCooperationPropaganda/scopedSelect.vue
@@ -3,26 +3,38 @@
     <div class="item">
       <div>添加人</div>
       <div @click="selectUser">
-        <span v-if="selectedUser.length || deptListArr.length">已选择{{ selectedUser.length || deptListArr.length }}
-          <span v-if="selectedUser.length">个网格</span><span v-if="deptListArr.length">个部门</span></span>
+        <!-- <span v-if="selectedUser.length || deptListArr.length">已选择{{ selectedUser.length || deptListArr.length }}
+          <span v-if="selectedUser.length">个网格</span><span v-if="deptListArr.length">个部门</span></span> -->
+        <div v-if="type == 1" style="display: inline-block;">
+          <span v-if="deptListArr.length">已选择{{ deptListArr.length }}个部门</span>
+          <span class="color_gray" v-else>请选择</span>
+        </div>
+        <div v-if="type == 2" style="display: inline-block;">
+          <span v-if="selectedUser.length">已选择{{ selectedUser.length }}个网格</span>
+          <span class="color_gray" v-else>请选择</span>
+        </div>
+        <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
+      </div>
+    </div>
+
+    <div class="item" v-if="['Residents', 'CircleOfFriends'].includes(sendType)">
+      <div>包含标签</div>
+      <div @click="toTagsList(0)">
+        <span v-if="circleTags.length || ResidentTags.length">已选择{{ circleTags.length || ResidentTags.length }}个标签</span>
         <span class="color_gray" v-else>请选择</span>
         <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
       </div>
     </div>
-    <div class="item" v-if="['Residents', 'CircleOfFriends'].includes(sendType)">
-      <div>包含标签</div>
-      <div @click="toTagsList(0)">
-        <span class="color_gray">请选择</span>
-        <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
-      </div>
-    </div>
+
     <div class="item" v-if="['Residents', 'CircleOfFriends'].includes(sendType)">
       <div>剔除标签</div>
       <div @click="toTagsList(1)">
-        <span class="color_gray">请选择</span>
+        <span v-if="circleTagsRemove.length || ResidentTagsRemove.length">已剔除{{ circleTagsRemove.length || ResidentTagsRemove.length }}个标签</span>
+        <span class="color_gray" v-else>请选择</span>
         <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
       </div>
     </div>
+
     <div class="item" v-if="['Residents', 'CircleOfFriends'].includes(sendType)">
       <div>添加时间</div>
       <div @click="showCalendar = true">
@@ -31,6 +43,7 @@
         <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
       </div>
     </div>
+
     <div class="items" v-if="['Residents', 'CircleOfFriends'].includes(sendType)">
       <div>性别</div>
       <div class="sex">
@@ -59,10 +72,14 @@ export default {
       showCalendar: false,
       startTime: '',
       endTime: '',
-      sex: "0",
+      sex: 0,  // 性别：0-女、1-男、2-全部
       userList: [],
       deptListArr: [],
-      selectedUser: []
+      selectedUser: [],
+      circleTags: [], // 朋友圈包含标签
+      circleTagsRemove: [], // 朋友圈剔除标签
+      ResidentTags: [],  // 居民包含标签
+      ResidentTagsRemove: [],  // 居民剔除标签
     }
   },
   methods: {
@@ -92,22 +109,20 @@ export default {
       })
     },
 
+    //  选择包含、剔除的标签 0包含  1剔除
     toTagsList(e) {
-      uni.navigateTo({url: `./tagsList?type=${e}`})
+      uni.navigateTo({url: `./tagsList?type=${e}&sendType=${this.sendType}`})
     },
 
-    // 选包含标签
-    // selectTags() {},
-
-    // 选剔除标签
-    // deleteTags() {},
-
     // 选时间范围
     selectDate(e) {
       this.startTime = e.startDate
       this.endTime = e.endDate
     },
     submit() {
+      uni.setStorageSync('gender',this.sex)
+      uni.setStorageSync('startTime', this.startTime)
+      uni.setStorageSync('endTime', this.endTime)
       uni.setStorageSync('deptList',this.deptListArr)
       uni.navigateBack()
     }
@@ -118,8 +133,22 @@ export default {
     document.title = this.type == 1? '按部门选择':'按网格选择'
   },
   onShow() {
+    // 网格或者部门
     this.selectedUser = uni.getStorageSync('girdSelect')
     this.deptListArr = uni.getStorageSync('deptList')
+    // 添加时间
+    this.startTime = uni.getStorageSync('startTime')
+    this.endTime = uni.getStorageSync('endTime')
+    // 标签
+    if(this.sendType == 'Residents') { 
+      this.ResidentTags = uni.getStorageSync('ResidentTags') // 居民包含
+      this.ResidentTagsRemove = uni.getStorageSync('ResidentTagsRemove') // 居民剔除
+    } else if(this.sendType == 'CircleOfFriends') {
+      this.circleTags = uni.getStorageSync('circleTags') // 朋友圈包含
+      this.circleTagsRemove = uni.getStorageSync('circleTagsRemove') // 朋友圈剔除
+    }
+    // 性别
+    this.sex = uni.getStorageSync('gender')
   }
 
 }
diff --git a/src/apps/AppCooperationPropaganda/sendScoped.vue b/src/apps/AppCooperationPropaganda/sendScoped.vue
index 2490ce15..e11ea756 100644
--- a/src/apps/AppCooperationPropaganda/sendScoped.vue
+++ b/src/apps/AppCooperationPropaganda/sendScoped.vue
@@ -3,14 +3,14 @@
     <div class="checkedBox">
       <div class="item" v-for="(item,index) in checkList" :key="index" @click="checkBtn(item)">
         <div class="left">
-          <icon type="success" size="18" v-if="item.checked"/>
-          <icon type="circle" size="18" v-else />
+          <icon type="success" size="18" v-if="item.value == sendScope"/>
+          <icon type="circle" size="18" v-if="item.value != sendScope" />
           <div class="title">{{ item.name }}</div>
         </div>
-        <div class="right" v-if="item.vlaue != '0'">
+        <div class="right" v-if="item.value != 0">
           <div v-if="item.value == '1' && deptSelect.length">已选择{{ deptSelect.length }}个部门</div>
           <div v-if="item.value == '2' && girdSelect.length">已选择{{ girdSelect.length }}个网格</div>
-          <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
+          <u-icon name="arrow-right" color="#CCD0D3" ></u-icon>
         </div>
       </div>
     </div>
@@ -39,21 +39,41 @@ export default {
       sendScope: '0',
       girdListIds: [],
       deptListIds: [],
-      wxGroups: [],
-      groupNames: [],
+      wxGroups: [],  // 居民群,居民,朋友圈
+      sex: '',
+      // groupList: [],  // 居民
+      // executorList: [], // 朋友圈
+      ResidentTags: [],
+      ResidentTagsRemove: [],
+      startTime: '',
+      endTime: '',
     }
   },
   methods: {
     checkBtn(e) {
-      this.checkList.forEach(v=> v.checked = false)
-      e.checked = true
+      // this.checkList.forEach(v=> v.checked = false)
+      // e.checked = true
+      
       if(e.value == '1' || e.value == '2') {
         uni.navigateTo({url: `./scopedSelect?type=${e.value}&sendType=${this.sendType}`})
+
       }
-      this.sendScope = e.value
+      this.sendScope = e.value;
+      uni.setStorageSync('sendScope', this.sendScope)
+      // uni.clearStorageSync('ResidentTags')
+      // uni.clearStorageSync('ResidentTagsRemove')
+      // uni.clearStorageSync('circleTags')
+      // uni.clearStorageSync('circleTagsRemove')
     },
     submit() {
-      this.getWxGroups()
+      if(this.sendType == 'ResidentsGroup') {
+        this.getWxGroups()
+      } else if(this.sendType == 'Residents') {
+        this.getResidents()
+      } else if(this.sendType == 'CircleOfFriends') {
+        this.getCircleOfFriends()
+      }
+      
       uni.setStorageSync('sendScope', this.sendScope)
       setTimeout(() => {
         uni.navigateBack({
@@ -64,6 +84,7 @@ export default {
       }, 4000)
       
     },
+    // 群发居民群
     getWxGroups() {
       this.$http.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.sendScope}`,
       {
@@ -72,26 +93,68 @@ export default {
         if (res.code === 0) {
           this.wxGroups = res.data
           uni.setStorageSync('wxGroupsUser', this.wxGroups)
-          console.log(this.wxGroups,res.data);
         }
       })
     },
+    // 群发居民
+    getResidents() {
+      const tags = this.ResidentTags.join(',')
+      const removeTags = this.ResidentTagsRemove.join(',')
+      this.$http.post(`/app/whchatmomentstask/getCustomerGroups?sendScope=${this.sendScope}&addFromTime=${this.startTime}&addEndTime=${this.endTime}&gender=${this.sex}&filteTags=${tags}&excludeFilterTags=${removeTags}`,
+      { 
+        filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',')
+      }).then(res => {
+        if (res.code === 0) {
+          // this.groupList = res.data
+          // uni.setStorageSync('groupList', this.groupList)
+          this.wxGroups = res.data
+          uni.setStorageSync('wxGroupsUser', this.wxGroups)
+        }
+      })
+    },
+    // 群发朋友圈
+    getCircleOfFriends() {
+      this.$http.post(`/app/whchatmomentstask/getExecutors?sendScope=${this.sendScope}`,
+      { 
+        filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',')
+      }).then(res => {
+        if (res.code === 0) {
+          // this.executorList = res.data
+          // uni.setStorageSync('executorList', this.executorList)
+          this.wxGroups = res.data
+          uni.setStorageSync('wxGroupsUser', this.wxGroups)
+        }
+      })
+    }
   },
   onLoad(o) {
     this.sendType = o.type;
     document.title = "选择发送范围"
-    // this.checkList.forEach(i=> {
-    //   return {
-    //     name: i.name,
-    //     value: i.value, 
-        // checked: this.sendScope.find(v=>(i.value==v))
-      // }
-    // })
   },
   onShow() {
     this.sendScope = uni.getStorageSync('sendScope') || ''
-    this.girdListIds = uni.getStorageSync('girdSelect').map(e=>e.id) || []
-    this.deptListIds = uni.getStorageSync('deptList').map(v=>v.id) || []
+    const girdArr = uni.getStorageSync('girdSelect')
+    if(girdArr.length) {
+      this.girdListIds = girdArr.map(e=>e.id)
+    }
+    const deptArr = uni.getStorageSync('deptList')
+    if(deptArr.length) {
+      this.deptListIds = deptArr.map(v=>v.id)
+    }
+    this.sex = uni.getStorageSync('gender')
+    // 标签
+    if(this.sendType == 'Residents') { 
+      this.ResidentTags = uni.getStorageSync('ResidentTags') // 居民包含
+      this.ResidentTagsRemove = uni.getStorageSync('ResidentTagsRemove') // 居民剔除
+    } 
+    // 时间
+    this.startTime = uni.getStorageSync('startTime')
+    // console.log(this.startTime, '哈哈哈哈');
+    this.endTime = uni.getStorageSync('endTime')
+    // else if(this.sendType == 'CircleOfFriends') {
+    //   this.circleTags = uni.getStorageSync('circleTags') // 朋友圈包含
+    //   this.circleTagsRemove = uni.getStorageSync('circleTagsRemove') // 朋友圈剔除
+    // }
   }
 }
 </script>
diff --git a/src/apps/AppCooperationPropaganda/tagsList.vue b/src/apps/AppCooperationPropaganda/tagsList.vue
index 4a1d4d8d..2537f795 100644
--- a/src/apps/AppCooperationPropaganda/tagsList.vue
+++ b/src/apps/AppCooperationPropaganda/tagsList.vue
@@ -23,67 +23,17 @@ export default {
   name: "tagsList",
   data() {
     return {
-      subTags: [
-        {
-          id: "1",
-          name: "第一组",
-          tagList: [
-            {
-              id: "1.1",
-              name: "介绍的",
-            },
-            {
-              id: "1.2",
-              name: "介绍的啊塑胶地板",
-            },
-            {
-              id: "1.3",
-              name: "介绍的",
-            },
-            {
-              id: "1.4",
-              name: "介绍的啊啊啊啊啊啊啊啊",
-            },
-            {
-              id: "1.5",
-              name: "介绍的啊啊啊",
-            },
-            {
-              id: "1.6",
-              name: "介绍的红红火火恍恍惚惚或或或或或或或或或或或或红红火火恍恍惚惚或或或或或或或",
-            },
-            {
-              id: "1.7",
-              name: "介绍的红红火火恍恍惚惚或或或或或或或或或或或或红红火火恍恍惚惚或或或或或或或",
-            },
-          ]
-			  },
-        {
-          id: "2",
-          name: "第二组",
-          tagList: [
-            {
-              id: "2.2",
-              name: "的范德萨发",
-            }
-          ]
-			  }
-      ],
+      sendType: '',
+      subTags: [],
       checked: [],
-      list: []
+      type: '',
     }
   },
   methods: {
     getTags() {
-      this.$http.post(`/app/wxcp/wxcorptag/listAll`).then(res => {
+      this.$http.post(`/app/wxcp/wxcorptag/listAll?current=1&size=3000`).then(res => {
         if (res?.data) {
-          console.log(res);
-          // this.subTags = res.data.map(item => {
-          //   return {
-          //     dictName: item.name,
-          //     dictValue: item.id
-          //   }
-          // })
+          this.subTags = res.data.records
         }
       })
     },
@@ -101,20 +51,47 @@ export default {
         return this.$u.toast('请选择标签')
       }
 
-      const list = this.list.filter(v => {
-        return this.checked.includes(v.id)
-      })
-
-      uni.$emit('onChecked', list)
+      // const list = this.subTags.filter(v => {
+      //   return this.checked.includes(v.id)
+      // })
 
+      if(this.sendType == 'Residents') {
+        if(this.type == '0') {  // 居民包含
+          uni.setStorageSync('ResidentTags', this.checked)
+        } else if(this.type == '1') {  // 居民剔除
+          uni.setStorageSync('ResidentTagsRemove', this.checked)
+        }
+      } else if(this.sendType == 'CircleOfFriends') {
+        if(this.type == '0') {  // 朋友圈包含
+          uni.setStorageSync('circleTags', this.checked)
+        } else if(this.type == '1') {  // 朋友圈剔除
+          uni.setStorageSync('circleTagsRemove', this.checked)
+        }
+      }
       uni.navigateBack()
     }
   },
   onShow() {
     this.getTags()
+    this.checked = []
+    if(this.sendType == 'Residents') {
+      if(this.type == 0) {  // 居民包含
+        this.checked = uni.getStorageSync('ResidentTags') || []
+      } else {  // 居民剔除
+        this.checked = uni.getStorageSync('ResidentTagsRemove') || []
+      }
+    } else if(this.sendType == 'CircleOfFriends') {
+      if(this.type == 0) {  // 朋友圈包含
+        this.checked = uni.getStorageSync('circleTags') || []
+      } else {  // 朋友圈剔除
+        this.checked = uni.getStorageSync('circleTagsRemove') || []
+      }
+    }
   },
   onLoad(o) {
     document.title = o.type ==0? '包含标签': '剔除标签'
+    this.sendType = o.sendType
+    this.type = o.type
   }
 }
 </script>

From 8fc6e0a3a7bc204a3ac975bf6917dc6bb364065c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 13 Sep 2022 10:15:58 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=BE=A4=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPropaganda.vue                         | 102 ++++++++----------
 .../AppCooperationPropaganda/scopedSelect.vue |   4 +-
 .../AppCooperationPropaganda/sendScoped.vue   |   2 +-
 3 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/src/apps/AppCooperationPropaganda/addPropaganda.vue b/src/apps/AppCooperationPropaganda/addPropaganda.vue
index ca2e4f16..ef1654fe 100644
--- a/src/apps/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/apps/AppCooperationPropaganda/addPropaganda.vue
@@ -10,7 +10,7 @@
       <div @click="toSleectScoped">
         <span>
           <span class="color_gray" v-if="!form.sendScope">请选择</span>
-          <span v-if="form.sendScope">预计送达{{ form.wxGroups.length || forms.executorList }}名成员</span>
+          <span v-if="form.sendScope">预计送达{{ form.wxGroups.length }}名成员</span>
           <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
         </span>
       </div>
@@ -190,38 +190,6 @@ export default {
         sendScope: '', // 0：全部居民群、1：按部门选择、2：按网格选择
         sendType: '0', // 0：立即发送、1：定时发送
         gender: '', // 性别：0-女、1-男、2-全部
-        wxGroups: [
-          {
-            corpId: "ww596787bb70f08288",
-            errorCode: null,
-            errorMsg: null,
-            groupCount: 1,
-            groupIds: "wrytYEDgAAA5MGVJ3Ttb6ycbmxJ2Zv-Q",
-            groupNames: "111",
-            groupOwnerId: "d41d8cd98f00b204e9800998ecf8427e",
-            groupOwnerName: "张硕",
-            id: null,
-            msgId: null,
-            sendStatus: null,
-            sendTime: null,
-            taskId: null,
-          },
-          {
-            corpId: "ww596787bb70f08288",
-            errorCode: null,
-            errorMsg: null,
-            groupCount: 4,
-            groupIds: "wrytYEDgAA-Llt9H1jr40WT1_RfOstWQ,wrytYEDgAADava7QSJGicwZg09nG_GXg,wrytYEDgAAKG6qd39fHWFkrTiT9vsSQQ,wrytYEDgAAPxVpqyzf4kwzwvtdE0nqbQ",
-            groupNames: "慧政务需求沟通,临汾市政法委企微项目沟通,淄博企微项目沟通群,未命名群聊",
-            groupOwnerId: "XieJin",
-            groupOwnerName: "谢晋",
-            id: null,
-            msgId: null,
-            sendStatus: null,
-            sendTime: null,
-            taskId: null,
-          }
-        ],  // 送达居民群
       },
       enableExamine: false,
       isTimedTask: false,
@@ -380,10 +348,7 @@ export default {
 
 
     confirm() {
-      
       if(this.flag) return
-
-      if(this.type=='ResidentsGroup') {
       // 文本
       const firstContent = [
         { 
@@ -419,6 +384,10 @@ export default {
         }
       })
       this.form.contents.push(...files)
+
+      if(this.type=='Residents' || this.type=='CircleOfFriends') {
+        this.forms.contentList = this.form.contents
+      }
       
       if(!this.form.taskTitle) {
         return this.$u.toast('请输入任务名称')
@@ -436,40 +405,47 @@ export default {
         if(!this.form.examines.length) {
           return this.$u.toast("请选择审批人")
         } else {
-          this.form.enableExamine = '1'
+          this.form.enableExamine = this.form.enableExamine
         }
+        this.forms.enableExamine = this.form.enableExamine
+      } else {
+        this.forms.enableExamine
+        this.form.
       }
 
       if(this.isTimedTask) {
+        this.form.sendType = 1
+        this.forms.sendType = 1
         if(!this.form.choiceTime.length) {
           return this.$u.toast("请选择发送时间")
         } else if (new Date(this.form.choiceTime).getTime() < Date.now()) {
           return this.$u.toast('定时发送时间不得早于当前时间')
         }
+        this.forms.choiceTime = this.form.choiceTime
+      } else {
+        this.form.sendType = 0
+        this.forms.sendType = 0
+        this.forms.choiceTime = ''
+        this.form.choiceTime = ''
       }
       this.flag = true
-      this.$http.post(`/app/appmasssendingtask/addOrUpdate`, { ...this.form }).then(res=>{
-        if(res?.code ==0) {
-          this.flag = false
-          this.$u.toast("新增成功")
 
-        }
-      }).catch((err)=>{
-        this.flag = false
-        this.$u.toast(err)
-      })
-      } else {
-        this.$http.post(`/app/whchatmomentstask/addOrUpdate`, { ...this.form }).then(res=>{
-        if(res?.code ==0) {
-          this.flag = false
-          this.$u.toast("新增成功")
-
-        }
-      }).catch((err)=>{
-        this.flag = false
-        this.$u.toast(err)
-      })
+      let formData = {}
+      if(this.type=='Residents' || this.type=='CircleOfFriends') {
+        formData = this.forms
+      } else if(this.type=='ResidentsGroup') {
+        formData = this.form
       }
+      this.$http.post(`/app/appmasssendingtask/addOrUpdate`, { ...formData }).then(res=>{
+        if(res?.code ==0) {
+          this.flag = false
+          this.$u.toast("新增成功")
+
+        }
+      }).catch((err)=>{
+        this.flag = false
+        this.$u.toast(err)
+      })
     },
 
     getDeptUser() {
@@ -496,11 +472,19 @@ export default {
     } else if(this.type=='CircleOfFriends') {
       this.forms.taskType = 0
     }
-    this.forms.taskTitle = this.form.taskTitle
   },
   onShow() {
-    this.form.wxGroups = uni.getStorageSync('wxGroupsUser') || []
+    // this.form.wxGroups = uni.getStorageSync('wxGroupsUser') || []
     this.form.sendScope = uni.getStorageSync('sendScope')
+    if(this.type=='Residents') {
+      this.forms.taskType = 1
+      this.forms.groupList = this.form.wxGroups
+    } else if(this.type=='CircleOfFriends') {
+      this.forms.taskType = 0
+      this.forms.executorList = this.form.wxGroups
+    }
+    this.forms.taskTitle = this.form.taskTitle
+    
   }
 }
 </script>
diff --git a/src/apps/AppCooperationPropaganda/scopedSelect.vue b/src/apps/AppCooperationPropaganda/scopedSelect.vue
index 403dcf97..dd3eb90b 100644
--- a/src/apps/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/apps/AppCooperationPropaganda/scopedSelect.vue
@@ -35,7 +35,7 @@
       </div>
     </div>
 
-    <div class="item" v-if="['Residents', 'CircleOfFriends'].includes(sendType)">
+    <div class="item" v-if="['Residents'].includes(sendType)">
       <div>添加时间</div>
       <div @click="showCalendar = true">
         <span v-if="!startTime.length && !endTime.length" class="color_gray">请选择</span>
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div class="items" v-if="['Residents', 'CircleOfFriends'].includes(sendType)">
+    <div class="items" v-if="['Residents'].includes(sendType)">
       <div>性别</div>
       <div class="sex">
         <span :class="sex == 0? 'active':''" @click="sex = 0">全部</span>
diff --git a/src/apps/AppCooperationPropaganda/sendScoped.vue b/src/apps/AppCooperationPropaganda/sendScoped.vue
index e11ea756..ccd62330 100644
--- a/src/apps/AppCooperationPropaganda/sendScoped.vue
+++ b/src/apps/AppCooperationPropaganda/sendScoped.vue
@@ -81,7 +81,7 @@ export default {
             uni.$emit('predictUser', this.wxGroups)
           }
         })
-      }, 4000)
+      }, 1000)
       
     },
     // 群发居民群

From 59c332152a7e8a3eff1670f38922375d6c651363 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 13 Sep 2022 11:50:04 +0800
Subject: [PATCH 5/6] bug

---
 .../addPropaganda.vue                         | 19 +++++++++++--------
 .../AppCooperationPropaganda/sendScoped.vue   | 10 +++++++---
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/apps/AppCooperationPropaganda/addPropaganda.vue b/src/apps/AppCooperationPropaganda/addPropaganda.vue
index ef1654fe..82c1a4de 100644
--- a/src/apps/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/apps/AppCooperationPropaganda/addPropaganda.vue
@@ -401,19 +401,22 @@ export default {
         return this.$u.toast("请输入发送内容")
       }
 
-      if(this.enableExamine) {
+      if(this.enableExamine) { // 是否需要审批，0：否、1：是
         if(!this.form.examines.length) {
           return this.$u.toast("请选择审批人")
         } else {
-          this.form.enableExamine = this.form.enableExamine
+          this.form.examineList = this.form.examineList
         }
-        this.forms.enableExamine = this.form.enableExamine
+        this.form.enableExamine = 1
+        this.forms.enableExamine = 1 
       } else {
-        this.forms.enableExamine
-        this.form.
+        this.form.enableExamine = 0
+        this.forms.enableExamine = 0 
+        this.form.examineList = []
+        this.form.examineList = []
       }
 
-      if(this.isTimedTask) {
+      if(this.isTimedTask) {   // 发送类型，0：立即发送、1：定时发送
         this.form.sendType = 1
         this.forms.sendType = 1
         if(!this.form.choiceTime.length) {
@@ -453,10 +456,10 @@ export default {
         fromDepartmentId: 0,
         mode: "multi",
         type: ["user"],
-        selectedUserIds: this.userList?.map(e => e.id)
+        selectedUserIds: this.form.examineList?.map(e => e.id)
       }).then((res)=>{
           if(res?.userList) {
-            this.userList = res.userList
+            this.form.examineList = res.userList
           }
         }
       ).catch((err) => {
diff --git a/src/apps/AppCooperationPropaganda/sendScoped.vue b/src/apps/AppCooperationPropaganda/sendScoped.vue
index ccd62330..ffc9d509 100644
--- a/src/apps/AppCooperationPropaganda/sendScoped.vue
+++ b/src/apps/AppCooperationPropaganda/sendScoped.vue
@@ -102,7 +102,7 @@ export default {
       const removeTags = this.ResidentTagsRemove.join(',')
       this.$http.post(`/app/whchatmomentstask/getCustomerGroups?sendScope=${this.sendScope}&addFromTime=${this.startTime}&addEndTime=${this.endTime}&gender=${this.sex}&filteTags=${tags}&excludeFilterTags=${removeTags}`,
       { 
-        filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',')
+        filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(','),
       }).then(res => {
         if (res.code === 0) {
           // this.groupList = res.data
@@ -112,10 +112,15 @@ export default {
         }
       })
     },
+
+    // const array1 = [{name:'zs',num: 1},{name:'zls',num: 5},{name:'azs',num: 4}]
+    // const sum = array1.reduce((pre, cur) => pre + cur.num, 0)
+    // console.log(sum)
+
     // 群发朋友圈
     getCircleOfFriends() {
       this.$http.post(`/app/whchatmomentstask/getExecutors?sendScope=${this.sendScope}`,
-      { 
+      {
         filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',')
       }).then(res => {
         if (res.code === 0) {
@@ -149,7 +154,6 @@ export default {
     } 
     // 时间
     this.startTime = uni.getStorageSync('startTime')
-    // console.log(this.startTime, '哈哈哈哈');
     this.endTime = uni.getStorageSync('endTime')
     // else if(this.sendType == 'CircleOfFriends') {
     //   this.circleTags = uni.getStorageSync('circleTags') // 朋友圈包含

From 92c8d8d5f273239f5b32ddab9cb31fc2dcf81c1e Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 13 Sep 2022 15:03:56 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropaganda.vue                 | 16 +++++++++++++---
 src/apps/AppCooperationPropaganda/selectUser.vue |  1 +
 src/apps/AppCooperationPropaganda/sendScoped.vue |  7 ++-----
 .../saas/AppCooperationPropaganda/selectUser.vue |  1 -
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
index 3c4acd59..62df8c40 100644
--- a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
+++ b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -144,7 +144,10 @@ export default {
       uni.clearStorageSync('ResidentTagsRemove')
       uni.clearStorageSync('circleTags')
       uni.clearStorageSync('circleTagsRemove')
-      this.getList()
+      this.$dict.load('mstStatus').then(() => {
+        this.getList()
+      })
+      
     },
     toDetail(item) {
       uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
@@ -155,13 +158,20 @@ export default {
       this.getList()
     },
     getList() {
-      this.$http.post(`/app/appmasssendingtask/list`, null, {
+      let url = ''
+      if(this.tabIndex==0) {
+        url = `/app/appmasssendingtask/list`
+      } else if(this.tabIndex==1 || this.tabIndex==2) {
+        url = `/app/whchatmomentstask/list`
+      }
+      this.$http.post(url, null, {
         params: {
           current: this.current,
           taskTitle: this.taskTitle,
           startTime: this.start,
           endTime: this.end,
           createUserId: this.createUserId,
+          status: this.status
         }
       }).then(res=> {
         if(res?.data) {
@@ -213,7 +223,7 @@ export default {
   },
   onShow() {
     document.title = '协同宣发'
-    this.$dict.load(['mstStatus']).then(() => {
+    this.$dict.load('mstStatus').then(() => {
       this.list = []
       this.current = 1
       this.getList()
diff --git a/src/apps/AppCooperationPropaganda/selectUser.vue b/src/apps/AppCooperationPropaganda/selectUser.vue
index eb54659b..8a9303b9 100644
--- a/src/apps/AppCooperationPropaganda/selectUser.vue
+++ b/src/apps/AppCooperationPropaganda/selectUser.vue
@@ -69,6 +69,7 @@ export default {
       if(!this.selected.userId) {
         return this.$u.toast('请选择创建人')
       }
+      uni.$emit("pagePicker:custom", [this.selected])
       uni.setStorageSync('userSelect', this.selected)
       uni.navigateBack()
     },
diff --git a/src/apps/AppCooperationPropaganda/sendScoped.vue b/src/apps/AppCooperationPropaganda/sendScoped.vue
index ffc9d509..f70efc4c 100644
--- a/src/apps/AppCooperationPropaganda/sendScoped.vue
+++ b/src/apps/AppCooperationPropaganda/sendScoped.vue
@@ -36,13 +36,11 @@ export default {
       sendType: '',
       deptSelect: [],
       girdSelect: [],
-      sendScope: '0',
+      sendScope: 0,
       girdListIds: [],
       deptListIds: [],
       wxGroups: [],  // 居民群,居民,朋友圈
       sex: '',
-      // groupList: [],  // 居民
-      // executorList: [], // 朋友圈
       ResidentTags: [],
       ResidentTagsRemove: [],
       startTime: '',
@@ -56,7 +54,6 @@ export default {
       
       if(e.value == '1' || e.value == '2') {
         uni.navigateTo({url: `./scopedSelect?type=${e.value}&sendType=${this.sendType}`})
-
       }
       this.sendScope = e.value;
       uni.setStorageSync('sendScope', this.sendScope)
@@ -88,7 +85,7 @@ export default {
     getWxGroups() {
       this.$http.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.sendScope}`,
       {
-        filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',')
+        filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',') 
       }).then(res => {
         if (res.code === 0) {
           this.wxGroups = res.data
diff --git a/src/project/saas/AppCooperationPropaganda/selectUser.vue b/src/project/saas/AppCooperationPropaganda/selectUser.vue
index ce406eba..047dfc22 100644
--- a/src/project/saas/AppCooperationPropaganda/selectUser.vue
+++ b/src/project/saas/AppCooperationPropaganda/selectUser.vue
@@ -68,7 +68,6 @@ export default {
       if(!this.selected.userId) {
         return this.$u.toast('请选择创建人')
       }
-      uni.$emit("pagePicker:custom", [this.selected])
       uni.setStorageSync('userSelect', this.selected)
       uni.navigateBack()
     },