宣发统计

project/sass/apps/Announce/AppAnnounce/components/Detail.vue

@@ -29,11 +29,13 @@
               </div>
             </ai-info-item>
             <ai-info-item label="审批人">
-              <div class="user" v-for="(item, index) in info.examines" :key="index">
+              <div class="user-wrapper">
-                <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
+                <div class="user" v-for="(item, index) in info.examines" :key="index">
-                <span>
+                  <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                  <ai-open-data type="userName" :openid="item.wxOpenUserId"></ai-open-data>
+                  <span>
-                </span>
+                    <ai-open-data type="userName" :openid="item.examineUserId"></ai-open-data>
+                  </span>
+                </div>
               </div>
             </ai-info-item>
             <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
@@ -41,7 +43,7 @@
             <ai-info-item label="群发范围" isLine>
               <div class="text">
                 <span>按条件筛选的</span>
-                <i>{{ info.wxGroups.length }}</i>
+                <i>{{ info.wxGroups ? info.wxGroups.length : 0 }}</i>
                 <span>个客户群</span>
                 <em>详情</em>
               </div>
@@ -51,8 +53,8 @@
                 <p>{{ content }}</p>
                 <div class="msg-bottom" v-if="fileList.length">
                   <div class="left">
-                    <img src="https://cdn.cunwuyun.cn/dvcp/announce/img.png" />
+                    <img :src="mapIcon(fileList[0].msgType)" />
-                    <span>图片附件235325346.jpg 等</span>
+                    <span>{{ mapType(fileList[0].msgType) }}{{ fileList[0].mpTitle || fileList[0].name || fileList[0].linkTitle  }} 等</span>
                     <i>{{ fileList.length }}</i>
                     <span>个附件</span>
                   </div>
@@ -106,10 +108,10 @@
             <div class="bottom">
               <div class="bottom-search">
                 <div class="left">
-                  <el-radio-group v-model="radio1" size="small">
+                  <el-radio-group v-model="search2.sendStatus" size="small">
-                    <el-radio-button size="small" label="未执行"></el-radio-button>
+                    <el-radio-button size="small" label="0">未执行</el-radio-button>
-                    <el-radio-button size="small" label="已执行"></el-radio-button>
+                    <el-radio-button size="small" label="1">已执行</el-radio-button>
-                    <el-radio-button size="small" label="无法执行"></el-radio-button>
+                    <el-radio-button size="small" label="2">无法执行</el-radio-button>
                   </el-radio-group>
                 </div>
                 <el-button type="primary">提醒成员发送</el-button>
@@ -120,8 +122,8 @@
                 :total="total"
                 border
                 tableSize="small"
-                :current.sync="search.current"
+                :current.sync="search1.current"
-                :size.sync="search.size"
+                :size.sync="search1.size"
                 @getList="getList">
               </ai-table>
             </div>
@@ -156,10 +158,10 @@
             <div class="bottom">
               <div class="bottom-search">
                 <div class="left">
-                  <el-radio-group v-model="radio1" size="small">
+                  <el-radio-group v-model="search1.sendStatus" size="small">
-                    <el-radio-button size="small" label="未执行"></el-radio-button>
+                    <el-radio-button size="small" label="0">未执行</el-radio-button>
-                    <el-radio-button size="small" label="已执行"></el-radio-button>
+                    <el-radio-button size="small" label="1">已执行</el-radio-button>
-                    <el-radio-button size="small" label="无法执行"></el-radio-button>
+                    <el-radio-button size="small" label="2">无法执行</el-radio-button>
                   </el-radio-group>
                 </div>
                 <el-button type="primary">提醒成员发送</el-button>
@@ -170,8 +172,8 @@
                 :total="total"
                 border
                 tableSize="small"
-                :current.sync="search.current"
+                :current.sync="search2.current"
-                :size.sync="search.size"
+                :size.sync="search2.size"
                 @getList="getList">
               </ai-table>
             </div>
@@ -196,9 +198,19 @@
       return {
         total: 0,
         radio1: '未执行',
-        search: {
+        search1: {
           current: 1,
-          size: 10
+          size: 10,
+          deptartId: '',
+          type: 0,
+          sendStatus: '0'
+        },
+        search2: {
+          current: 1,
+          size: 10,
+          deptartId: '',
+          type: 1,
+          sendStatus: '0'
         },
         fileList: [],
         tableData: [],
@@ -218,9 +230,35 @@
 
     created () {
       this.getInfo(this.params.id)
+      this.getMemberInfo()
+      this.getGroupInfo()
     },
 
     methods: {
+      getMemberInfo () {
+        this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, {
+          params: {
+            ...this.search1,
+            taskId: this.params.id
+          }
+        }).then(res => {
+          if (res.code === 0) {
+          }
+        })
+      },
+
+      getGroupInfo () {
+        this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, {
+          params: {
+            ...this.search2,
+            taskId: this.params.id
+          }
+        }).then(res => {
+          if (res.code === 0) {
+          }
+        })
+      },
+
       getInfo (id) {
         this.instance.post(`/app/appmasssendingtask/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
@@ -242,7 +280,29 @@
         })
       },
 
-      getList () {},
+      getList () {
+
+      },
+
+      mapType (type) {
+        return {
+          1: '图片',
+          2: '视频',
+          3: '文件',
+          4: '网站',
+          5: '小程序'
+        }[type]
+      },
+
+      mapIcon (type) {
+        return {
+          1: 'https://cdn.cunwuyun.cn/dvcp/announce/img.png',
+          2: 'https://cdn.cunwuyun.cn/dvcp/announce/video.png',
+          3: 'https://cdn.cunwuyun.cn/dvcp/announce/folder.png',
+          4: 'https://cdn.cunwuyun.cn/dvcp/announce/site.png',
+          5: 'https://cdn.cunwuyun.cn/dvcp/announce/miniapp.png'
+        }[type]
+      },
 
       cancel (isRefresh) {
         this.$emit('change', {
@@ -256,10 +316,15 @@
 
 <style scoped lang="scss">
   .AppAnnounceDetail {
+    .user-wrapper {
+      display: flex;
+      flex-wrap: wrap;
+    }
     .user {
       display: flex;
       align-items: center;
       line-height: 1;
+      margin-right: 8px;
 
       img {
         width: 16px;
@@ -306,7 +371,6 @@
       p {
         line-height: 1.3;
         padding: 8px 12px;
-        border-bottom: 1px solid #D0D4DC;
       }
 
       .msg-bottom {
@@ -315,6 +379,7 @@
         justify-content: space-between;
         height: 38px;
         padding: 0 16px;
+        border-top: 1px solid #D0D4DC;
 
         .left {
           display: flex;