diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
index 61d04615..dfdf1d11 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
@@ -14,7 +14,9 @@
-
+
+
+
查询
@@ -252,7 +254,9 @@
key: '',
wstatus:'',
sstatus:'',
- pmUser:''
+ pmUser:'',
+ taskId:'',
+ userid:''
},
xmTaskWorkloads: [],//查询结果
pageInfo:{//分页数据
@@ -353,12 +357,19 @@
if(this.filters.sstatus){
params.sstatuses = this.filters.sstatus;
}
+
+ if(this.filters.userid){
+ params.userid = this.filters.userid;
+ }
+ if(this.filters.taskId){
+ params.taskId = this.filters.taskId;
+ }
if(this.filters.pmUser){
params.cuserid = this.filters.pmUser.userid;
}
if(this.dateRanger){
- params.startTime = this.dateRanger[0];
- params.endTime = this.dateRanger[1];
+ params.startBidDate = this.dateRanger[0];
+ params.endBizDate = this.dateRanger[1];
}
this.load.list = true;
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleList.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleList.vue
index a8dc024d..35aca2b9 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleList.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleList.vue
@@ -4,7 +4,7 @@
- 项目 {{xmTask.projectName}} 任务 {{xmTask.name}}
+ 项目 {{xmTask.projectName}} 任务 {{xmTask.id}} {{xmTask.name}}
预估工时 {{xmTask.budgetWorkload}} h 已登记工时 {{xmTask.actWorkload}} h 工时进度 {{xmTask.budgetWorkload>0?xmTask.actWorkload/xmTask.budgetWorkload*100:0}}%
diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
index 77898c68..9a65a84e 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
@@ -13,6 +13,13 @@
+
+
+
+
+
+
+
@@ -75,6 +82,8 @@
project:null,
startBizDate:'',
endBizDate:'',
+ userid:'',
+ taskId:''
},
dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//查询中...
@@ -97,6 +106,12 @@
params.startBizDate=this.filters.startBizDate;
params.endBizDate=this.filters.endBizDate;
}
+ if(this.filters.userid){
+ params.userid=this.filters.userid
+ }
+ if(this.filters.taskId){
+ params.taskId=this.filters.taskId
+ }
listProjectWorkloadSetDay(params).then(res=>{
this.xmProjectWorkloadSetDays=res.data.tips.isOk?res.data.data:this.xmProjectWorkloadSetDays;
})
diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
index a7e09f1f..00fe9b51 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
@@ -13,6 +13,13 @@
+
+
+
+
+
+
+
@@ -75,6 +82,8 @@
project:null,
startBizDate:'',
endBizDate:'',
+ userid:'',
+ taskId:''
},
dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
load:{ list: false, edit: false, del: false, add: false },//查询中...
@@ -97,6 +106,13 @@
params.startBizDate=this.filters.startBizDate;
params.endBizDate=this.filters.endBizDate;
}
+
+ if(this.filters.userid){
+ params.userid=this.filters.userid
+ }
+ if(this.filters.taskId){
+ params.taskId=this.filters.taskId
+ }
listProjectWorkloadSetMonth(params).then(res=>{
this.xmProjectWorkloadSetMonths=res.data.tips.isOk?res.data.data:this.xmProjectWorkloadSetMonths;
})