|
|
@@ -1104,7 +1104,8 @@
|
|
|
</el-table>
|
|
|
|
|
|
<!-- 分组耗用进度表 -->
|
|
|
- <el-table v-if="ins == 24" :key="24" border :data="isbeCustomReport.consumptionSchedule" highlight-current-row v-loading="listLoading" :height="(+tableHeight + 50) - 1" style="width: 100%;" :span-method="objectSpanMethod">
|
|
|
+ <el-table v-if="ins == 24" :key="24" border :data="isbeCustomReport.consumptionSchedule" highlight-current-row v-loading="listLoading" :height="(+tableHeight - 0) - 1" style="width: 100%;" :span-method="objectSpanMethod">
|
|
|
+ <el-table-column align="center" prop="projectName" label="项目名称" min-width="200"></el-table-column>
|
|
|
<el-table-column align="center" prop="department_name" label="负责部门" min-width="150">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
@@ -1220,7 +1221,7 @@
|
|
|
<el-table-column align="center" prop="workTime" label="实际工时" min-width="150"></el-table-column>
|
|
|
</el-table>
|
|
|
<!--工具条-->
|
|
|
- <el-col :span="24" class="toolbar" v-if="ins != 6 && ins != 20 && ins != 21 && ins != 24">
|
|
|
+ <el-col :span="24" class="toolbar" v-if="ins != 6 && ins != 20 && ins != 21">
|
|
|
<el-pagination
|
|
|
v-if="ins == 12"
|
|
|
@size-change="groupSizeChange"
|
|
|
@@ -3779,13 +3780,16 @@ export default {
|
|
|
let parameter = {
|
|
|
startDate: this.rangeDatas[0],
|
|
|
endDate: this.rangeDatas[1],
|
|
|
+ pageIndex: this.page,
|
|
|
+ pageSize: this.size,
|
|
|
}
|
|
|
this.listLoading = true
|
|
|
let { data } = await this.postData('/project/groupExpendProcessList', {
|
|
|
...parameter
|
|
|
})
|
|
|
this.resetMerge()
|
|
|
- this.rowspan(this.listArr1, this.listPosition1, 'corpwxDeptId', data.record)
|
|
|
+ this.rowspan(this.listArr1, this.listPosition1, 'projectId', data.record)
|
|
|
+ this.rowspan(this.listArr2, this.listPosition2, 'corpwxDeptId', data.record)
|
|
|
this.isbeCustomReport.consumptionSchedule = data.record
|
|
|
this.total = data.total
|
|
|
this.listLoading = false
|
Lijy