|
@@ -350,7 +350,7 @@
|
|
<el-table v-if="ins == 12" border :data="groupWorktimeList" key="12"
|
|
<el-table v-if="ins == 12" border :data="groupWorktimeList" key="12"
|
|
highlight-current-row v-loading="listLoading" :height="tableHeight"
|
|
highlight-current-row v-loading="listLoading" :height="tableHeight"
|
|
style="width: 100%;" ref="table">
|
|
style="width: 100%;" ref="table">
|
|
- <el-table-column label="按任务分组统计" header-align="center">
|
|
|
|
|
|
+ <el-table-column :label="'按任务分组统计(共' + groupListTotal.left + '条)'" header-align="center">
|
|
<el-table-column prop="leftgroupName" label="分组名称" min-width="100"></el-table-column>
|
|
<el-table-column prop="leftgroupName" label="分组名称" min-width="100"></el-table-column>
|
|
<el-table-column prop="leftworkingTime" label="工时(h)" min-width="50" align="right" header-align="center">
|
|
<el-table-column prop="leftworkingTime" label="工时(h)" min-width="50" align="right" header-align="center">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
@@ -359,7 +359,7 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column width="2" class-name="dividingLine" label-class-name="dividingLine"></el-table-column>
|
|
<el-table-column width="2" class-name="dividingLine" label-class-name="dividingLine"></el-table-column>
|
|
- <el-table-column label="按项目统计" header-align="center">
|
|
|
|
|
|
+ <el-table-column :label="'按项目统计(共' + groupListTotal.right + '条)'" header-align="center">
|
|
<el-table-column prop="rightprojectCode" label="项目编号" min-width="100"></el-table-column>
|
|
<el-table-column prop="rightprojectCode" label="项目编号" min-width="100"></el-table-column>
|
|
<el-table-column prop="rightprojectName" label="项目名称" min-width="100"></el-table-column>
|
|
<el-table-column prop="rightprojectName" label="项目名称" min-width="100"></el-table-column>
|
|
<el-table-column prop="rightgroupName" label="分组名称" min-width="100"></el-table-column>
|
|
<el-table-column prop="rightgroupName" label="分组名称" min-width="100"></el-table-column>
|
|
@@ -732,6 +732,10 @@ export default {
|
|
personnelList: [], //'人员工时统计表'
|
|
personnelList: [], //'人员工时统计表'
|
|
groupWorktimeList: [], //任务分组工时表
|
|
groupWorktimeList: [], //任务分组工时表
|
|
groupWorktimeAll: [],
|
|
groupWorktimeAll: [],
|
|
|
|
+ groupListTotal:{
|
|
|
|
+ left: 0,
|
|
|
|
+ right: 0
|
|
|
|
+ }
|
|
};
|
|
};
|
|
},
|
|
},
|
|
computed: {},
|
|
computed: {},
|
|
@@ -1471,6 +1475,7 @@ export default {
|
|
if(this.proJuctId){
|
|
if(this.proJuctId){
|
|
parameter.projectId = this.proJuctId
|
|
parameter.projectId = this.proJuctId
|
|
}
|
|
}
|
|
|
|
+ this.groupListTotal.right = 0
|
|
this.listLoading = true
|
|
this.listLoading = true
|
|
this.http.post('/project/getTimeCostByGroup',parameter,
|
|
this.http.post('/project/getTimeCostByGroup',parameter,
|
|
res => {
|
|
res => {
|
|
@@ -1478,6 +1483,7 @@ export default {
|
|
if(res.code == 'ok'){
|
|
if(res.code == 'ok'){
|
|
this.groupWorktimeList = []
|
|
this.groupWorktimeList = []
|
|
let list = res.data.records
|
|
let list = res.data.records
|
|
|
|
+ this.groupListTotal.right = res.code.total
|
|
this.groupWorktimeAll.length > res.data.total ? this.total = this.groupWorktimeAll.length : this.total = res.data.total
|
|
this.groupWorktimeAll.length > res.data.total ? this.total = this.groupWorktimeAll.length : this.total = res.data.total
|
|
let forlength = 0
|
|
let forlength = 0
|
|
if(this.groupWorktimeAll.length - this.size*(this.page-1) < list.length){
|
|
if(this.groupWorktimeAll.length - this.size*(this.page-1) < list.length){
|
|
@@ -1518,6 +1524,7 @@ export default {
|
|
pageIndex: 1,
|
|
pageIndex: 1,
|
|
pageSize: 9999
|
|
pageSize: 9999
|
|
}
|
|
}
|
|
|
|
+ this.groupListTotal.left = 0
|
|
this.http.post('/project/getTimeCostByGroup',parameter,
|
|
this.http.post('/project/getTimeCostByGroup',parameter,
|
|
res => {
|
|
res => {
|
|
if(res.code == 'ok'){
|
|
if(res.code == 'ok'){
|
|
@@ -1535,6 +1542,7 @@ export default {
|
|
this.groupWorktimeAll.push(allList[m])
|
|
this.groupWorktimeAll.push(allList[m])
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ this.groupListTotal.left = this.groupWorktimeAll.length
|
|
}else {
|
|
}else {
|
|
this.$message({
|
|
this.$message({
|
|
message: res.msg,
|
|
message: res.msg,
|