diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue index 55887ea8..02024f2b 100644 --- a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue @@ -136,8 +136,8 @@ - {{ row.groupOwnerName }} - {{ row.mainDepartmentName }} + {{ row.userName }} + {{ row.userDepartmentName }} @@ -252,8 +252,8 @@ } }).then(res => { if (res.code === 0) { - // this.tableData1 = res.data.executedList.records - // this.total1 = res.data.executedList.total + this.tableData1 = res.data.executedList.records + this.total1 = res.data.executedList.total this.memberInfo = res.data } }) diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue index 9e734a8f..341dcc58 100644 --- a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue @@ -33,14 +33,14 @@ @change="search.current = 1, getList()" placeholder="选择群发结束日期"> - + {{ name }} 创建人 - + - + - + @@ -55,7 +55,7 @@ this.params = data.params } - if (data.type === 'list') { + if (data.type === 'List') { this.component = 'List' this.params = data.params diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue index bc29bcea..b0009c30 100644 --- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue @@ -663,7 +663,7 @@ export default { cancel(isRefresh) { this.$emit('change', { - type: 'list', + type: 'List', isRefresh: !!isRefresh }) } diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue index d321395f..2a181af2 100644 --- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue @@ -1,7 +1,7 @@ - + - + @@ -136,8 +136,8 @@ - {{ row.groupOwnerName }} - {{ row.mainDepartmentName }} + {{ row.userName }} + {{ row.userDepartmentName }} @@ -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.total1 = res.data.executedList.total + this.tableData1 = res.data.executedList.records + 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 }) } diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue index f90367e0..5c5cf565 100644 --- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue @@ -33,14 +33,14 @@ @change="search.current = 1, getList()" placeholder="选择群发结束日期"> - + {{ name }} 创建人 - +