From f50166c2978ab33d07c1660a91dbdf332411a07e Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 31 Aug 2022 14:24:56 +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

---
 .../AppAnnounceResident/components/Detail.vue | 84 +------------------
 .../AppAnnounceWeChat/components/Detail.vue   | 84 +------------------
 2 files changed, 4 insertions(+), 164 deletions(-)

diff --git a/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Detail.vue b/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Detail.vue
index 7396255c..61176b59 100644
--- a/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Detail.vue
+++ b/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Detail.vue
@@ -67,15 +67,9 @@
           </ai-wrapper>
         </template>
       </ai-card>
-      <ai-card>
-        <template #title>
-          <div class="AppAnnounceDetail-title">
-            <span :class="[currIndex === 0 ? 'active' : '']" @click="currIndex = 0">成员统计</span>
-            <span :class="[currIndex === 1 ? 'active' : '']" @click="currIndex = 1">居民群统计</span>
-          </div>
-        </template>
+      <ai-card title="成员统计">
         <template #content>
-          <div class="content-item" v-if="currIndex === 0">
+          <div class="content-item">
             <div class="top">
               <div class="top-item">
                 <div class="top-item__title">
@@ -154,80 +148,6 @@
               </ai-table>
             </div>
           </div>
-          <div class="content-item" v-if="currIndex === 1">
-            <div class="top">
-              <div class="top-item">
-                <div class="top-item__title">
-                  <h3>计划送达居民群</h3>
-                </div>
-                <p>{{ groupInfo.planCount || 0 }}</p>
-              </div>
-              <div class="top-item">
-                <div class="top-item__title">
-                  <h3>未送达居民群</h3>
-                </div>
-                <p>{{ groupInfo.unExecutedCount || 0 }}</p>
-              </div>
-              <div class="top-item">
-                <div class="top-item__title">
-                  <h3>已送达居民群</h3>
-                </div>
-                <p>{{ groupInfo.executedCount || 0 }}</p>
-              </div>
-              <div class="top-item">
-                <div class="top-item__title">
-                  <h3>无法送达居民群</h3>
-                </div>
-                <p>{{ groupInfo.cannotExecuteCount || 0 }}</p>
-              </div>
-            </div>
-            <div class="bottom">
-              <div class="bottom-search">
-                <div class="left">
-                  <el-radio-group v-model="search2.sendStatus" size="small" @change="search2.current = 1, getGroupInfo()">
-                    <el-radio-button size="small" label="0">未送达</el-radio-button>
-                    <el-radio-button size="small" label="1">已送达</el-radio-button>
-                    <el-radio-button size="small" label="2">无法送达</el-radio-button>
-                  </el-radio-group>
-                  <ai-picker
-                    dialogTitle="选择部门"
-                    action="/app/wxcp/wxdepartment/departList"
-                    :instance="instance"
-                    @pick="e => onUserChange(e, 'search2')" :multiple="false" v-model="user2">
-                    <div class="userSelcet">
-                      <span style="color: #606266;" v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
-                      <span v-else>部门</span>
-                      <i class="el-icon-arrow-up"  v-if="!search2.deptartId"></i>
-                      <i class="el-icon-circle-close" v-if="search2.deptartId" @click.stop="user1 = [], search2.deptartId = '', search2.current = 1, getGroupInfo()"></i>
-                    </div>
-                  </ai-picker>
-                </div>
-                <el-button :type="isDisabled ? '' : 'primary'" :disabled="isDisabled"  @click="sendMsg(1)" v-if="info.status === '4'">{{ isDisabled ? min + '分钟后可再次提醒' : '提醒成员发送' }}</el-button>
-              </div>
-              <ai-table
-                :tableData="tableData2"
-                :col-configs="colConfigs2"
-                :total="total2"
-                border
-                tableSize="small"
-                :current.sync="search2.current"
-                :size.sync="search2.size"
-                @getList="getGroupInfo">
-                <el-table-column slot="user" label="群主" align="center">
-                  <template slot-scope="{ row }">
-                    <div class="userinfo">
-                      <span>
-                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
-                      </span>
-                      <span style="color: #999">
-                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
-                      </span>
-                    </div>
-                  </template>
-                </el-table-column>
-              </ai-table>
-            </div>
-          </div>
         </template>
       </ai-card>
       <ai-dialog
