From 7d697c6932e5d1acd312c720cc765afd84af818d Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 14 Sep 2022 17:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropaganda.vue              |  2 --
 .../AppCooperationPropaganda/circleDetail.vue | 20 ++++++++-----------
 .../cooperationDetail.vue                     |  3 +--
 .../AppCooperationPropaganda/detail.vue       | 19 ++++++++++++++++--
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropaganda.vue
index 57e4e638..1a381740 100644
--- a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -147,7 +147,6 @@ export default {
       this.$dict.load('mstStatus').then(() => {
         this.getList()
       })
-      
     },
     toDetail(item) {
       if(this.tabIndex == 0) {
@@ -155,7 +154,6 @@ export default {
       } else {
         uni.navigateTo({url: `./circleDetail??id=${item.id}&time=${item.createTime}&type=${this.sendType}`})
       }
-      
     },
     searchBtn() {
       this.current = 1
diff --git a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
index 56f52b9c..9023afe8 100644
--- a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
@@ -95,8 +95,8 @@ export default {
   computed: {
     colConfigs() {
       return [
-        { prop: "groupOwnerName", label: "成员" },
-        { prop: "groupCount", label: "预计送达居民"},
+        { prop: "userName", label: "成员" },
+        { prop: "customerCount", label: "预计送达居民"},
       ];
     },
   },
@@ -130,8 +130,8 @@ export default {
       });
       this.currentClickTime = +new Date();
       let time = this.currentClickTime - this.firstClickTime;
-      if (time >= 3600000) {
-        this.$http.post("/app/appmasssendingtask/remindSend", null, {
+      if (time >= 3600000) {    
+        this.$http.post("/app/whchatmomentstask/remindSend", null, {
             params: {
               id: this.id,
             },
@@ -176,10 +176,10 @@ export default {
       })
       .then((res) => {
         if (res?.data) {
-          this.info = res.data;
-          this.tableData = res.data.executedList.records;
+          this.info = res.data
+          this.tableData = res.data.executedList.records
           setTimeout(()=>{
-            this.getPieEcharts();
+            this.getPieEcharts()
           }, 1000)
         }
       });
@@ -217,11 +217,7 @@ export default {
                     show: true,
                     formatter: ({ name, value }) => {
                       let num = value / this.info.planCount * 100
-                      if (this.tabIndex == 0) {
-                        return num % 1==0? `{name|任务达成率\n\n}{value|${num}%}`: `{name|任务达成率\n\n}{value|${ num.toFixed(1) }%}`;
-                      } else {
-                        return num % 1==0? `{name|群发送达率\n\n}{value|${num}%}`: `{name|群发送达率\n\n}{value|${ num.toFixed(1) }%}`;
-                      }
+                      return `{name|任务达成率\n\n}{value|${num}%}`
                     },
                     textStyle: {
                       fontSize: 16,
diff --git a/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue b/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
index e5295d6f..d093f39d 100644
--- a/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
@@ -241,8 +241,7 @@ export default {
     },
     // 获取数据
     getStatistics() {
-      this.$http
-        .post(`/app/appmasssendingtask/detailStatistics`, null, {
+      this.$http.post(`/app/appmasssendingtask/detailStatistics`, null, {
           params: {
             type: this.tabIndex,
             sendStatus: this.tabIndex==0? this.subIndex0: this.subIndex1,
diff --git a/src/project/huizhili/AppCooperationPropaganda/detail.vue b/src/project/huizhili/AppCooperationPropaganda/detail.vue
index 1a6061e2..f29af9c0 100644
--- a/src/project/huizhili/AppCooperationPropaganda/detail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/detail.vue
@@ -103,17 +103,25 @@ export default {
       pictres: [],
       options: '',
       approver: [],  //审批人
+      type: '',
     } 
   },
   onLoad(o) {
     this.id = o.id
+    this.type = o.type
   },
   computed: {
     ...mapState(['user'])
   },
   methods: {
     getDetail() {
-      this.$http.post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`).then(res=> {
+      let url = ''
+      if(this.type == 'ResidentsGroup') {
+        url = `/app/appmasssendingtask/queryDetailById?id=${this.id}`
+      } else {
+        url = `/app/whchatmomentstask/queryDetailById?id=${this.id}`
+      }
+      this.$http.post(url).then(res=> {
         if (res?.data) {
           this.data = res.data
           this.content = res.data.contents.filter(v=> v.msgType == 0)?.[0].content
@@ -159,7 +167,14 @@ export default {
       })
     },
     examine() {
-      this.$http.post(`/app/appmasssendingtask/examine`,null,{
+      // /app/whchatmomentstask/examine
+      let url = ''
+      if(this.type == 'ResidentsGroup') {
+        url = `/app/appmasssendingtask/examine`
+      } else {
+        url = `/app/whchatmomentstask/examine`
+      }
+      this.$http.post(url,null,{
         params: {
           pass: this.pass,
           id: this.id,