|
|
@@ -242,7 +242,7 @@
|
|
|
<!--列表-->
|
|
|
<el-table v-if="displayTable" :data="taskDataList"
|
|
|
:header-cell-style="{'font-weight':'normal'}" border
|
|
|
- highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;margin-top:10px;" @row-click="taskLineClick">
|
|
|
+ highlight-current-row v-loading="listLoading" :height="tableHeight - 20" style="width: 100%;margin-top:10px;" @row-click="taskLineClick">
|
|
|
<el-table-column fixed :label="$t('wan-cheng')" width="50">
|
|
|
<template slot-scope="scope">
|
|
|
<el-checkbox :disabled="scope.row.taskStatus==2" v-model="scope.row.isFinish" size="large" class="cb"
|
|
|
@@ -322,6 +322,17 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
+ <el-col :span="24" class="toolbar" v-if="displayTable">
|
|
|
+ <el-pagination
|
|
|
+ @size-change="taskListSizeChange"
|
|
|
+ @current-change="taskListPageChange"
|
|
|
+ :page-sizes="[20 , 50 , 80 , 100]"
|
|
|
+ :page-size="taskListSize"
|
|
|
+ layout="total, sizes, prev, pager, next"
|
|
|
+ :total="taskListTotal"
|
|
|
+ style="float:right;"
|
|
|
+ ></el-pagination>
|
|
|
+ </el-col>
|
|
|
</el-main>
|
|
|
</el-container>
|
|
|
</el-tab-pane>
|
|
|
@@ -1292,7 +1303,11 @@
|
|
|
groupDetailData: {},
|
|
|
groupDetailTil: '',
|
|
|
setTemplateData: {},
|
|
|
- setTemplateDialog: false
|
|
|
+ setTemplateDialog: false,
|
|
|
+
|
|
|
+ taskListPage: 1,
|
|
|
+ taskListSize: 20,
|
|
|
+ taskListTotal: 0
|
|
|
};
|
|
|
|
|
|
},
|
|
|
@@ -2313,19 +2328,30 @@
|
|
|
this.getViewTaskList();
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
+ taskListPageChange(val){
|
|
|
+ this.taskListPage = val
|
|
|
+ this.getViewTaskList()
|
|
|
+ },
|
|
|
+ taskListSizeChange(val){
|
|
|
+ this.taskListSize = val
|
|
|
+ this.taskListPage = 1
|
|
|
+ this.getViewTaskList()
|
|
|
+ },
|
|
|
//加载视图任务列表
|
|
|
getViewTaskList() {
|
|
|
- this.http.post('/task/list',{projectId: this.curProjectId, viewId: this.selectedGroup.id, order: this.order, isDesc: this.isDesc},
|
|
|
+ this.http.post('/task/list',{projectId: this.curProjectId, viewId: this.selectedGroup.id, order: this.order, isDesc: this.isDesc,pageIndex: this.taskListPage,pageSize:this.taskListSize},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
// this.taskDataList = res.data;
|
|
|
// console.log(this.taskDataList, '任务视图的列表')
|
|
|
- for(var i in res.data) {
|
|
|
- if(res.data[i].executorName != null) {
|
|
|
- res.data[i].executorName = res.data[i].executorName.split(',')
|
|
|
+ for(var i in res.data.records) {
|
|
|
+ if(res.data.records[i].executorName != null) {
|
|
|
+ res.data.records[i].executorName = res.data.records[i].executorName.split(',')
|
|
|
}
|
|
|
}
|
|
|
- this.taskDataList = res.data;
|
|
|
+ this.taskDataList = res.data.records;
|
|
|
+ this.taskListTotal = res.data.total
|
|
|
console.log(this.taskDataList, '任务视图的列表')
|
|
|
this.taskDataList.forEach(t=>{
|
|
|
t.isFinish = t.taskStatus==1?true:false;
|
|
|
@@ -2746,6 +2772,7 @@
|
|
|
this.selectedGroup = this.viewList.filter(g=>g.id == index)[0];
|
|
|
this.getViewTaskList();
|
|
|
this.displayTable = true;
|
|
|
+ this.taskListPage = 1
|
|
|
} ,
|
|
|
groupChange(index, indexPath) {
|
|
|
console.log('店家了')
|
ggooalice