diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue index 07cc0051..cc835bb8 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue @@ -125,6 +125,18 @@ :current.sync="search1.current" :size.sync="search1.size" @getList="getMemberInfo"> + + + @@ -175,6 +187,18 @@ :current.sync="search2.current" :size.sync="search2.size" @getList="getGroupInfo"> + + + @@ -222,15 +246,13 @@ content: '', currIndex: 0, colConfigs1: [ - { prop: 'groupOwnerId', label: '成员', openType: 'userName' }, - { prop: 'mainDepartment', label: '成员所属部门', openType: 'departmentName', align: 'center' }, + { slot: 'user', label: '成员', openType: 'userName' }, { prop: 'groupCount', label: '预计送达居民群', align: 'center' } ], colConfigs2: [ { prop: 'groupName', label: '居民群' }, { prop: 'memberCount', label: '群人数', align: 'center' }, - { prop: 'groupOwnerId', label: '群主', openType: 'userName', align: 'center' }, - { prop: 'mainDepartment', label: '群主所属部门', openType: 'departmentName', align: 'center' } + { slot: 'user', label: '群主', align: 'center' }, ] } }, @@ -341,6 +363,18 @@ display: flex; flex-wrap: wrap; } + + .userinfo { + display: flex; + align-items: center; + flex-direction: column; + justify-content: center; + line-height: 1; + + span:first-child { + margin-bottom: 4px; + } + } .user { display: flex; align-items: center; diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue index 5016520e..64e66d57 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/List.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue @@ -13,7 +13,7 @@ 创建宣发 @@ -21,14 +21,16 @@ v-model="search.startTime" type="date" size="small" - value-format="yyyy-MM-DD" + value-format="yyyy-MM-dd" + @change="search.current = 1, getList()" placeholder="选择群发开始日期"> @@ -53,6 +55,18 @@ :current.sync="search.current" :size.sync="search.size" @getList="getList"> + + +