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-07-28 11:10:19 +08:00
parent 4abe2b7bf5 ec70dc13bc
commit e0e0329cfe
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
View File

@@ -34,7 +34,7 @@
<el-card> <el-card>
<div class="flex-between"> <div class="flex-between">
<p class="item-title">{{item.taskTitle}}</p> <p class="item-title">{{item.taskTitle}}</p>
<span class="item-time" v-if="item.createTime">{{item.createTime.substring(10, 16)}}</span> <span class="item-time" v-if="item.choiceTime">{{item.choiceTime.substring(10, 16)}}</span>
</div> </div>
<div class="item-info item-created"> <div class="item-info item-created">
<span class="label">创建人：</span> <span class="label">创建人：</span>
@@ -116,7 +116,7 @@
</div> </div>
</div> </div>
<ai-dialog :visible.sync="dialogDate" title="选择时间" width="500px" customFooter :show-close="false"> <ai-dialog :visible.sync="dialogDate" title="选择时间" width="500px" customFooter>
<el-date-picker v-model="timeList" size="small" type="daterange" value-format="yyyy-MM-dd" <el-date-picker v-model="timeList" size="small" type="daterange" value-format="yyyy-MM-dd"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
@@ -226,11 +226,13 @@
return this.$message.error('请选择自定义时间'); return this.$message.error('请选择自定义时间');
} }
if(this.effectType == 3 && this.isEffectTimeSelect) { //宣发效果 if(this.isEffectTimeSelect) { //宣发效果
this.timeListEffect = this.timeList this.timeListEffect = this.timeList
this.effectType = 3
this.getEffect() this.getEffect()
} else { //宣发明细 } else { //宣发明细
this.timeListDepart = this.timeList this.timeListDepart = this.timeList
this.departType = 3
this.getDepart() this.getDepart()
} }
@@ -256,7 +258,6 @@
}else { }else {
this.timeList = this.timeListEffect this.timeList = this.timeListEffect
} }
this.effectType = type
if(type == 3) { if(type == 3) {
this.isEffectTimeSelect = true this.isEffectTimeSelect = true
this.dialogDate = true this.dialogDate = true
@@ -322,7 +323,6 @@
}else { }else {
this.timeList = this.timeListDepart this.timeList = this.timeListDepart
} }
this.departType = type
if(type == 3) { if(type == 3) {
this.isEffectTimeSelect = false this.isEffectTimeSelect = false
this.dialogDate = true this.dialogDate = true
@@ -384,7 +384,8 @@
type: 'shadow' type: 'shadow'
}, },
formatter: function(data) { formatter: function(data) {
let name = `<ai-open-data type="userName" :openid="${this.departBarData[data[0].dataIndex].deptId}" class="name"></ai-open-data><br/>宣发任务数：${data[0].data}` var index = data[0].dataIndex
let name = `<ai-open-data type="departmentName" openid="${this.departBarData[index].deptId}" class="name"></ai-open-data><br/>宣发任务数：${this.departBarData[index].taskCount}`
return name return name
} }
}, },