kubbo/dvcp_v2_wxcp_app
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_wxcp_app into dev

Browse Source
This commit is contained in:
yanran200730
2022-08-01 16:34:12 +08:00
parent ab93caef58 e502506a99
commit 56d35003ed
4 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
View File

@@ -19,8 +19,8 @@
<div>共需<span class="num">{{ item.groupOwnerCount || 0 }}</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
<div>
创建部门：
<!-- <span v-if="item.createUserDept">/<AiOpenData type="departmentName" :openid="item.createUserDept" style="display: inline-block" /></span> -->
<span v-if="item.createUserSecondDept"><AiOpenData type="departmentName" :openid="item.createUserSecondDept" style="display: inline-block" /></span>
<span v-if="item.createUserDept"><AiOpenData type="departmentName" :openid="item.createUserDept" style="display: inline-block" /></span>
<!-- <span v-if="item.createUserSecondDept"><AiOpenData type="departmentName" :openid="item.createUserSecondDept" style="display: inline-block" /></span> -->
</div>
</div>
</div>
@@ -162,7 +162,7 @@ export default {
},
},
onShow() {
document.title = '群发居民群'
document.title = '协同宣发'
this.$dict.load(['mstStatus']).then(() => {
this.list = []
this.current = 1

39
src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
View File

@@ -17,9 +17,10 @@
<div class="content">
<div class="header">
<div class="header_left">
<div>{{ detail.taskTitle }}</div>
<div>{{ detail.taskTitle }} <span :class="detail.status==0? 'status0': detail.status==1? 'status1': detail.status==2? 'status2':
detail.status == 3? 'status3':detail.status==4? 'status4': 'status5'">{{ $dict.getLabel('mstStatus', detail.status) }}</span></div>
<div>
创建时间: <span>{{ createTime }}</span>
创建时间: <span>{{ createTime }}</span>
</div>
</div>
<div class="header_right" @click="toDetail">查看详情</div>
@@ -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;

15
src/project/saas/AppCooperationPropaganda/detail.vue
View File

@@ -16,14 +16,16 @@
<div class="item" v-if="data.enableExamine == 1">
<span>审批人</span>
<span>
<AiOpenData v-for="(item, index) in approver" :key="index" type="userName" :openId="item.examineUserId"></AiOpenData>
<span v-for="(item, index) in approver" :key="index" style="color: #333;">
<AiOpenData type="userName" :openId="item.examineUserId" style="display: inline-block"></AiOpenData><span v-if="approver.length>1">、</span>
</span>
</span>
</div>
<div class="item">
<span>所在部门</span>
<span style="display: flex;">
<!-- <div v-if="data.createUserDept">/<AiOpenData type="departmentName" :openId="data.createUserDept" style="display: inline-block;"></AiOpenData></div> -->
<div v-if="data.createUserSecondDept"><AiOpenData type="departmentName" :openId="data.createUserSecondDept" style="display: inline-block"></AiOpenData></div>
<div v-if="data.createUserDept"><AiOpenData type="departmentName" :openId="data.createUserDept" style="display: inline-block;"></AiOpenData></div>
<!-- <div v-if="data.createUserSecondDept"><AiOpenData type="departmentName" :openId="data.createUserSecondDept" style="display: inline-block"></AiOpenData></div> -->
</span>
</div>
<div class="item">
@@ -39,7 +41,8 @@
<div class="info">
<div class="scope">
<span>群发范围</span>
<span>按条件筛选的全部{{ data.receiveGroupCount || 0}}个客户群</span>
<span v-if="data.sendScope==0">全部{{ data.receiveGroupCount || 0}}个居民群</span>
<span v-if="data.sendScope==1 || data.sendScope==2">按条件筛选的{{ data.receiveGroupCount || 0}}个居民群</span>
</div>
<div class="content">
<p>群发内容</p>
@@ -78,7 +81,7 @@
</div>
</div>
<div class="btn" v-if="data.status==0 && data.haveExaminPower">
<div class="refuse" @click="refuseBtn">拒绝通过</div>
<div class="refuse" @click="refuseBtn">审核拒绝</div>
<div class="pass" @click="passBtn">审核通过</div>
</div>
</div>
@@ -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
}

2
src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
View File

@@ -566,7 +566,7 @@ export default {
})
this.getColumnarEcharts(xData, yData)
})
},1000)
}, 2000)
}
}
});