diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index e389605c..96f9415c 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -225,9 +225,7 @@
 				<el-button v-if="opType==='add'" v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
 				<span v-if="opType!=='add'" style="float:right;">
  					<el-button icon="el-icon-star-on"  type="success"  @click="handleCommand({type:'sendToProcessApprova',data:editForm,bizKey:'xm_project_start_approva'})">立项申请</el-button>
-					<el-button icon="el-icon-success"  type="success" @click="handleCommand({type:'sendToProcessApprova',data:editForm,bizKey:'xm_project_over_approva'})">结项申请</el-button>
- 					<el-button icon="el-icon-video-pause" type="info"   @click="handleCommand({type:'sendToProcessApprova',data:editForm,bizKey:'xm_project_pause_approva'})">项目暂停申请</el-button> 
-					<el-button icon="el-icon-video-play"  type="primary" @click="handleCommand({type:'sendToProcessApprova',data:editForm,bizKey:'xm_project_restart_approva'})">项目重新启动申请</el-button>
+					<el-button icon="el-icon-success"  type="success" @click="handleCommand({type:'sendToProcessApprova',data:editForm,bizKey:'xm_project_over_approva'})">结项申请</el-button> 
 				</span>
 		</el-row>
 		
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 919741e1..90005f8f 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -199,7 +199,7 @@
 						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='效能'">效能分析</el-button> 
 						<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','4')">暂停项目</el-button>
 						<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','5')">结项申请</el-button>
-						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='产品'">变更申请</el-button>
+						<el-button class="step-btn" type="warning" size="mini"   plain @click="projectChangeRequire()">变更申请</el-button>
 					</span>
 					<span v-if="selProject.status!=i.id">
 						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='迭代'">迭代管理</el-button>
@@ -209,7 +209,7 @@
 						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='每月工时'">每月工时</el-button> 
 						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='效能'">效能分析</el-button> 
 						<el-button v-if="selProject.status<i.id" class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','5')">结项申请</el-button>
-						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='产品'">变更申请</el-button>
+						<el-button class="step-btn" type="warning" size="mini"   plain @click="showDetail()">变更申请</el-button>
 					</span> 
 			   </el-row>
                <el-row v-else-if="i.id=='4'"><!--暂停中-->
@@ -217,13 +217,13 @@
 						<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','3')">重新激活</el-button>
 					</span>  
 			   </el-row>
-               <el-row v-else-if="i.id=='5'"><!--结项中-->
+        <el-row v-else-if="i.id=='5'"><!--结项中-->
 			   		<span v-if="selProject.status==i.id"> 
-						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='产品'">结项审批</el-button>
-					</span>
-					<span v-if="selProject.status!=i.id">
- 						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='迭代'">结项审批</el-button>  
-					</span>  
+              <el-button class="step-btn" type="warning" size="mini"   plain @click="showCurrFlow()">结项审批</el-button>
+            </span>
+            <span v-if="selProject.status!=i.id">
+              <el-button class="step-btn" type="warning" size="mini"   plain @click="showHisFlow()">结项审批</el-button>  
+            </span>  
 			   </el-row>
                <el-row v-else-if="i.id=='6'"><!--已结项--> 
 			   		<span v-if="selProject.status==i.id"> 
@@ -258,6 +258,7 @@
           :sel-project="selProject"
           @submit="afterEditSubmit"
           @edit-fields="onEditFields"
+          ref="项目概览"
         ></xm-project-overview-complex>
         <xm-iteration-for-link-complex
           v-if="infotype == '迭代'"
@@ -777,7 +778,16 @@ export default {
 			onEditFields(row){ 
 				Object.assign(this.selProject,row)
 				this.$emit("edit-fields",row);
-			}
+			},
+      showCurrFlow(){
+        this.$refs['项目概览'].showPanelName='currFlow'
+      },
+      showHisFlow(){
+        this.$refs['项目概览'].showPanelName='hisFlow'
+      },
+      showDetail(){
+        this.$refs['项目概览'].showPanelName='detail'
+      }
   }, //end methods
   components: {
     xmTaskMng,
diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
index 2b762a1b..570e09c3 100644
--- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="page-container  padding-left padding-right">
-      <el-menu mode="horizontal" default-active="overview"  @select="onMenuToolBarSelect">
+      <el-menu mode="horizontal" :default-active="showPanelName"  @select="onMenuToolBarSelect">
         <el-menu-item index="overview">
           <span slot="title">项目概览</span>
         </el-menu-item>