From ee75197fc265869a789b0ce9ba41e0dfdf517de6 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, 17 Feb 2022 15:19:15 +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

---
 src/api/xm/core/xmProjectPhase.js             |  5 ++-
 .../core/xmProjectPhase/XmProjectPhaseMng.vue | 43 +++++++++++++------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/api/xm/core/xmProjectPhase.js b/src/api/xm/core/xmProjectPhase.js
index ef705bcd..7846f5a3 100644
--- a/src/api/xm/core/xmProjectPhase.js
+++ b/src/api/xm/core/xmProjectPhase.js
@@ -43,4 +43,7 @@ export const calcSomePhaseActDataFromTasks = params => { return axios.post(`${ba
 export const loadTasksToXmProjectPhase = params => { return axios.post(`${base}/xm/core/xmProjectPhase/loadTasksToXmProjectPhase`, params); };
 
 //修改负责人
-export const setPhaseMngUser = params => { return axios.post(`${base}/xm/core/xmProjectPhase/setPhaseMngUser`, params); };
\ No newline at end of file
+export const setPhaseMngUser = params => { return axios.post(`${base}/xm/core/xmProjectPhase/setPhaseMngUser`, params); };
+
+
+export const calcKeyPaths = params => { return axios.post(`${base}/xm/core/xmProjectPhase/calcKeyPaths`, params); };
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index fe21e617..9b77eaa9 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -1,16 +1,18 @@
 <template>
 	<section class="padding">
 		<el-row v-show="batchEditVisible==false"> 
-			<el-button  class="hidden-md-and-down"  @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总进度数据</el-button> 
-			<el-button   @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
 			<span  v-if="batchEditVisible!=true"   >
 				<el-checkbox v-model="gstcVisible"  >甘特图</el-checkbox>
 				<el-checkbox v-model="filters.milestone" true-label="1" false-label=""  >里程碑</el-checkbox>
-				<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询">
-					<template slot="append">
-						<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases" icon="el-icon-search"></el-button>
-					</template>
+				<el-checkbox v-model="filters.isKeyPath" true-label="1" false-label=""  >关键路径</el-checkbox>
+				<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询"> 
 				</el-input> 
+				<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases" icon="el-icon-search">查询</el-button>
+				<el-button  class="hidden-md-and-down" v-loading="load.list" :disabled="load.list==true" v-on:click="calcKeyPaths" icon="el-icon-search">计算关键路径</el-button>
+				
+				<el-button  class="hidden-md-and-down"  @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总进度数据</el-button> 
+				<el-button   @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
+
 				<!--
 				<el-popover
 					placement="top-start"
@@ -72,7 +74,9 @@
   				<el-table-column prop="phaseName" label="计划名称" min-width="150" show-overflow-tooltip> 
 					 <template slot-scope="scope">   
 						<span>
-							
+							<span v-show="scope.row.milestone=='1'">
+								<i class="el-icon-star-on"></i>
+							</span>
 							<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.seqNo}} &nbsp;&nbsp;  {{scope.row.phaseName}}  
 							</el-link>
 							<font v-for="item in [calcTaskStateByTime(scope.row.beginDate,scope.row.endDate,scope.row.actRate,scope.phaseStatus)]" :key="item.status"><el-tag :type="item.status">{{item.remark}}</el-tag></font> 
@@ -142,7 +146,7 @@
 						<el-button type="text"  @click="showMenu(scope.row)" icon="el-icon-edit">编辑</el-button> 
 						<el-button type="text"  @click="handleDel(scope.row)" icon="el-icon-delete">删除</el-button>  
 						<el-button type="text"  @click="showLog(scope.row)" icon="el-icon-file">日志</el-button> 
-						<el-button type="text"  @click="loadTasksToXmProjectPhase(scope.row)" icon="el-icon-upload2">汇总进度</el-button> 
+						<el-button type="text"  @click="loadTasksToXmProjectPhase([scope.row])" icon="el-icon-upload2">汇总进度</el-button> 
 							<span v-show="scope.row.milestone=='1'">
 								<i class="el-icon-star-on"></i>
 							</span>
@@ -330,7 +334,8 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 			return {
 				filters: {
 					key: '',
-					milestone:''
+					milestone:'',
+					isKeyPath:'',
 				},
 				xmProjectPhases: [],//查询结果
 				pageInfo:{//分页数据
@@ -446,6 +451,10 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 				if(this.filters.milestone){
 					params.milestone=this.filters.milestone
 				}
+				
+				if(this.filters.isKeyPath){
+					params.isKeyPath=this.filters.isKeyPath
+				}
 				this.load.list = true;
 				listXmProjectPhase(params).then((res) => {
 					var tips=res.data.tips;
@@ -877,9 +886,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 				}  
 			},
 			//从任务中汇总进度/实际费用等数据
-			loadTasksToXmProjectPhase:function(phases){
-
-				var phaseIds=phases.map(i=>i.id)
+			loadTasksToXmProjectPhase:function(phases){ 
 				var params={
 					projectId:this.selProject.id,
  				}
@@ -894,6 +901,18 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 					this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); 
 				})
 			},
+			calcKeyPaths(){
+				var params={
+					projectId:this.selProject.id,
+ 				}
+				calcKeyPaths(params).then(res=>{
+					var tips = res.data.tips
+					if(tips.isOk){
+						this.getXmProjectPhases()
+					}
+					this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); 
+				})
+			},
 			getFloatValue(value,digit){
 				if(value==null ||  value=='' || value==undefined){
 					value=0;