优化

src/router/routes_xm.js

@@ -17,10 +17,7 @@ export default {
       children: [
         { path: 'xmProject/XmProjectAllMng', component: _import('xm/core/xmProject/XmProjectAllMng'), name: 'xmProjectAllMng', meta: { title: '项目总览' }},
         { path: 'xmProject/XmProjectMng', component: _import('xm/core/xmProject/XmProjectMng'), name: 'xmProjectMng', meta: { title: '项目(我的)' }},
-        { path: 'xmProjectState/XmProjectStateMng', component: _import('xm/core/xmProjectState/XmProjectStateMng'), name: 'XmProjectStateMng', meta: { title: '项目统计' }},
-        { path: 'xmBranchState/XmBranchStateMng', component: _import('xm/core/xmBranchState/XmBranchStateMng'), name: 'XmBranchStateMng', meta: { title: '所有项目汇总' }},
         { path: 'xmProject/XmProjectRecycle', component: _import('xm/core/xmProject/XmProjectRecycle'), name: 'XmProjectRecycle', meta: { title: '项目回收站' }},
-
         { path: 'xmRecord/XmRecord', component: _import('xm/core/xmRecord/XmRecord'), name: 'XmRecord', meta: { title: '项目动态' }},
         { path: 'xmProject/XmProjectTplMng', component: _import('xm/core/xmProject/XmProjectTplMng'), name: 'XmProjectTplMng', meta: { title: '项目模板' }},
         { path: 'xmEnvList/XmEnvListMng', component: _import('xm/core/xmEnvList/XmEnvListMng'), name: 'XmEnvListMng', meta: { title: '环境清单' }},
@@ -73,8 +70,7 @@ export default {
         { path: 'xmTask/XmTaskCenter', component: _import('xm/core/xmTask/XmTaskCenter'), name: 'xmTaskCenter', meta: { title: '任务大厅' }},
         { path: 'xmTask/XmMyTaskCenter', component: _import('xm/core/xmTask/XmMyTaskCenter'), name: 'xmMyTaskCenter', meta: { title: '任务(我的)' }},
         { path: 'xmTaskExecuser/XmTaskExecuserMng', component: _import('xm/core/xmTaskExecuser/XmTaskExecuserMng'), name: 'XmTaskExecuserMng', meta: { title: '候选人管理' }},
-        { path: 'xmTask/XmTaskCenterForProduct', component: _import('xm/core/xmTask/XmTaskCenterForProduct'), name: 'XmTaskCenterForProduct', meta: { title: '产品任务',hidden:true }},
-
+ 
       ]
     },
     {
@@ -149,9 +145,8 @@ export default {
       },
       // leaf: true,//只有一个节点
       children: [
-         { path: 'xmIteration/XmIterationMng', component: _import('xm/core/xmIteration/XmIterationMng'), name: 'XmIterationMng', meta: { title: '迭代管理' }},
-        { path: 'xmIterationMenu/XmIterationMenuMng', component: _import('xm/core/xmIterationMenu/XmIterationMenuMng'), name: 'XmIterationMenuMng', meta: { title: '需求迭代' }},
-      ]
+         { path: 'xmIteration/XmIterationMng', component: _import('xm/core/xmIteration/XmIterationMng'), name: 'XmIterationMng', meta: { title: '迭代管理',icon: 'flow' }},
+       ]
     },
     {
       path: '/xm/core',

src/views/xm/core/xmTask/XmTaskMng.vue

@@ -7,7 +7,7 @@
         :class="{ 'flex-box': displayType == 'agil' }"
       >
         <el-row> 
-            <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
+            <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
               
 					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable>
 									<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.taskState" :key="index"></el-option> 
@@ -955,24 +955,7 @@ export default {
       } else {
         return null;
       }
-    },
-    curUser() {
-      return {
-        id: this.userInfo.userid,
-        name: this.userInfo.username,
-      };
-    },
-    progress_disable() {
-      if (
-        (this.isEmpty(this.editForm.preTaskid) ||
-          this.editForm.prerate == "100") &&
-        this.isEmpty(this.editForm.children)
-      ) {
-        return false;
-      } else {
-        return true;
-      }
-    },
+    }, 
     taskTime() {
       if (this.budgetDateRanger.length > 1) {
         const s = new Date(this.budgetDateRanger[0]);
@@ -1283,7 +1266,7 @@ export default {
           this.$notify.warning("请先选中项目")
           return;
         }
-      }
+      } 
       //params.ptype=this.ptype
 
       getTask(params)

src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue

@@ -4,8 +4,13 @@
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="任务名称、用户姓名模糊查询" clearable></el-input>
 			<el-input v-model="filters.taskId" style="width:150px;" placeholder="任务编号查询" clearable></el-input>
 			<el-input v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input>
- 			<el-input v-model="filters.execUserBranchId" style="width: 150px;" placeholder="归属公司" clearable></el-input>
-			
+ 			<el-input v-model="filters.execUserBranchId" style="width: 150px;" placeholder="归属公司" clearable></el-input> 
+ 			<el-select v-model="filters.status"   placeholder="候选状态" clearable>
+				 <el-option v-for="(item,index) in dicts.projectTaskExecuserStatus" :value="item.id" :label="item.name" :key="index"></el-option>
+			 </el-select>
+ 			<el-select v-model="filters.taskState"   placeholder="任务状态" clearable>
+				 <el-option v-for="(item,index) in dicts.taskState" :value="item.id" :label="item.name" :key="index"></el-option>
+			 </el-select>
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button> 
 			<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  -->
 		</el-row>
@@ -204,6 +209,8 @@
 					execUserBranchId:'',
 					taskId:'',
 					projectId:'', 
+					status:'',
+					taskState:'',
 				},
 				xmTaskExecusers: [],//查询结果
 				pageInfo:{//分页数据
@@ -315,6 +322,13 @@
 				if(this.filters.execUserBranchId){
 					params.execUserBranchId=this.filters.execUserBranchId
 				}
+				
+				if(this.filters.taskState){
+					params.taskState=this.filters.taskState
+				}
+				if(this.filters.status){
+					params.status=this.filters.status
+				}
 				listXmTaskExecuserWithTask(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){