diff --git a/packages/wxwork/Announce/AppAnnounce/components/List.vue b/packages/wxwork/Announce/AppAnnounce/components/List.vue index 23a4130f..8d1d7179 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/List.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/List.vue @@ -143,7 +143,7 @@ onUserChange (e) { if (e.length) { this.name = e[0].name - this.search.createUserId = e[0].id + this.search.createUserId = e[0].openId } else { this.search.createUserId = '' this.name = '' diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue index cb1274cb..820ef1b1 100644 --- a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue @@ -34,12 +34,7 @@
- - - - + {{ item.groupOwnerName }} 等{{ form.wxGroups.length }}个
请选择 @@ -373,6 +368,7 @@ export default { isShowAddMiniapp: false, isShowDate: false, isShowTags: false, + chooseTags: [], isLoading: false, linkForm: { linkPicUrl: [], @@ -754,6 +750,33 @@ export default { .el-tooltip__popper.is-dark { max-width: 240px; } + +.tags { + .tag-item { + display: flex; + align-items: center; + padding-bottom: 30px; + padding-top: 30px; + border-bottom: 1px solid #EEEEEE; + + &:first-child { + padding-top: 0; + } + + .el-tag { + margin-right: 8px; + color: #222222; + } + + h2 { + width: 88px; + margin-right: 40px; + text-align: right; + color: #888888; + font-size: 14px; + } + } +} .AppAnnounceDetail-content-wrapper { display: flex; align-items: center; diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue index d6ea5f30..edc0dfff 100644 --- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue @@ -604,6 +604,32 @@ export default { .el-tooltip__popper.is-dark { max-width: 240px; } +.tags { + .tag-item { + display: flex; + align-items: center; + padding-bottom: 30px; + padding-top: 30px; + border-bottom: 1px solid #EEEEEE; + + &:first-child { + padding-top: 0; + } + + .el-tag { + margin-right: 8px; + color: #222222; + } + + h2 { + width: 88px; + margin-right: 40px; + text-align: right; + color: #888888; + font-size: 14px; + } + } +} .AppAnnounceDetail-content-wrapper { display: flex; align-items: center; diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue index 61176b59..64ea48b5 100644 --- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue @@ -25,15 +25,15 @@
- - () + {{ info.createUserName }} + ({{ info.createUserDeptName }})
- + {{ item.examineUserName }}
@@ -136,12 +136,8 @@ @@ -193,7 +189,6 @@ total1: 0, isShowGroups: false, isShowPhone: false, - total2: 0, user1: [], user2: [], radio1: '未执行', @@ -204,13 +199,6 @@ type: 0, sendStatus: '0' }, - search2: { - current: 1, - size: 10, - deptartId: '', - type: 1, - sendStatus: '0' - }, memberInfo: {}, groupInfo: {}, tableData1: [], @@ -220,18 +208,13 @@ content: '', currIndex: 0, colConfigs3: [ - { prop: 'groupOwnerId', label: '群主', openType: 'userName' }, + { prop: 'groupOwnerName', label: '群主' }, { prop: 'groupNames', label: '群名称' } ], colConfigs1: [ - { slot: 'user', label: '成员', openType: 'userName' }, + { slot: 'user', label: '成员' }, { prop: 'groupCount', label: '预计送达居民群', align: 'center' } ], - colConfigs2: [ - { prop: 'groupName', label: '居民群' }, - { prop: 'memberCount', label: '群人数', align: 'center' }, - { slot: 'user', label: '群主', align: 'center' }, - ], groups: [], timer: null, min: 60, @@ -247,7 +230,6 @@ created () { this.getInfo(this.params.id) this.getMemberInfo() - this.getGroupInfo() }, destroyed () { @@ -278,11 +260,7 @@ } this[search].current = 1 - if (search === 'search1') { - this.getMemberInfo() - } else { - this.getGroupInfo() - } + this.getMemberInfo() }, sendMsg () { @@ -294,26 +272,6 @@ }) }, - getGroupInfo () { - this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, { - params: { - ...this.search2, - taskId: this.params.id - } - }).then(res => { - if (res.code === 0) { - this.tableData2 = res.data.executedList.records.map(v => { - return { - ...v, - groupName: v.groupName || '未命名群聊' - } - }) - this.total2 = res.data.executedList.total - this.groupInfo = res.data - } - }) - }, - countdown () { this.timer = setInterval(() => { const nowTime = this.$moment(new Date()) diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue index 5af56011..f4070372 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 }} 创建人 - +
-
+