|
|
@@ -75,6 +75,11 @@
|
|
|
<el-table-column label="项目编号" prop="projectCode" width="160"></el-table-column>
|
|
|
<el-table-column label="项目名称" prop="projectName" min-width="240"></el-table-column>
|
|
|
<el-table-column label="近七日活跃人员" prop="activeUsers" min-width="240"></el-table-column>
|
|
|
+ <el-table-column label="开始时间 - 结束时间" min-width="240">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{scope.row.startDate ? scope.row.startDate + ' ~ ' + scope.row.endDate : ''}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="人员需求" prop="membReq" min-width="280"></el-table-column>
|
|
|
<el-table-column label="任务需求" prop="taskReq" min-width="280"></el-table-column>
|
|
|
<el-table-column label="操作" width="120" align="center">
|
|
|
@@ -460,8 +465,10 @@ export default {
|
|
|
let parameter = {
|
|
|
pageIndex: this.pageIndex,
|
|
|
pageSize: this.pageSize,
|
|
|
- reStartDate: this.reqpar2[0],
|
|
|
- reEndDate: this.reqpar2[1]
|
|
|
+ }
|
|
|
+ if(this.reqpar2 != [] && this.reqpar2 != null){
|
|
|
+ parameter.reStartDate = this.reqpar2[0],
|
|
|
+ parameter.reEndDate = this.reqpar2[1]
|
|
|
}
|
|
|
if(this.valuex != ''){
|
|
|
parameter.projectId = this.valuex
|
yurk