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:
liuye
2022-07-28 10:48:33 +08:00
parent e5d1e8eb55 a1b4574bae
commit 19c20944e4
8 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
project/sass/apps/Announce/AppAnnounce/components/Detail.vue
View File

@@ -26,8 +26,7 @@
<div class="user">
<img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
<span><ai-open-data type="userName" :openid="info.createUserId"></ai-open-data></span>
（<span v-if="info.createUserSecondDept"><ai-open-data type="departmentName" :openid="info.createUserSecondDept"></ai-open-data>/</span>
<span><ai-open-data type="departmentName" :openid="info.createUserDept"></ai-open-data></span>）
（<span><ai-open-data type="departmentName" :openid="info.createUserDept"></ai-open-data></span>）
</div>
</ai-info-item>
<ai-info-item label="审批人">
@@ -88,7 +87,7 @@
<div class="top-item__title">
<h3>未执行成员</h3>
</div>
<p>{{ memberInfo.cannotExecuteCount || 0 }}</p>
<p>{{ memberInfo.unExecutedCount || 0 }}</p>
</div>
<div class="top-item">
<div class="top-item__title">
@@ -105,7 +104,7 @@
<i class="iconfont iconDetails"></i>
</el-tooltip>
</div>
<p>{{ memberInfo.unExecutedCount || 0 }}</p>
<p>{{ memberInfo.cannotExecuteCount || 0 }}</p>
</div>
</div>
<div class="bottom">
@@ -118,7 +117,7 @@
</el-radio-group>
<div class="userSelcet" placeholder="请选择创建人">
<span v-if="search1.deptartId"><ai-open-data type="departmentName" :openid="search1.deptartId"></ai-open-data></span>
<span v-else>请选择</span>
<span v-else>请选择部门</span>
<ai-user-get :instance="instance" @change="e => onUserChange(e, 'search1')" isChooseUnit :isMultiple="false" v-model="user1">
<div class="select-btn">选择</div>
</ai-user-get>
@@ -162,19 +161,19 @@
<div class="top-item__title">
<h3>未送达居民群</h3>
</div>
<p>{{ groupInfo.planCount || 0 }}</p>
<p>{{ groupInfo.unExecutedCount || 0 }}</p>
</div>
<div class="top-item">
<div class="top-item__title">
<h3>已送达居民群</h3>
</div>
<p>{{ groupInfo.planCount || 0 }}</p>
<p>{{ groupInfo.executedCount || 0 }}</p>
</div>
<div class="top-item">
<div class="top-item__title">
<h3>无法送达居民群</h3>
</div>
<p>{{ groupInfo.planCount || 0 }}</p>
<p>{{ groupInfo.cannotExecuteCount || 0 }}</p>
</div>
</div>
<div class="bottom">
@@ -187,7 +186,7 @@
</el-radio-group>
<div class="userSelcet" placeholder="请选择创建人">
<span v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
<span v-else>请选择</span>
<span v-else>请选择部门</span>
<ai-user-get :instance="instance" @change="e => onUserChange(e, 'search2')" isChooseUnit :isMultiple="false" v-model="user2">
<div class="select-btn">选择</div>
</ai-user-get>

9
project/sass/apps/Announce/AppAnnounce/components/List.vue
View File

@@ -116,7 +116,7 @@
total: 0,
colConfigs: [
{ prop: 'taskTitle', label: '任务名称' },
{ prop: 'sendType', label: '群发类型', formart: v => v === '0' ? '立即发送' : '定时发送', align: 'center' },
{ prop: 'typeName', label: '群发类型', align: 'center' },
{ slot: 'user', label: '创建人', openType: 'userName', align: 'center' },
{ prop: 'choiceTime', label: '群发时间', align: 'center' },
{
@@ -162,7 +162,12 @@
}
}).then(res => {
if (res.code == 0) {
this.tableData = res.data.records
this.tableData = res.data.records.map(v => {
return {
...v,
typeName: '群发居民群'
}
})
this.total = res.data.total
this.$nextTick(() => {