kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-08-22 16:00:16 +08:00
parent 0a262cbb25 e7fb16bd70
commit 8c0f9451b7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/extra/AppAddressBook/components/List.vue
View File

@@ -235,7 +235,7 @@ export default {
{prop: 'departmentNames', label: '部门'},
{prop: 'mobile', label: '手机号'},
{slot: 'tags', label: '标签'},
{prop: 'status', label: '账号状态', align: 'center', formart: v => v === 1 ? '已激活' : '未激活'}
{prop: 'status', label: '账号状态', align: 'center', formart: v => v == 1 ? '已激活' : '未激活'}
],
defaultProps: {
children: 'children',

5
packages/wxwork/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
View File

@@ -269,7 +269,10 @@
}
},
getEffect() {
var startTime = this.timeListEffect[0] || '' , endTime = this.timeListEffect[1] || '', departId = this.deptList[0].id || ''
var startTime = this.timeListEffect[0] || '' , endTime = this.timeListEffect[1] || '', departId = ''
if(this.deptList && this.deptList.length) {
departId = this.deptList[0].id
}
this.instance.post(`/app/appmasssendingtask/statisticsEffect?type=${this.effectType}&startTime=${startTime}&endTime=${endTime}&departId=${departId}`).then(res => {
if (res.code == 0) {
this.effectData = res.data