From 697ba6f541a50022a75322f55ad42bf0e05a9461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 7 Apr 2022 21:31:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/xmTaskWorkload/XmTaskWorkloadMng.vue | 19 +++++++++++++++----
 .../XmTaskWorkloadSimpleList.vue              |  2 +-
 .../rpt/project/projectWorkloadSetDayList.vue | 15 +++++++++++++++
 .../project/projectWorkloadSetMonthList.vue   | 16 ++++++++++++++++
 4 files changed, 47 insertions(+), 5 deletions(-)

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 @@
         <el-option label="已通过" value="3"></el-option>
         <el-option label="已结算" value="4"></el-option>
       </el-select>
-			<el-input v-model="filters.key" style="width: 25%;" clearable placeholder="模糊查询:员工ID/员工名称/项目ID/任务编号"></el-input>
+			<el-input v-model="filters.key" style="width: 150px;" clearable placeholder="模糊查询员工名称"></el-input>
+			<el-input v-model="filters.userid" style="width: 150px;" clearable placeholder="员工编号"></el-input>
+			<el-input v-model="filters.taskId" style="width: 150px;" clearable placeholder="任务编号"></el-input>
 			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskWorkloads" icon="el-icon-search">查询</el-button>
       <el-popover placement="top-start" title="更多查询条件" width="400" v-model="moreVisible" trigger="manual" >
         <el-row>
@@ -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 @@
 			<!--列表 XmTaskWorkload 工时登记表-->
 			
 			<el-row>
-				项目 &nbsp;<font>{{xmTask.projectName}}</font>  &nbsp;&nbsp;任务 &nbsp;<font>{{xmTask.name}}</font>
+				项目 &nbsp;<font>{{xmTask.projectName}}</font>  &nbsp;&nbsp;任务 &nbsp;<font>{{xmTask.id}}&nbsp;{{xmTask.name}}</font>
 			</el-row>
 			<el-row>
 				预估工时 &nbsp;<el-tag>{{xmTask.budgetWorkload}} &nbsp;h</el-tag>  &nbsp;&nbsp;已登记工时 &nbsp;<el-tag>{{xmTask.actWorkload}}&nbsp;h</el-tag> &nbsp;&nbsp;工时进度 &nbsp;<el-tag type="warning">{{xmTask.budgetWorkload>0?xmTask.actWorkload/xmTask.budgetWorkload*100:0}}%&nbsp;</el-tag>
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 @@
 					<el-form-item label="归属项目" v-if="!xmProject">
 							 <xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
   					</el-form-item>  
+					<el-form-item label="人员编号">
+							<el-input v-model="filters.userid"></el-input>
+  					</el-form-item>  
+					  
+					<el-form-item label="任务编号编号">
+							<el-input v-model="filters.taskId"></el-input>
+  					</el-form-item>  
 					<el-form-item label="日期区间">
 						<br>
 							<date-range v-model="filters"   value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></date-range>
@@ -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 @@
 					<el-form-item label="归属项目" v-if="!xmProject">
 							 <xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
   					</el-form-item>  
+					<el-form-item label="人员编号">
+							<el-input v-model="filters.userid"></el-input>
+  					</el-form-item>  
+					  
+					<el-form-item label="任务编号编号">
+							<el-input v-model="filters.taskId"></el-input>
+  					</el-form-item>  
 					<el-form-item label="日期区间">
 						<br>
 							<date-range v-model="filters"   value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></date-range>
@@ -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;
 				})