From 034e0e463adb908c585e8ab585c302b868a1a8ab Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 15 Jul 2022 16:43:41 +0800
Subject: [PATCH] =?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 ++-
 .../cooperationDetail.vue}                    |  46 +++++-----
 .../detail.vue                                |  79 ++++++++++++++++--
 .../images/shaixuan.png                       | Bin 0 -> 663 bytes
 4 files changed, 100 insertions(+), 35 deletions(-)
 rename src/project/saas/{AppPropagandaStatistics/groupSendResident.vue => AppCooperationPropaganda/AppCooperationPropaganda.vue} (97%)
 rename src/project/saas/{AppPropagandaStatistics/groupSendDetail.vue => AppCooperationPropaganda/cooperationDetail.vue} (85%)
 rename src/project/saas/{AppPropagandaStatistics => AppCooperationPropaganda}/detail.vue (50%)
 create mode 100644 src/project/saas/AppCooperationPropaganda/images/shaixuan.png

diff --git a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
similarity index 97%
rename from src/project/saas/AppPropagandaStatistics/groupSendResident.vue
rename to src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
index 7bf24646..d3ab2be5 100644
--- a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue
+++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="groupSendResident">
+  <div class="AppCooperationPropaganda">
     <AiTopFixed>
       <div class="search">
         <div class="searchBox">
