diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue index 1f7ca630..aed38e9a 100644 --- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -19,8 +19,8 @@
共需{{ item.groupOwnerCount || 0 }}名成员完成群发,目前已完成{{ item.completionRate || 0 }}%
创建部门: - - + +
@@ -162,7 +162,7 @@ export default { }, }, onShow() { - document.title = '群发居民群' + document.title = '协同宣发' this.$dict.load(['mstStatus']).then(() => { this.list = [] this.current = 1 diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue index e730756d..670e0ce6 100644 --- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue +++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue @@ -17,9 +17,10 @@
-
{{ detail.taskTitle }}
+
{{ detail.taskTitle }} {{ $dict.getLabel('mstStatus', detail.status) }}
- 创建时间: {{ createTime }} + 创建时间: {{ createTime }}
查看详情
@@ -344,6 +345,7 @@ export default { }, onShow() { document.title = "群发居民群统计"; + this.$dict.load("mstStatus") this.getStatistics(); this.getDetail(); }, @@ -397,7 +399,7 @@ export default { } .header { - height: 160px; + // height: 160px; padding: 32px; box-sizing: border-box; background: #fff; @@ -410,6 +412,37 @@ export default { font-size: 32px; font-weight: 600; margin-bottom: 10px; + + span { + display: inline-block; + padding: 0 8px; + border: 1px solid; + border-radius: 6px; + font-size: 26px; + font-weight: normal; + margin-left: 8px; + } + .status0 { + color: #FFA938 !important; + } + .status1 { + color: #FF6758 !important; + } + .status2 { + color: #3399FF !important; + } + .status3 { + color: #FF6758 !important; + } + .status4 { + color: #3399FF !important; + } + .status5 { + color: #1CCEB0 !important; + } + .status6 { + color: #666666 !important; + } } div:last-child { color: #666666; diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index bec83d54..09e70f6a 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -16,14 +16,16 @@
审批人 - + + +
所在部门 - -
+
+
@@ -39,7 +41,8 @@
群发范围 - 按条件筛选的全部{{ data.receiveGroupCount || 0}}个客户群 + 全部{{ data.receiveGroupCount || 0}}个居民群 + 按条件筛选的{{ data.receiveGroupCount || 0}}个居民群

群发内容

@@ -78,7 +81,7 @@
-
拒绝通过
+
审核拒绝
审核通过
@@ -120,7 +123,7 @@ export default { this.webpage = res.data.contents.filter(v=> v.msgType == 4) this.miniapp = res.data.contents.filter(v=> v.msgType == 5) if(res.data.status==1) { // 拒绝 - this.approver = res.data.examines.filter(e=> e.examineUserId == user.openId) + this.approver = res.data.examines.filter(e=> e.examineStatus == 2) } else { // 通过 this.approver = res.data.examines } diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index f183dcbb..7104915f 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -566,7 +566,7 @@ export default { }) this.getColumnarEcharts(xData, yData) }) - },1000) + }, 2000) } } });