From e6dd632523136378b2f78fb6a22045ef5ecaa77e 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, 20 Mar 2022 12:48:17 +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/mdp/workflow/ru/task/TaskMng.vue    |  1 +
 ...plex.vue => XmIterationForLinkComplex.vue} | 34 ++++++++++++++-----
 .../xm/core/xmIteration/XmIterationInfo.vue   |  2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        | 20 +++++------
 src/views/xm/core/xmProduct/XmProductInfo.vue |  6 ++--
 .../xmProduct/XmProductOverviewComplex.vue    |  4 +--
 src/views/xm/core/xmProject/XmProjectEdit.vue |  4 +--
 src/views/xm/core/xmProject/XmProjectInfo.vue |  6 ++--
 .../xmProject/XmProjectOverviewComplex.vue    | 17 ++++++++--
 9 files changed, 61 insertions(+), 33 deletions(-)
 rename src/views/xm/core/xmIteration/{XmIterationForProjectComplex.vue => XmIterationForLinkComplex.vue} (78%)

diff --git a/src/views/mdp/workflow/ru/task/TaskMng.vue b/src/views/mdp/workflow/ru/task/TaskMng.vue
index fd4d8e72..01b6842b 100644
--- a/src/views/mdp/workflow/ru/task/TaskMng.vue
+++ b/src/views/mdp/workflow/ru/task/TaskMng.vue
@@ -1039,6 +1039,7 @@
       afterEditSubmit() {
         this.editFormVisible = false;
         this.getTasks();
+        this.$emit("submit")
       },
       // 选择行task
       selsChange: function(sels) {
diff --git a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
similarity index 78%
rename from src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
rename to src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
index ef939ce3..be7cb646 100644
--- a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
@@ -31,21 +31,28 @@
 					<el-tab-pane label="迭代概览" lazy  name="iterationOverview" v-if="xmIteration && xmIteration.id">
 						<xm-iteration-overview v-if="xmIteration && showPanel=='iterationOverview'"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-overview>
 					</el-tab-pane>
-					<el-tab-pane label="产品、战略"   name="products" v-if="!xmProduct&&xmIteration&&xmIteration.id">
-						 <xm-product-mng  v-if="xmIteration && showPanel=='products'"    :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-mng>
- 					</el-tab-pane>
-					<el-tab-pane label="项目"   name="projects" v-if="!selProject&&xmIteration&&xmIteration.id">
-  						<xm-project-for-link v-if="xmIteration && showPanel=='projects'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-project-for-link>
+					
+					<el-tab-pane label="迭代详情" lazy name="detail" v-if="xmIteration&&xmIteration.id">
+						<xm-iteration-edit v-if="showPanel=='detail'" :xm-iteration="xmIteration"></xm-iteration-edit>
+					</el-tab-pane> 
+					<el-tab-pane label="配置关联产品" lazy name="iterationProductLink" v-if="xmIteration&&xmIteration.id">
+						<xm-iteration-link-for-product  v-if="showPanel=='iterationProductLink'" :xm-iteration="xmIteration"></xm-iteration-link-for-product>
+					</el-tab-pane> 
+					<el-tab-pane label="配置需求范围" lazy name="iterationMenuMng" v-if="xmIteration&&xmIteration.id">
+      					<xm-iteration-menu-mng v-if="showPanel=='iterationMenuMng'" :xm-iteration="xmIteration"></xm-iteration-menu-mng>
+					</el-tab-pane>
+					<el-tab-pane label="配置关联项目" lazy name="iterationProjectLink" v-if="xmIteration&&xmIteration.id">
+						<xm-iteration-link-for-project  v-if="showPanel=='iterationProjectLink'" :xm-iteration="xmIteration"></xm-iteration-link-for-project>
 					</el-tab-pane>
-					<el-tab-pane label="需求" lazy name="menus" v-if="xmIteration&&xmIteration.id">
+					<el-tab-pane label="需求列表" lazy name="menus" v-if="xmIteration&&xmIteration.id">
 						<xm-menu-mng v-if="xmIteration && showPanel=='menus'" :xm-product="xmProduct"  :xm-iteration="xmIteration" :sel-project="selProject" :disabled-mng="false"></xm-menu-mng>
 					</el-tab-pane>
-					<el-tab-pane label="任务" lazy name="tasks" v-if="xmIteration&&xmIteration.id">
+					<el-tab-pane label="任务列表" lazy name="tasks" v-if="xmIteration&&xmIteration.id">
 						<xm-task-mng v-if="xmIteration && showPanel=='tasks'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
 					</el-tab-pane> 
-					<el-tab-pane label="缺陷" lazy name="bugs" v-if="xmIteration&&xmIteration.id">
+					<el-tab-pane label="缺陷列表" lazy name="bugs" v-if="xmIteration&&xmIteration.id">
 						<xm-question-mng v-if="xmIteration && showPanel=='bugs'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng>
-					</el-tab-pane>
+					</el-tab-pane> 
 				</el-tabs>
 				<el-row>
 
@@ -73,8 +80,12 @@
 	import XmQuestionMng from '../xmQuestion/XmQuestionMng.vue';
 	import XmIterationOverview from "./XmIterationOverview";
 
+	import XmIterationEdit from './XmIterationEdit.vue';
+ 	import XmIterationLinkForProduct from '../xmIterationLink/XmIterationLinkForProduct.vue';
+ 	import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProject.vue';
 	import  XmIterationAdd from './XmIterationAdd';//新增界面
 
+	import XmIterationMenuMng from '../xmIterationMenu/XmIterationMenuMng.vue';
 	export default {
 		computed: {
 		    ...mapGetters([
@@ -178,6 +189,11 @@
 			XmQuestionMng,
 			XmProjectForLink,
 			XmIterationAdd,
+			XmIterationEdit,
+			XmIterationLinkForProduct,
+			XmIterationLinkForProject,
+			XmIterationMenuMng,
+
 		},
 		mounted() { 
 		this.$nextTick(() => {
diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue
index e1f7c094..358ceee2 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfo.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfo.vue
@@ -74,7 +74,7 @@
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
 	import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';  
-	import XmIterationForProjectComplex from '../xmIteration/XmIterationForProjectComplex.vue'; 
+	import XmIterationForProjectComplex from './XmIterationForLinkComplex.vue'; 
 	import XmIterationOverviewComplex from '../xmIteration/XmIterationOverviewComplex.vue';
 	import XmProductForProjectComplex from '../xmProduct/XmProductForProjectComplex.vue';
  import XmProjectComplex from '../xmProject/XmProjectComplex.vue';
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 03244610..d42c5ccb 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -22,16 +22,16 @@
 								<el-link title="迭代，点击选择、清除选择" @click="iterationVisible=true" type="warning" slot="reference" v-if="!xmIteration" icon="el-icon-search"><font style="font-size:14px;">{{filters.iteration?filters.iteration.iterationName:'选择迭代'}}</font></el-link> 
 						</el-popover>  
 						<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable style="width: 160px;">
-							<el-option   value="not-join-any-project"  label="未分配任务"></el-option>  
-							<el-option   value="join-any-project"  label="已分配任务"></el-option>  
-							<el-option   value="not-join-curr-project"  label="未分配任务到本项目" v-if="selProject && selProject.id"></el-option>  
-							<el-option   value="join-curr-project"  label="已分配任务到本项目"  v-if="selProject && selProject.id"></el-option>  
+							<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>  
+							<el-option   value="join-any-project"  label="已分配过任务的需求"></el-option>  
+							<el-option   value="not-join-curr-project"  :label="'未分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>  
+							<el-option   value="join-curr-project"  :label="'已分配任务到本项目【'+selProject.name+'】'"  v-if="selProject && selProject.id"></el-option>  
 						</el-select>   
 						<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable  style="width: 160px;">
 							<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>  
 							<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>  
-							<el-option   value="not-join-curr-iteration"  label="未加入本迭代"  v-if="filters.iteration && filters.iteration.id"></el-option>  
-							<el-option   value="join-curr-iteration"  label="已加入本迭代" v-if="filters.iteration && filters.iteration.id"></el-option>  
+							<el-option   value="not-join-curr-iteration"  :label="'未加入迭代【'+filters.iteration.iterationName+'】'"  v-if="filters.iteration && filters.iteration.id"></el-option>  
+							<el-option   value="join-curr-iteration"  :label="'已加入本迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>  
 						</el-select> 
 						
 						<el-select v-model="filters.dtype" clearable placeholder="需求类型">
@@ -156,11 +156,11 @@
 							<el-table-column prop="iterationName" label="迭代"  min-width="120" show-overflow-tooltip>  
 								<template slot="header">
 									迭代 
-									<el-popover v-if="xmIteration && xmIteration.id"
+									<el-popover  
 										placement="top"
 										width="300"
 										v-model="linkIterationPopoverVisible">
-										<p>将需求加入还是移出迭代 <span v-if="xmIteration && xmIteration.id">【{{xmIteration.iterationName}}】</span>?</p>
+										<p>将需求加入还是移出迭代 <span v-if="filters.iteration && filters.iteration.id">【{{filters.iteration.iterationName}}】</span>?</p>
 										<div style="text-align: right; margin: 0">
 											<el-button size="mini" type="text" @click="doBatchDelXmIterationMenu">移出</el-button>
 											<el-button type="primary" size="mini" @click="doBatchAddXmIterationMenu">加入</el-button>
@@ -1012,7 +1012,7 @@
 				}
 				var params={
 					menuIds:this.sels.map(i=>i.menuId),
-					iterationId:this.xmIteration.id
+					iterationId:this.filters.iteration.id
 				}
 				batchDelXmIterationMenu(params).then(res=>{
 					var tips =res.data.tips;
@@ -1029,7 +1029,7 @@
 				}
 				var params={
 					menuIds:this.sels.map(i=>i.menuId),
-					iterationId:this.xmIteration.id
+					iterationId:this.filters.iteration.id
 				}
 				batchAddXmIterationMenu(params).then(res=>{
 					var tips =res.data.tips;
diff --git a/src/views/xm/core/xmProduct/XmProductInfo.vue b/src/views/xm/core/xmProduct/XmProductInfo.vue
index 95aa2134..69334ef4 100644
--- a/src/views/xm/core/xmProduct/XmProductInfo.vue
+++ b/src/views/xm/core/xmProduct/XmProductInfo.vue
@@ -151,7 +151,7 @@
 			</el-menu>
 		   
 		  	<xm-product-overview-complex v-if="infotype=='产品概览'" :xm-product="xmProduct"></xm-product-overview-complex>  
-			 <xm-iteration-for-project-complex  v-if="infotype=='迭代'" ref="xmIterationMng" :xm-product="xmProduct"></xm-iteration-for-project-complex>
+			 <xm-iteration-for-link-complex  v-if="infotype=='迭代'" ref="xmIterationMng" :xm-product="xmProduct"></xm-iteration-for-link-complex>
  			 <xm-project-complex v-if="infotype=='项目'" ref="xmProjectForLink" :xm-product="xmProduct"></xm-project-complex> 
 			  <xm-menu-mng v-if="infotype=='需求'" :xm-product="xmProduct"></xm-menu-mng>
 			  <xm-task-mng v-if="infotype=='产品任务'" ptype="1" queryScope="task"  ref="productXmTaskMng" :xm-product="xmProduct" key="productXmTaskMng"></xm-task-mng>
@@ -210,7 +210,7 @@
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
 	import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';  
-	import XmIterationForProjectComplex from '../xmIteration/XmIterationForProjectComplex.vue'; 
+	import XmIterationForLinkComplex from '../xmIteration/XmIterationForLinkComplex.vue'; 
 	import XmProductOverviewComplex from '../xmProduct/XmProductOverviewComplex.vue';
 	import XmProductForProjectComplex from './XmProductForProjectComplex.vue';
 import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
@@ -437,7 +437,7 @@ import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
 			xmProjectStateMng,
 			xmTestCaseExecMng,
 			xmGroupSelect,
-			XmIterationForProjectComplex, 
+			XmIterationForLinkComplex, 
 			XmProductOverviewComplex,
 			XmProductForProjectComplex,
 			XmProjectComplex,
diff --git a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
index 13d1de3b..0b8f7aa5 100644
--- a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
@@ -8,10 +8,10 @@
           <span slot="title">产品详情</span>
         </el-menu-item>  
         <el-menu-item index="iterationProductLink"> 
-          <span slot="title">配置可见迭代</span>
+          <span slot="title">配置关联迭代</span>
         </el-menu-item>
         <el-menu-item index="productProjectLink"> 
-          <span slot="title">配置可见项目</span>
+          <span slot="title">配置关联项目</span>
         </el-menu-item> 
         <el-menu-item index="productCalc"> 
           <span slot="title">执行数据汇总计划</span>
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 465071f6..96ed0fa0 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -615,9 +615,9 @@
 				}else if(bizKey=="xm_project_delay_approva"){
 					//延期审核
 					params.mainTitle='关于项目【'+row.name+"】延期的审批申请";
-					params.mainContext='项目编号：'+row.code+','+'项目名称：'+row.name+',项目结束时间由'+this.selProject.endTime+'变更为:'+row.endTime+',此次变更不涉及预算调整';
+					params.mainContext='项目编号：'+row.code+','+'项目名称：'+row.name+',项目结束时间由'+this.selProject.endTime+'变更为:'+this.dateRanger[1]+',此次变更不涉及预算调整';
 					params.restUrl=config.getXmBasePath()+"/xm/core/xmProject/processApprova"; 
-					params.flowVars.data.endTime=row.endTime
+					params.flowVars.data.endTime=this.dateRanger[1]
 					//this.html2canvas(document.querySelector(".editForm"),row,params);
 					this.$router.push({name:'ProcdefListForBizStart',params:params}); 
 				}else if(bizKey=="xm_project_start_approva"){
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 73dfeadf..7d392f58 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -132,7 +132,7 @@
 			</el-menu>
 		   
 		  	<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-iteration-for-link-complex  v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject"></xm-iteration-for-link-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"></xm-menu-mng>
 			 <xm-task-mng v-if="infotype=='任务'" ref="xmTaskMng" :sel-project="selProject" ptype="0" queryScope="task" key="task"></xm-task-mng>
@@ -185,7 +185,7 @@
 	import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
 	import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';  
-	import XmIterationForProjectComplex from '../xmIteration/XmIterationForProjectComplex.vue'; 
+	import XmIterationForLinkComplex from '../xmIteration/XmIterationForLinkComplex.vue'; 
 	import XmProjectOverviewComplex from './XmProjectOverviewComplex.vue';
 	import XmProductForProjectComplex from '../xmProduct/XmProductForProjectComplex.vue';
 
@@ -412,7 +412,7 @@
 			xmProjectStateMng,
 			xmTestCaseExecMng,
 			xmGroupSelect,
-			XmIterationForProjectComplex, 
+			XmIterationForLinkComplex, 
 			XmProjectOverviewComplex,
 			XmProductForProjectComplex,
 			//在下面添加其它组件
diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
index d504b2d2..952bffe7 100644
--- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
@@ -43,7 +43,7 @@
           </el-row>
         </div>
         
-        <task-mng v-if="showPanelName === 'currFlow' " ref="currFlow" :biz-parent-pkid="selProject.id" > </task-mng>  
+        <task-mng v-if="showPanelName === 'currFlow' " ref="currFlow" :biz-parent-pkid="selProject.id" @submit="afterFlowSubmit"> </task-mng>  
         <procinst-mng v-if="showPanelName === 'hisFlow' " ref="hisFlow" isAll="true" :biz-parent-pkid="selProject.id"></procinst-mng> 
   </section>
 </template>
@@ -51,8 +51,7 @@
 <script>
 import util from "@/common/js/util"; // 全局公共库
 //import Sticky from "@/components/Sticky"; // 粘性header组件
-import { mapGetters } from "vuex";
-import { listXmProjectState } from '@/api/xm/core/xmProjectState';
+import { mapGetters } from "vuex"; 
 import XmProjectOverview from './XmProjectOverview.vue';
 import XmProjectDetail from './XmProjectDetail.vue';
 import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue';
@@ -61,6 +60,8 @@ import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProj
 import TaskMng from '@/views/mdp/workflow/ru/task/TaskMng'; 
 import ProcinstMng from '@/views//mdp/workflow/hi/procinst/ProcinstMng';
 import {  loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState';
+import { listXmProject} from '@/api/xm/core/xmProject'; 
+
 
 export default {
   components: { XmProjectOverview, XmProjectDetail, XmProductProjectLinkMng ,XmIterationLinkForProject,TaskMng,ProcinstMng},
@@ -96,6 +97,16 @@ export default {
           this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
         }).catch( err  => this.load.calcProject=false ); 
     },
+    afterFlowSubmit(){
+      debugger;
+      listXmProject({id:this.selProject.id}).then(res=>{
+        var tips = res.data.tips;
+        if(tips.isOk){
+          var selProject=res.data.data[0]
+          this.afterEditSubmit(selProject)
+        }
+      })
+    }
   },
 
   mounted() {