From 4d59b17d39fc86e0fdee9c7a11fb8b4667ffcef9 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 1 Mar 2023 15:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E4=B8=80=E4=B8=AA=E5=88=86=E6=AE=B5?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPropaganda.vue                         |   8 +-
 .../AppCooperationPropaganda/circleDetail.vue |   2 +-
 .../cooperationDetail.vue                     | 132 ++++++++++--------
 .../AppCooperationPropaganda/detail.vue       |   2 -
 4 files changed, 80 insertions(+), 64 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
index 6f07ef5b..737cc0f6 100644
--- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
@@ -9,11 +9,11 @@
       <div><span class="color_red">*</span><span class="title">发送范围</span></div>
       <div @click="toSleectScoped">
         <span>
-          <span v-if="type=='ResidentsGroup' && form.wxGroups.length">
-            <span class="color_gray" v-if="!form.wxGroups">请选择</span>
+          <span v-if="type=='ResidentsGroup'">
+            <span class="color_gray" v-if="!form.wxGroups.length">请选择</span>
             <span v-else>预计送达{{ form.wxGroups.length }}个居民群</span>
           </span>
-          <span v-if="type!='ResidentsGroup' && sum != 0">
+          <span v-if="type!='ResidentsGroup'">
             <span class="color_gray" v-if="sum==0">请选择</span>
             <span v-else>预计送达{{ sum }}名成员</span>
           </span>
