From 757f7da6a4429c1aacf20a58d7aa3fcc0de0be17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 10 Jul 2022 19:05:52 +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

---
 .../xm/core/xmProject/XmProjectDetail.vue     |  2 +-
 src/views/xm/core/xmProject/XmProjectEdit.vue | 14 ++++++++---
 src/views/xm/core/xmProject/XmProjectInfo.vue | 24 ++++++++++++++++---
 .../xmProject/XmProjectOverviewComplex.vue    |  2 +-
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectDetail.vue b/src/views/xm/core/xmProject/XmProjectDetail.vue
index 31c0aeb6..8d3acc5e 100644
--- a/src/views/xm/core/xmProject/XmProjectDetail.vue
+++ b/src/views/xm/core/xmProject/XmProjectDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row class="xm-detail" v-loading.lock="load.edit || load.list"> 
-			<xm-project-edit :sel-project="selProject" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @edit-fields="onEditFields"></xm-project-edit> 
+			<xm-project-edit :sel-project="selProject" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @edit-fields="onEditFields" ref="projectEdit"></xm-project-edit> 
 		</el-row>
 	</section>
 </template>
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 96f9415c..21d2d4eb 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -59,7 +59,7 @@
 							</el-form-item>  
 								</el-col>
 							</el-row> 
-						<el-tabs value="1" accordion>
+						<el-tabs v-model="currTabPane" accordion>
 						<el-tab-pane label="项目描述" name="1">  
 							<el-form-item label="" prop="description" label-width="0px"> 
 								<el-input type="textarea" :rows="10" v-model="editForm.description" placeholder="项目描述"  ></el-input> 
@@ -224,8 +224,8 @@
 				
 				<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-star-on"  type="success" :disabled="editForm.status>'2'" @click="handleCommand({type:'sendToProcessApprova',data:editForm,bizKey:'xm_project_start_approva'})">立项申请</el-button>
+					<el-button icon="el-icon-success"  type="success" :disabled="editForm.status>'5'" @click="handleCommand({type:'sendToProcessApprova',data:editForm,bizKey:'xm_project_over_approva'})">结项申请</el-button> 
 				</span>
 		</el-row>
 		
@@ -384,6 +384,13 @@
 				this.fillBudgetMarginRateToField()
 			  } 
 		  },
+		  selProject:{
+			handler(newValue, oldValue) {
+				this.initData();
+			},
+			deep:true
+			
+		  },
 		  
 		  editForm:{  
 				handler(newValue, oldValue) {
@@ -490,6 +497,7 @@
 				maxTableHeight:300,
 				currUserType:'',
 				autoSet:false,
+				currTabPane:'1',
 				/**end 在上面加自定义属性**/
 			}//end return
 		},//end data
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 90005f8f..8c217193 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -179,14 +179,18 @@
 						<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 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 class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','3')">立项申请</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="showProjectGaiSuan()">项目估算</el-button>
+						<el-button class="step-btn" type="warning" size="mini"   plain @click="showProjectShouYi()">项目收益</el-button>
+						<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','3')">设为立项中</el-button>
 					</span>
 					<span v-if="selProject.status!=i.id">
 						<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 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 class="step-btn" type="warning" size="mini"   plain @click="showProjectGaiSuan()">项目估算</el-button>
+						<el-button class="step-btn" type="warning" size="mini"   plain @click="showProjectShouYi()">项目收益</el-button>
 					</span> 
 			   </el-row>
                <el-row v-else-if="i.id=='3'"><!--实施中-->
@@ -198,8 +202,8 @@
 						<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 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="projectChangeRequire()">变更申请</el-button>
+						<el-button class="step-btn" type="warning" size="mini"   plain @click="editXmProjectSomeFields(selProject,'status','5')">设为结项中</el-button>
 					</span>
 					<span v-if="selProject.status!=i.id">
 						<el-button class="step-btn" type="warning" size="mini"   plain @click="infotype='迭代'">迭代管理</el-button>
@@ -219,6 +223,7 @@
 			   </el-row>
         <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="showDetail()">结项申请</el-button>
               <el-button class="step-btn" type="warning" size="mini"   plain @click="showCurrFlow()">结项审批</el-button>
             </span>
             <span v-if="selProject.status!=i.id">
@@ -787,6 +792,19 @@ export default {
       },
       showDetail(){
         this.$refs['项目概览'].showPanelName='detail'
+      },
+      showProjectGaiSuan(){ 
+        this.$refs['项目概览'].showPanelName='detail' 
+        this.$nextTick(()=>{ 
+          this.$refs['项目概览'].$refs['detail'].$refs['projectEdit'].currTabPane='4'
+        })
+      },
+      showProjectShouYi(){
+        this.$refs['项目概览'].showPanelName='detail' 
+        this.$nextTick(()=>{  
+          this.$refs['项目概览'].$refs['detail'].$refs['projectEdit'].currTabPane='5'
+        })
+        
       }
   }, //end methods
   components: {
diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
index 570e09c3..de59d949 100644
--- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
@@ -23,7 +23,7 @@
         </el-menu-item>    
       </el-menu>
        <xm-project-overview  v-if="showPanelName=='overview'" :sel-project="selProject"></xm-project-overview>
-        <xm-project-detail  v-if="showPanelName=='detail'" :sel-project="selProject" @submit="afterEditSubmit" @edit-fields="onEditFields"></xm-project-detail> 
+        <xm-project-detail  v-if="showPanelName=='detail'" :sel-project="selProject" @submit="afterEditSubmit" @edit-fields="onEditFields" ref="detail"></xm-project-detail> 
         <xm-product-project-link-mng v-if="showPanelName=='productProjectLink'" :sel-project="selProject"></xm-product-project-link-mng>
         <xm-iteration-link-for-project v-if="showPanelName=='iterationProjectLink'" :sel-project="selProject"></xm-iteration-link-for-project>