From d4050b84a8442218ced59ef6b1d77131f9be5503 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, 27 Feb 2022 16:40:58 +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/views/xm/core/xmProject/XmProjectEdit.vue | 19 +++++++++++++------
 src/views/xm/core/xmProject/XmProjectInfo.vue |  3 ++-
 .../xm/core/xmProject/XmProjectInfoRoute.vue  |  8 ++++++--
 src/views/xm/core/xmProject/XmProjectMng.vue  |  3 ++-
 .../xmProject/XmProjectOverviewComplex.vue    |  6 ++++--
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 475da4d8..d6c09c69 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -27,9 +27,16 @@
 								<el-option v-for="(i,index) in options['priority']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option> 
 							</el-select> 
 						</el-form-item>   
-						<el-form-item label="预算控制" prop="priority">
-							<el-checkbox  v-model="editForm.budgetCtrl"  true-label="1" false-label="0" >严格控制预算</el-checkbox> 注：在项目->计划->任务 每个环节进行严格的预算控制
+						<el-form-item label="总预算控制" prop="budgetCtrl">
+							<el-checkbox  v-model="editForm.budgetCtrl"  true-label="1" false-label="0" >控制总预算</el-checkbox> <font color="red">&nbsp;注：计划总预算不能大于项目总预算</font>
 						</el-form-item>  
+						<el-form-item label="计划明细预算控制" prop="phaseBudgetCtrl">
+							<el-checkbox  v-model="editForm.phaseBudgetCtrl"  true-label="1" false-label="0" >计划明细预算控制</el-checkbox><font color="red">&nbsp; 注：计划中下级总预算不能大于上级预算。计划明细预算大于任务预算汇总</font>
+						</el-form-item> 
+						
+						<el-form-item label="计划实际金额控制" prop="phaseActCtrl">
+							<el-checkbox  v-model="editForm.phaseActCtrl"  true-label="1" false-label="0" >计划实际金额控制</el-checkbox> <font color="red">&nbsp;注：计划中实际金额不能大于预算金额。任务实际金额不能大于计划预算金额</font>
+						</el-form-item> 
 						<el-form-item label="工期及成本预估" >  
 							<el-row>
 								<el-date-picker
@@ -421,10 +428,10 @@
 							params.planWorkload=this.autoParams.planWorkload
 							editXmProject(params).then((res) => {
 								this.load.edit=false;
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit',params);//  @submit="afterEditSubmit"
+								var tips=res.data.tips; 
+								if(tips.isOk){ 
+									this.selProject=Object.assign(this.selProject,res.data.data)
+									this.$emit('submit',res.data.data);//  @submit="afterEditSubmit"
 								}
 								this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
 							}).catch( err =>this.load.edit=false);
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 7326ea12..bb33ce45 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -142,7 +142,7 @@
 				</el-submenu>
 			</el-menu>
 		   
-		  	<xm-project-overview-complex v-if="infotype=='项目概览'" :sel-project="selProject"></xm-project-overview-complex>  
+		  	<xm-project-overview-complex v-if="infotype=='项目概览'" :sel-project="selProject" @submit="afterEditSubmit"></xm-project-overview-complex>  
 			 <xm-iteration-for-project-complex  v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject"></xm-iteration-for-project-complex>
  			 <xm-product-for-project-complex  v-if="infotype=='产品'" ref="xmProductComplex" :sel-project="selProject"></xm-product-for-project-complex>
 			 <xm-menu-mng v-if="infotype=='需求'" :sel-project="selProject" :disabled-mng="false"></xm-menu-mng>
@@ -232,6 +232,7 @@
 		methods: {
 
 			afterEditSubmit:function(project){
+				this.selProject=Object.assign(this.selProject,project)
 				this.$emit("submit",project)
 			},
 			toArchive:function(){
diff --git a/src/views/xm/core/xmProject/XmProjectInfoRoute.vue b/src/views/xm/core/xmProject/XmProjectInfoRoute.vue
index a03568b5..804ad438 100644
--- a/src/views/xm/core/xmProject/XmProjectInfoRoute.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfoRoute.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		 <xm-project-info v-if="selProject" :sel-project="selProject" :visible="showInfo"></xm-project-info>
+		 <xm-project-info v-if="selProject" :sel-project="selProject" :visible="showInfo" @submit="afterEditSubmit"></xm-project-info>
 	</section>
 </template>
 
@@ -26,7 +26,11 @@
 			}
 		},//end data
 		methods: { 
-			 
+			 afterEditSubmit(project){
+				this.selProject=project;
+				localStorage.setItem('xm-project-info-route',JSON.stringify(this.selProject));
+				this.$emit('submit',project)
+			 }
 			 
 			
 		},//end methods
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 6ad451a5..606b33bc 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -549,7 +549,8 @@
 					this.load.edit = false;
 				}).catch( err => this.load.edut = false );
 			},
-			changeShowInfo() {
+			changeShowInfo(project) {
+				this.editForm=project
 				this.xmProjects = [];
 				this.getXmProjects();
 				this.showInfo = false;
diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
index 8d7409e1..b9e3d8df 100644
--- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
@@ -85,7 +85,7 @@
         </el-submenu>
       </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"></xm-project-detail> 
+        <xm-project-detail  v-if="showPanelName=='detail'" :sel-project="selProject" @submit="afterEditSubmit"></xm-project-detail> 
         <xm-product-project-link-mng v-if="showPanelName=='productProjectLink'" :sel-project="selProject"></xm-product-project-link-mng>
   </section>
 </template>
@@ -116,7 +116,9 @@ export default {
   },
 
   methods:{
-
+    afterEditSubmit(project){
+      this.$emit('submit',project)
+    },
     onMenuToolBarSelect(menuIndex){
       this.showPanelName=menuIndex;
     }