diff --git a/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue b/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
index 7396255c..61176b59 100644
--- a/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
+++ b/project/sass/apps/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
@@ -67,15 +67,9 @@
           </ai-wrapper>
         </template>
       </ai-card>
-      <ai-card>
-        <template #title>
-          <div class="AppAnnounceDetail-title">
-            <span :class="[currIndex === 0 ? 'active' : '']" @click="currIndex = 0">成员统计</span>
-            <span :class="[currIndex === 1 ? 'active' : '']" @click="currIndex = 1">居民群统计</span>
-          </div>
-        </template>
+      <ai-card title="成员统计">
         <template #content>
-          <div class="content-item" v-if="currIndex === 0">
+          <div class="content-item">
             <div class="top">
               <div class="top-item">
                 <div class="top-item__title">
@@ -154,80 +148,6 @@
               </ai-table>
             </div>
           </div>
-          <div class="content-item" v-if="currIndex === 1">
-            <div class="top">
-              <div class="top-item">
-                <div class="top-item__title">
-                  <h3>计划送达居民群</h3>
-                </div>
-                <p>{{ groupInfo.planCount || 0 }}</p>
-              </div>
-              <div class="top-item">
-                <div class="top-item__title">
-                  <h3>未送达居民群</h3>
-                </div>
-                <p>{{ groupInfo.unExecutedCount || 0 }}</p>
-              </div>
-              <div class="top-item">
-                <div class="top-item__title">
-                  <h3>已送达居民群</h3>
-                </div>
-                <p>{{ groupInfo.executedCount || 0 }}</p>
-              </div>
-              <div class="top-item">
-                <div class="top-item__title">
-                  <h3>无法送达居民群</h3>
-                </div>
-                <p>{{ groupInfo.cannotExecuteCount || 0 }}</p>
-              </div>
-            </div>
-            <div class="bottom">
-              <div class="bottom-search">
-                <div class="left">
-                  <el-radio-group v-model="search2.sendStatus" size="small" @change="search2.current = 1, getGroupInfo()">
-                    <el-radio-button size="small" label="0">未送达</el-radio-button>
-                    <el-radio-button size="small" label="1">已送达</el-radio-button>
-                    <el-radio-button size="small" label="2">无法送达</el-radio-button>
-                  </el-radio-group>
-                  <ai-picker
-                    dialogTitle="选择部门"
-                    action="/app/wxcp/wxdepartment/departList"
-                    :instance="instance"
-                    @pick="e => onUserChange(e, 'search2')" :multiple="false" v-model="user2">
-                    <div class="userSelcet">
-                      <span style="color: #606266;" v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
-                      <span v-else>部门</span>
-                      <i class="el-icon-arrow-up"  v-if="!search2.deptartId"></i>
-                      <i class="el-icon-circle-close" v-if="search2.deptartId" @click.stop="user1 = [], search2.deptartId = '', search2.current = 1, getGroupInfo()"></i>
-                    </div>
-                  </ai-picker>
-                </div>
-                <el-button :type="isDisabled ? '' : 'primary'" :disabled="isDisabled"  @click="sendMsg(1)" v-if="info.status === '4'">{{ isDisabled ? min + '分钟后可再次提醒' : '提醒成员发送' }}</el-button>
-              </div>
-              <ai-table
-                :tableData="tableData2"
-                :col-configs="colConfigs2"
-                :total="total2"
-                border
-                tableSize="small"
-                :current.sync="search2.current"
-                :size.sync="search2.size"
-                @getList="getGroupInfo">
-                <el-table-column slot="user" label="群主" align="center">
-                  <template slot-scope="{ row }">
-                    <div class="userinfo">
-                      <span>
-                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
-                      </span>
-                      <span style="color: #999">
-                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
-                      </span>
-                    </div>
-                  </template>
-                </el-table-column>
-              </ai-table>
-            </div>
-          </div>
         </template>
       </ai-card>
       <ai-dialog