群发统计

packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue

@@ -136,8 +136,8 @@
                 <el-table-column slot="user" label="成员" align="left">
                   <template slot-scope="{ row }">
                     <div class="userinfo">
-                      <span>{{ row.groupOwnerName }}</span>
+                      <span>{{ row.userName }}</span>
-                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
+                      <span style="color: #999">{{ row.userDepartmentName }}</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -252,8 +252,8 @@
           }
         }).then(res => {
           if (res.code === 0) {
-            // this.tableData1 = res.data.executedList.records
+            this.tableData1 = res.data.executedList.records
-            // this.total1 = res.data.executedList.total
+            this.total1 = res.data.executedList.total
             this.memberInfo = res.data
           }
         })

packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue

@@ -33,14 +33,14 @@
             @change="search.current = 1, getList()"
             placeholder="选择群发结束日期">
           </el-date-picker>
-          <ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
             <div class="userSelcet">
               <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
               <span v-else>创建人</span>
               <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
               <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
             </div>
-          </ai-wechat-selecter>
+          </ai-user-selecter>
         </template>
         <template slot="right">
           <el-input

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/AppAnnounceWeChat.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="AppAnnounceWeChat">
-    <!-- <keep-alive :include="['List']"> -->
+    <keep-alive :include="['List']">
       <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
-    <!-- </keep-alive> -->
+    </keep-alive>
   </div>
 </template>
 
@@ -55,7 +55,7 @@
           this.params = data.params
         }
 
-        if (data.type === 'list') {
+        if (data.type === 'List') {
           this.component = 'List'
           this.params = data.params
 

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue

@@ -663,7 +663,7 @@ export default {
 
     cancel(isRefresh) {
       this.$emit('change', {
-        type: 'list',
+        type: 'List',
         isRefresh: !!isRefresh
       })
     }

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue

@@ -1,7 +1,7 @@
 <template>
-  <ai-detail class="AppAnnounceDetail">
+  <ai-detail class="AppAnnounceDetail" v-loading="isLoading">
     <template slot="title">
-      <ai-title title="群发详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title title="群发详情" isShowBack isShowBottomBorder @onBackClick="cancel(true)">
       </ai-title>
     </template>
     <template slot="content">
@@ -136,8 +136,8 @@
                 <el-table-column slot="user" label="成员" align="left">
                   <template slot-scope="{ row }">
                     <div class="userinfo">
-                      <span>{{ row.groupOwnerName }}</span>
+                      <span>{{ row.userName }}</span>
-                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
+                      <span style="color: #999">{{ row.userDepartmentName }}</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -210,10 +210,6 @@
         info: {},
         content: '',
         currIndex: 0,
-        colConfigs3: [
-          { prop: 'groupOwnerName', label: '群主' },
-          { prop: 'groupNames', label: '群名称' }
-        ],
         colConfigs1: [
           { slot: 'user', label: '成员' },
           { prop: 'groupCount', label: '预计送达居民群', align: 'center' }
@@ -223,7 +219,8 @@
         min: 60,
         isDisabled: false,
         rejecterId: '',
-        userNames: ''
+        userNames: '',
+        isLoading: false
       }
     },
 
@@ -249,8 +246,8 @@
           }
         }).then(res => {
           if (res.code === 0) {
-            // this.tableData1 = res.data.executedList.records
+            this.tableData1 = res.data.executedList.records
-            // this.total1 = res.data.executedList.total
+            this.total1 = res.data.executedList.total
             this.memberInfo = res.data
           }
         })
@@ -268,7 +265,7 @@
       },
 
       sendMsg () {
-        this.instance.post(`/app/whchatmomentstask/remindExamine?id=${this.params.id}`).then(res => {
+        this.instance.post(`/app/whchatmomentstask/remindSend?id=${this.params.id}`).then(res => {
           if (res.code === 0) {
             this.$message.success('提醒成功')
             this.getInfo(this.params.id)
@@ -292,6 +289,7 @@
       },
 
       getInfo (id) {
+        this.isLoading = true
         this.instance.post(`/app/whchatmomentstask/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
@@ -327,6 +325,7 @@
               }
             }
           }
+          this.isLoading = false
         })
       },
 
@@ -352,7 +351,7 @@
 
       cancel (isRefresh) {
         this.$emit('change', {
-          type: 'list',
+          type: 'List',
           isRefresh: !!isRefresh
         })
       }

packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue

@@ -33,14 +33,14 @@
             @change="search.current = 1, getList()"
             placeholder="选择群发结束日期">
           </el-date-picker>
-          <ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
             <div class="userSelcet">
               <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
               <span v-else>创建人</span>
               <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
               <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
             </div>
-          </ai-wechat-selecter>
+          </ai-user-selecter>
         </template>
         <template slot="right">
           <el-input