|
|
@@ -100,6 +100,11 @@
|
|
|
<el-select v-if="ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11" v-model="userId" placeholder="请选择人员" @change="selcts()" clearable filterable size="small" style="margin-left:10px;width:150px">
|
|
|
<el-option v-for="(item, index) in selUserList" :key="index" :label="item.name" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
+
|
|
|
+ <!-- 项目阶段筛选 -->
|
|
|
+ <el-select v-if="ins == 5" multiple v-model="stageNames" @visible-change="visibleSelcts" @clear="visibleSelcts(false)" clearable size="small" filterable collapse-tags placeholder="请选择阶段" style="margin-left:10px;">
|
|
|
+ <el-option v-for="item in firstStages" :key="item" :label="item" :value="item"></el-option>
|
|
|
+ </el-select>
|
|
|
</div>
|
|
|
<p style="float: right;margin-right: 25px;" ><el-button type="primary" @click="exportExcel" size="mini">报表导出</el-button></p>
|
|
|
</div>
|
|
|
@@ -359,7 +364,7 @@
|
|
|
</el-table>
|
|
|
<el-table v-if="ins == 12" border :data="groupWorktimeList.right" key="12"
|
|
|
highlight-current-row v-loading="listLoading" :height="tableHeight"
|
|
|
- style="width: 66%;float:right;" ref="table">
|
|
|
+ style="width: 66%;float:right;" ref="grouptable">
|
|
|
<el-table-column label="按项目统计" header-align="center">
|
|
|
<el-table-column prop="projectCode" label="项目编号" min-width="75"></el-table-column>
|
|
|
<el-table-column prop="projectName" label="项目名称" min-width="125"></el-table-column>
|
|
|
@@ -673,6 +678,8 @@ export default {
|
|
|
detailList:[],
|
|
|
detailVisible: false,
|
|
|
stages:[],
|
|
|
+ firstStages: [],
|
|
|
+ stageNames: [],
|
|
|
addFormVisible:false,
|
|
|
title:'',
|
|
|
childrenList:[],
|
|
|
@@ -1062,6 +1069,14 @@ export default {
|
|
|
} else if (this.ins == 5) {
|
|
|
fName = "项目阶段工时报表.xls";
|
|
|
url += "/exportProjectStagesCost";
|
|
|
+ if(this.stageNames.length){
|
|
|
+ let stagestr = ''
|
|
|
+ for(let i in this.stageNames){
|
|
|
+ stagestr += this.stageNames[i] + ','
|
|
|
+ }
|
|
|
+ stagestr = stagestr.substring(0,stagestr.length - 1)
|
|
|
+ sl.stageNames = stagestr
|
|
|
+ }
|
|
|
} else if (this.ins == 6) {
|
|
|
fName = "加班情况统计报表.xls";
|
|
|
url += "/exportOvertimeList";
|
|
|
@@ -1352,20 +1367,43 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
+ visibleSelcts(e){
|
|
|
+ console.log('show show way',e);
|
|
|
+ if(!e){
|
|
|
+ this.getProjectStages(true)
|
|
|
+ }
|
|
|
+ },
|
|
|
//获取项目阶段的汇总工时
|
|
|
- getProjectStages() {
|
|
|
+ getProjectStages(e) {
|
|
|
+
|
|
|
this.listLoading = true;
|
|
|
- this.http.post('/project/getProjectStagesCost', {
|
|
|
- pageIndex: this.page,
|
|
|
- pageSize: this.size,
|
|
|
- projectId: this.proJuctId
|
|
|
- },
|
|
|
+ let parameter = {
|
|
|
+ pageIndex: this.page,
|
|
|
+ pageSize: this.size,
|
|
|
+ projectId: this.proJuctId
|
|
|
+ }
|
|
|
+ if(!e){
|
|
|
+ this.stageNames = []
|
|
|
+ }else{
|
|
|
+ if(this.stageNames.length){
|
|
|
+ let stagestr = ''
|
|
|
+ for(let i in this.stageNames){
|
|
|
+ stagestr += this.stageNames[i] + ','
|
|
|
+ }
|
|
|
+ stagestr = stagestr.substring(0,stagestr.length - 1)
|
|
|
+ parameter.stageNames = stagestr
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.http.post('/project/getProjectStagesCost', parameter,
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
this.list5 = res.data.records;
|
|
|
// console.log(this.list);
|
|
|
this.total = res.data.total;
|
|
|
this.stages = res.data.stages;
|
|
|
+ if(!e){
|
|
|
+ this.firstStages = res.data.stages;
|
|
|
+ }
|
|
|
this.listLoading = false;
|
|
|
this.$nextTick(()=>{this.$refs.table.doLayout()})
|
|
|
} else {
|
ggooalice