@@ -313,7 +313,7 @@ export default {
         let params = {
           count,
           sizeType: ['compressed'],
-          sourceType: ['album', 'camera'],
+          sourceType: ['album'],
           success: (res) => {
             let count = this.files?.length + (res.tempFiles?.length || res.tempFile ? 1 : 0)
             if (count > 9) {
diff --git a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
index d498337d..b8b58020 100644
--- a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
@@ -162,7 +162,7 @@ export default {
       this.subIndex = index;
       this.getStatistics();
     },
-    // 获取数据
+    // 获取表格数据
     getStatistics() {
       this.$http.post('/app/whchatmomentstask/detailStatistics', null, {
         params: { 
diff --git a/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue b/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
index 8bb4f658..f6a93f3a 100644
--- a/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
@@ -66,24 +66,10 @@
 
       <div class="list_content">
         <div class="list_card">
-          <div class="tab" v-show="update0">
-            <u-subsection
-              :list="subsection0"
-              mode="button"
-              activeColor="#3c9cff"
-              :current="subIndex0"
-              @change="changeSub0"
-            ></u-subsection>
-          </div>
-
-          <div class="tab" v-show="update1">
-            <u-subsection
-              :list="subsection1"
-              mode="button"
-              activeColor="#3c9cff"
-              :current="subIndex1"
-              @change="changeSub1"
-            ></u-subsection>
+          <div class="tab" >
+            <div class="item" :class="tabIndex == index? 'bgactive': ''" v-for="(item,index) in subsection" :key="index" @click="changeSub(index)">
+              {{ item }}
+            </div>
           </div>
 
           <AiTable
@@ -105,8 +91,7 @@ export default {
       tabs: ["成员统计", "居民群统计"],
       tabIndex: 0,
       pieEcharts: null,
-      subIndex0: 0,
-      subIndex1: 0,
+      subIndex: 0,
       tableData: [],
       id: "",
       info: {},
@@ -114,17 +99,7 @@ export default {
       firstClickTime: "",
       currentClickTime: "",
       detail: {},
-
-      subsection0: [
-        { name: "未执行" },
-        { name: "已执行" },
-        { name: "无法执行" },
-      ],
-      subsection1: [
-        { name: "未送达" },
-        { name: "已送达" },
-        { name: "无法送达" },
-      ],
+      subsection: [],
       update0: true,
       update1: false,
       type: '',
@@ -152,24 +127,19 @@ export default {
   methods: {
     tabClick(index) {
       this.tabIndex = index;
-      if(this.tabIndex == 0) {
-          this.subsection = [
-          { name: "未执行" },
-          { name: "已执行" },
-          { name: "无法执行" },
-        ]
-        this.update0 = true
-        this.update1 = false
-        this.$forceUpdate()
-      } else if(this.tabIndex == 1) {
-          this.subsection = [
-          { name: "未送达" },
-          { name: "已送达" },
-          { name: "无法送达" },
-        ]
-        this.update0 = false
-        this.update1 = true
-        this.$forceUpdate()
+      this.subIndex = 0
+      if(this.sendChannel == 1) {
+        if(this.tabIndex == 0) {
+          this.subsection = ["未执行","已执行"]
+        } else if(this.tabIndex == 1){
+          this.subsection = ["未送达","已送达"]
+        }
+      } else if(this.sendChannel != 1) {
+        if(this.tabIndex == 0) {
+          this.subsection = ["未执行","已执行","无法执行"]
+        } else if(this.tabIndex == 1) {
+          this.subsection = ["未送达","已送达","无法送达"]
+        }
       }
       this.getStatistics();
     },
@@ -230,13 +200,8 @@ export default {
       }
     },
     // 切换分段器
-    // 切换分段器
-    changeSub0(index) {
-      this.subIndex0 = index;
-      this.getStatistics();
-    },
-    changeSub1(index) {
-      this.subIndex1 = index;
+    changeSub(index) {
+      this.subIndex = index;
       this.getStatistics();
     },
     // 获取数据
@@ -244,7 +209,7 @@ export default {
       this.$http.post(`/app/appmasssendingtask/detailStatistics`, null, {
           params: {
             type: this.tabIndex,
-            sendStatus: this.tabIndex==0? this.subIndex0: this.subIndex1,
+            sendStatus: this.subIndex,
             taskId: this.id,
             current: this.current,
             size: 3000,
@@ -325,6 +290,33 @@ export default {
       });
     },
   },
+  watch: {
+    detail: {
+      handler(v) {
+        if(v) {
+          this.sendChannel = v.sendChannel
+          if(v.sendChannel == 1) {
+            if(this.tabIndex == 0) {
+              this.subsection = ["未执行","已执行"]
+              this.$forceUpdate()
+            } else if(this.tabIndex == 1){
+              this.subsection = ["未送达","已送达"]
+              this.$forceUpdate()
+            }
+          } else if(v.sendChannel != 1) {
+            if(this.tabIndex == 0) {
+              this.subsection = ["未执行","已执行","无法执行"]
+              this.$forceUpdate()
+            } else if(this.tabIndex == 1){
+              this.subsection = ["未送达","已送达","无法送达"]
+              this.$forceUpdate()
+            }
+          }
+        }
+      },
+      deep: true
+    }
+  },
   onShow() {
     document.title = "群发居民群统计";
     this.$dict.load("mstStatus")
@@ -495,6 +487,7 @@ export default {
 
       .tab {
         margin-bottom: 34px;
+
         ::v-deep .u-subsection uni-view{
           background: #eeef !important;
         }
@@ -513,5 +506,30 @@ export default {
       }
     }
   }
+
+  .tab {
+    height: 70px;
+    background-color: #eeeeef;
+    padding: 3px 4px;
+    border-radius: 10px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .item {
+      flex: 1;
+      height: 58px;
+      line-height: 58px;
+      align-self: center;
+      color: #3aa0ff;
+      text-align: center;
+      border-radius: 16px;
+      
+    }
+    .bgactive {
+      background: #fff;
+      font-weight: 600;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/project/huizhili/AppCooperationPropaganda/detail.vue b/src/project/huizhili/AppCooperationPropaganda/detail.vue
index f29af9c0..3f50c708 100644
--- a/src/project/huizhili/AppCooperationPropaganda/detail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/detail.vue
@@ -167,8 +167,6 @@ export default {
       })
     },
     examine() {
-      // /app/whchatmomentstask/examine
-      let url = ''
       if(this.type == 'ResidentsGroup') {
         url = `/app/appmasssendingtask/examine`
       } else {