@@ -70,6 +70,8 @@
 
 <script>
 export default {
+  name: 'AppCooperationPropaganda',
+  appName: '协同宣发',
   data() {
     return {
       current: 1,
@@ -88,7 +90,7 @@ export default {
   },
   methods: {
     toDetail(item) {
-      uni.navigateTo({url: `./groupSendDetail?id=${item.id}&time=${item.createTime}`})
+      uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
     },
     searchBtn() {
       this.current = 1
@@ -108,7 +110,7 @@ export default {
         if(res?.data) {
           this.list = this.current == 1?  res.data.records : [...res.data.records, ...this.list]
         }
-        console.log(res);
+        // console.log(res);
       })
     },
     
@@ -145,7 +147,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.groupSendResident {
+.AppCooperationPropaganda {
   .search {
     display: flex;
     height: 80px;
diff --git a/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
similarity index 85%
rename from src/project/saas/AppPropagandaStatistics/groupSendDetail.vue
rename to src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
index b434bc18..e1e9e27b 100644
--- a/src/project/saas/AppPropagandaStatistics/groupSendDetail.vue
+++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="groupSendDetail">
+  <div class="cooperationDetail">
     <AiTopFixed>
       <div class="tab-select">
         <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{ item }}<span></span>
@@ -19,17 +19,17 @@
 
       <div class="pieEcharts">
         <div class="pie_info">
-          <div class="tips">数据更新于2022-07-06 09:18:56</div>
+          <div class="tips">数据更新于<span>{{ info.remindTime }}</span></div>
           <div class="pie_card">
             <div id="pieEcharts"></div>
             <div class="pie_right">
-              <div>计划送达居民群: <span>10</span></div>
-              <div>未送达居民群: <span>10</span></div>
-              <div>已送达居民群: <span>10</span></div>
-              <div>无法送达居民群: <span>10</span></div>
+              <div>计划送达居民群: <span>{{ info.planCount || 0 }}</span></div>
+              <div>未送达居民群: <span>{{ info.unExecutedCount || 0 }}</span></div>
+              <div>已送达居民群: <span>{{ info.executedCount || 0 }}</span></div>
+              <div>无法送达居民群: <span>{{ info.cannotExecuteCount || 0 }}</span></div>
             </div>
           </div>
-          <div class="btn" :disabled="flag" @click="remindSend">提醒成员发送</div>
+          <div class="btn" @click="remindSend">提醒成员发送</div>
         </div>
       </div>
 
@@ -64,8 +64,6 @@ export default {
       createTime: '',
       id: '',
       info: {},
-      flag: false,
-      timer: null,
       current: 1,
     }
   },
@@ -95,23 +93,30 @@ export default {
     },
 
     toDetail() {
-      uni.navigateTo({url: `./detail`})
+      uni.navigateTo({url: `./detail?id=${this.id}`})
     },
     // 提醒发送
     remindSend() {
-      if(this.flag) return
-      var n = 60 * 60 * 1000
-      setTimeout(()=> {
-
-      })
+      var timer = null
+      var num = 60 * 60 * 1000
       this.$http.post('/app/appmasssendingtask/remindSend',null,{
         params: {
           id: this.id
         }
       }).then(res => {
-        console.log(res);
-      }).catch(err => {
-        console.log(err);
+        if(res?.code==0) {
+          this.$u.toast('已提醒成员发送')
+          timer = setInterval(()=>{
+            if(this.num == 0) {
+              clearInterval(timer)
+            }
+            num = num - 1 
+          }, 60 * 60 * 1000)
+        } else {
+          this.$u.toast(res.msg)
+        }
+      }).catch(() => {
+        this.$u.toast(`${num}s后可再次提醒发送`)
       })
     },
 
@@ -134,9 +139,6 @@ export default {
     getPieEcharts() {
       this.pieEcharts = echarts.init(document.getElementById('pieEcharts'))
       this.pieEcharts.setOption( {
-        // legend: {
-        //   selectedMode:false
-        // },
         tooltip: {
             trigger: 'item',
             formatter: '{a} <br/>{b}: {c} ({d}%)'
@@ -185,7 +187,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.groupSendDetail {
+.cooperationDetail {
   ::v-deep .AiTopFixed .content {
     padding: 0;
   }
diff --git a/src/project/saas/AppPropagandaStatistics/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue
similarity index 50%
rename from src/project/saas/AppPropagandaStatistics/detail.vue
rename to src/project/saas/AppCooperationPropaganda/detail.vue
index e981efd4..836ba129 100644
--- a/src/project/saas/AppPropagandaStatistics/detail.vue
+++ b/src/project/saas/AppCooperationPropaganda/detail.vue
@@ -5,32 +5,43 @@
       <div class="task_content">
         <div class="item">
           <span>任务名称</span>
-          <span>居民社保最新政策</span>
+          <span>{{ data.taskTitle }}</span>
         </div>
         <div class="item">
           <span>创建人</span>
-          <span>居民社保最新政策</span>
+          <span>{{ data.createUserId }}</span>
         </div>
         <div class="item">
           <span>所在部门</span>
-          <span>居民社保最新政策</span>
+          <span>{{ data.createUserDept }}</span>
         </div>
         <div class="item">
           <span>群发时间</span>
-          <span>居民社保最新政策</span>
+          <span>{{ data.choiceTime }}</span>
         </div>
       </div>
     </div>
     <div class="info">
       <div class="scope">
         <span>群发范围</span>
-        <span>按条件筛选的全部X个客户群</span>
+        <span>按条件筛选的全部{{ data.receiveGroupCount || 0}}个客户群</span>
       </div>
       <div class="content">
         <p>群发内容</p>
-        <div></div>
+        <div>
+          <div class="textarea" v-if="content.length">{{ content[0].content }}</div>
+          <div class="pictures">
+            <!-- <image v-for="(item, index) in picList" :key="index" :src="item."/> -->
+          </div>
+          <div></div>
+          <div></div>
+        </div>
       </div>
     </div>
+    <div class="btn">
+      <div class="refuse" @click="refuseBtn">拒绝通过</div>
+      <div class="pass" @click="passBtn">审核通过</div>
+    </div>
   </div>
 </template>
 
@@ -38,10 +49,29 @@
 export default {
   data() {
     return {
-
+      id: "",
+      data: {},
+      content: [],
+      picList: []
     }
   },
-  methods: {},
+  onLoad(o) {
+    this.id = o.id
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`).then(res=> {
+        if (res?.data) {
+          this.data = res.data
+          this.content = res.data.contents.map(v=> v.msgType == 0)
+          this.picList = res.data.contents.map(e=> e.msgType == 1)
+        }
+      })
+    },
+    // 拒绝通过
+    refuseBtn() {},
+    // 审核通过
+  },
   onShow() {
     document.title = "群发审批"
   }
@@ -50,7 +80,7 @@ export default {
 
 <style lang="scss" scoped>
 .detail {
-  padding: 32px;
+  padding: 32px 32px 120px 32px;
   box-sizing: border-box;
   .task {
     margin-bottom: 24px;
@@ -99,7 +129,38 @@ export default {
     .content {
       p {
         color: #999;
+        margin-bottom: 26px;
       }
+      .textarea {
+        background: #F9F9F9;
+        border-radius: 4px;
+        padding: 20px;
+        box-sizing: border-box;
+      }
+    }
+  }
+
+  .btn {
+    position: fixed;
+    display: flex;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    border: 1px solid #DDDDDD;
+    font-size: 32px;
+    .refuse {
+      width: 40%;
+      background: #FFF;
+      color: #FF4466;
+      text-align: center;
+    }
+    .pass {
+      width: 60%;
+      background: #3975C6;
+      color: #FFF;
+      text-align: center;
     }
   }
 }
diff --git a/src/project/saas/AppCooperationPropaganda/images/shaixuan.png b/src/project/saas/AppCooperationPropaganda/images/shaixuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..88015ea5e0e538118f88586e115d588422253674
GIT binary patch
literal 663
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zjKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uvw#`F1}RM0`(+UW0~4dCi(`lf
z@7w9t9x{O<ZU5`<uo^Dgx;gZqSJM){mn=u`xnJ0^`9{PHC08ak9VW4ZdPkHNbog>P
zwuqQX3mrVJCANq|h$HNxLkGu2m5R^zUDY@D-;^vbS7;S)tNylUU-h|y_j8}_HBS?C
zSU<0VJ&|Kisl%3I-n&laIV4|rXmMag$n=fQxvhNjEN1K3PngjsoAE(wc9I(_Q?IAZ
z<t^gkA@B3Hue3bwz&Atk(ar?ss=DhkUVnnv+3%HqJoM}w<Jt{VpKV*_seQdf!so@-
zw=vJZG=vpyXVu?2t2aA&>*k`hWxHp5dVZ2QP3{B#D}xpD{(rF!)tGPCcu+j$9^VP(
zTSsmlx4FPq8>M)JySU@y*~GeUBH>M4nsUb^%FZPmW#I2#D`;}$)3np?g66r3MyXF~
z^W^dT6R4%(@?F=lhvnxKmZ<ctk3G~6M+78H*w<HZJ@}7Q3O~y&hPgb&R@rYK%9WnU
z+oAJ1UMxeCmvf1!Y`ajWey8<ASx(kEnP;8fg0)yGR=V_G`&}vZ===L6n$KsH?o|1`
zTR~no<5(P%W7&SYEl%fWT6}rJ<oG>i!P*0+QLU|xSO4_IC7O!FztO#Lz2{cP|9tPQ
z*Ux1ICO_eNE&U;?{N|nomEx~_#RVmQtn9zPIrA3(+A>@2x(#ANm4ctv=Dg5%nw>Z4
ldDp)ADpl8l?(|Q3slRGjntsxngBL)F!qe5yWt~$(69Dck3%CFP

literal 0
HcmV?d00001