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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-07-27 17:32:58 +08:00
parent 2a8d1f17a5 9d0047e071
commit b8c7e03f29
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@
<div class="top-item__title"> <div class="top-item__title">
<h3>未执行成员</h3> <h3>未执行成员</h3>
</div> </div>
<p>{{ memberInfo.cannotExecuteCount || 0 }}</p> <p>{{ memberInfo.unExecutedCount || 0 }}</p>
</div> </div>
<div class="top-item"> <div class="top-item">
<div class="top-item__title"> <div class="top-item__title">
@@ -105,7 +105,7 @@
<i class="iconfont iconDetails"></i> <i class="iconfont iconDetails"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<p>{{ memberInfo.unExecutedCount || 0 }}</p> <p>{{ memberInfo.cannotExecuteCount || 0 }}</p>
</div> </div>
</div> </div>
<div class="bottom"> <div class="bottom">
@@ -118,7 +118,7 @@
</el-radio-group> </el-radio-group>
<div class="userSelcet" placeholder="请选择创建人"> <div class="userSelcet" placeholder="请选择创建人">
<span v-if="search1.deptartId"><ai-open-data type="departmentName" :openid="search1.deptartId"></ai-open-data></span> <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"> <ai-user-get :instance="instance" @change="e => onUserChange(e, 'search1')" isChooseUnit :isMultiple="false" v-model="user1">
<div class="select-btn">选择</div> <div class="select-btn">选择</div>
</ai-user-get> </ai-user-get>
@@ -162,19 +162,19 @@
<div class="top-item__title"> <div class="top-item__title">
<h3>未送达居民群</h3> <h3>未送达居民群</h3>
</div> </div>
<p>{{ groupInfo.planCount || 0 }}</p> <p>{{ groupInfo.unExecutedCount || 0 }}</p>
</div> </div>
<div class="top-item"> <div class="top-item">
<div class="top-item__title"> <div class="top-item__title">
<h3>已送达居民群</h3> <h3>已送达居民群</h3>
</div> </div>
<p>{{ groupInfo.planCount || 0 }}</p> <p>{{ groupInfo.executedCount || 0 }}</p>
</div> </div>
<div class="top-item"> <div class="top-item">
<div class="top-item__title"> <div class="top-item__title">
<h3>无法送达居民群</h3> <h3>无法送达居民群</h3>
</div> </div>
<p>{{ groupInfo.planCount || 0 }}</p> <p>{{ groupInfo.cannotExecuteCount || 0 }}</p>
</div> </div>
</div> </div>
<div class="bottom"> <div class="bottom">
@@ -187,7 +187,7 @@
</el-radio-group> </el-radio-group>
<div class="userSelcet" placeholder="请选择创建人"> <div class="userSelcet" placeholder="请选择创建人">
<span v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span> <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"> <ai-user-get :instance="instance" @change="e => onUserChange(e, 'search2')" isChooseUnit :isMultiple="false" v-model="user2">
<div class="select-btn">选择</div> <div class="select-btn">选择</div>
</ai-user-get> </ai-user-get>

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

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