协同宣发

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue

@@ -552,9 +552,10 @@ export default {
       }[type]
       let formData = new FormData()
       formData.append('file', file.file)
-      formData.append('type', fileType)
+      formData.append('attachmentType', 1)
+      formData.append('mediaType', fileType)
       let loading = this.$loading()
-      this.instance.post(`/app/wxcp/upload/uploadFile`, formData, {
+      this.instance.post(`/app/wxcp/upload/uploadAttachment`, formData, {
         withCredentials: false
       }).then(res => {
         if (res.code == 0) {

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue

@@ -42,8 +42,8 @@
             <ai-info-item label="群发范围" isLine>
               <div class="text">
                 <span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
-                <i>{{ groups.length }}</i>
+                <i>{{ info.executorList.length }}</i>
-                <span>个居民群</span>
+                <span>个居民</span>
                 <em @click="isShowGroups = true">详情</em>
               </div>
             </ai-info-item>
@@ -73,25 +73,25 @@
             <div class="top">
               <div class="top-item">
                 <div class="top-item__title">
-                  <h3>计划执行成员</h3>
+                  <h3>预计执行员工</h3>
                 </div>
                 <p>{{ memberInfo.planCount || 0 }}</p>
               </div>
               <div class="top-item">
                 <div class="top-item__title">
-                  <h3>未执行成员</h3>
+                  <h3>未执行员工</h3>
                 </div>
                 <p>{{ memberInfo.unExecutedCount || 0 }}</p>
               </div>
               <div class="top-item">
                 <div class="top-item__title">
-                  <h3>已执行成员</h3>
+                  <h3>已执行员工</h3>
                 </div>
                 <p>{{ memberInfo.executedCount || 0 }}</p>
               </div>
               <div class="top-item">
                 <div class="top-item__title">
-                  <h3>无法执行成员</h3>
+                  <h3>无法执行员工</h3>
                   <el-tooltip
                     placement="top"
                     content="由于员工不在可见范围、离职、客户群接收已达到上限等原因，无法执行群发任务的成员总数">
@@ -151,14 +151,17 @@
         width="890px"
         title="群发范围"
         @onConfirm="isShowGroups = false">
-        <ai-table
+          <ai-wrapper>
-          :tableData="info.wxGroups"
+            <ai-info-item label="消息发送" isLine :value="info.taskTitle">
-          :col-configs="colConfigs3"
+              <div class="text">
-          border
+                <span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
-          tableSize="small"
+                <i>{{ info.executorList.length }}</i>
-          :isShowPagination="false"
+                <span>个居民</span>
-          @getList="() => {}">
+              </div>
-        </ai-table>
+            </ai-info-item>
+            <ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
+            <ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
+          </ai-wrapper>
       </ai-dialog>
       <div class="detail-phone" v-if="isShowPhone">
         <div class="mask"></div>
@@ -219,7 +222,8 @@
         timer: null,
         min: 60,
         isDisabled: false,
-        rejecterId: ''
+        rejecterId: '',
+        userNames: ''
       }
     },
 
@@ -238,15 +242,15 @@
 
     methods: {
       getMemberInfo () {
-        this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, {
+        this.instance.post(`/app/whchatmomentstask/detailStatistics`, null, {
           params: {
             ...this.search1,
             taskId: this.params.id
           }
         }).then(res => {
           if (res.code === 0) {
-            this.tableData1 = res.data.executedList.records
+            // this.tableData1 = res.data.executedList.records
-            this.total1 = res.data.executedList.total
+            // this.total1 = res.data.executedList.total
             this.memberInfo = res.data
           }
         })
@@ -264,7 +268,7 @@
       },
 
       sendMsg () {
-        this.instance.post(`/app/appmasssendingtask/remindSend?id=${this.params.id}`).then(res => {
+        this.instance.post(`/app/whchatmomentstask/remindExamine?id=${this.params.id}`).then(res => {
           if (res.code === 0) {
             this.$message.success('提醒成功')
             this.getInfo(this.params.id)
@@ -288,7 +292,7 @@
       },
 
       getInfo (id) {
-        this.instance.post(`/app/whchatmomentstask/customerTasKDetail?id=${id}`).then(res => {
+        this.instance.post(`/app/whchatmomentstask/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
             if (res.data.status === '4' && res.data.remindTime) {
@@ -308,15 +312,13 @@
               }
             })
 
-            this.info.wxGroups = res.data.wxGroups.map(v => {
+            let userNames = ''
-              this.groups.push(...v.groupIds.split(','))
+            res.data.executorList.forEach(e => {
-
+              userNames = e.executorName + userNames
-              return {
-                ...v,
-                groupIds: v.groupIds.split(',')
-              }
             })
 
+            this.userNames = res.data.executorList.map(e => e.executorName).join(',')
+
             if (res.data.examines && res.data.examines.length) {
               const user = res.data.examines.filter(v => v.examineStatus === '2')