From a9353d455d9c7254208dd1492e4fd075c8f67a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 16 Jan 2023 00:48:18 +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/router/routes_xm.js                       |  8 +--
 src/views/xm/core/xmMenu/XmMenuBox.vue        | 10 +--
 .../xm/core/xmMenu/XmMenuBoxForProduct.vue    | 42 +++++++++++++
 .../xm/core/xmMenu/XmMenuBoxForProject.vue    | 42 +++++++++++++
 src/views/xm/core/xmMenu/XmMenuMng.vue        | 34 +++++-----
 src/views/xm/core/xmProduct/index.vue         |  2 +-
 .../xmProject/XmProjectForLinkComplex.vue     |  2 +-
 src/views/xm/core/xmTask/XmPlan.vue           |  8 +--
 src/views/xm/core/xmTask/XmPlanForProduct.vue | 62 +++++++++++++++++++
 src/views/xm/core/xmTask/XmPlanForProject.vue | 59 ++++++++++++++++++
 10 files changed, 237 insertions(+), 32 deletions(-)
 create mode 100644 src/views/xm/core/xmMenu/XmMenuBoxForProduct.vue
 create mode 100644 src/views/xm/core/xmMenu/XmMenuBoxForProject.vue
 create mode 100644 src/views/xm/core/xmTask/XmPlanForProduct.vue
 create mode 100644 src/views/xm/core/xmTask/XmPlanForProject.vue

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index a0eed823..4dcff7b3 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -65,7 +65,7 @@ export default {
         },
         {
           path: 'menu',
-          component: _import('xm/core/xmMenu/XmMenuBox'),
+          component: _import('xm/core/xmMenu/XmMenuBoxForProject'),
           name: 'projectMenu',
           iconCls: 'fa el-icon-menu',
           meta: {
@@ -87,7 +87,7 @@ export default {
         },
         {
           path: 'plan',
-          component: _import('xm/core/xmTask/XmPlan'),
+          component: _import('xm/core/xmTask/XmPlanForProject'),
           name: 'projectPlan',
           iconCls: 'fa el-icon-menu',
           meta: {
@@ -267,7 +267,7 @@ export default {
         },
         {
           path: 'menu',
-          component: _import('xm/core/xmMenu/XmMenuBox'),
+          component: _import('xm/core/xmMenu/XmMenuBoxForProduct'),
           name: 'productMenu',
           iconCls: 'fa el-icon-menu',
           meta: {
@@ -289,7 +289,7 @@ export default {
         },
         {
           path: 'plan',
-          component: _import('xm/core/xmTask/XmPlan'),
+          component: _import('xm/core/xmTask/XmPlanForProduct'),
           name: 'productPlan',
           iconCls: 'fa el-icon-menu',
           meta: {
diff --git a/src/views/xm/core/xmMenu/XmMenuBox.vue b/src/views/xm/core/xmMenu/XmMenuBox.vue
index d7054470..7a6edfce 100644
--- a/src/views/xm/core/xmMenu/XmMenuBox.vue
+++ b/src/views/xm/core/xmMenu/XmMenuBox.vue
@@ -4,13 +4,13 @@
 			<el-col :span="8">
 				<!--
 				<el-row class="padding-left padding-right" v-if="!xmProduct||!xmProduct.id" > 
-						<xm-product-select ref="xmProductSelect1" style="display:inline;"  :auto-select="true" :link-project-id="projectInfo?projectInfo.id:null" @row-click="onProductSelected" @clear="onProductClearSelect" ></xm-product-select>
+						<xm-product-select ref="xmProductSelect1" style="display:inline;"  :auto-select="true" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect" ></xm-product-select>
 				</el-row>
 				-->
-				<xm-epic-features :xm-product="xmProduct" :sel-project="projectInfo"  @row-click="onEpicFeaturesRowClick" :disabled-mng="xmIteration&&xmIteration.id?true:false" @product-selected="onProductSelected" @product-clear="onProductClearSelect"></xm-epic-features>
+				<xm-epic-features :xm-product="xmProduct" :sel-project="selProject"  @row-click="onEpicFeaturesRowClick" :disabled-mng="xmIteration&&xmIteration.id?true:false" @product-selected="onProductSelected" @product-clear="onProductClearSelect"></xm-epic-features>
 			</el-col> 
 			<el-col :span="16" v-if="filters.xmProduct && filters.xmProduct.id">
-				<xm-menu-mng class="padding-left" :xm-product="filters.xmProduct" :sel-project="projectInfo"  :parent-menu="parentMenu" :xm-iteration="xmIteration" :disabled-mng="xmIteration&&xmIteration.id?true:false"></xm-menu-mng>
+				<xm-menu-mng class="padding-left" :xm-product="filters.xmProduct" :sel-project="selProject"  :parent-menu="parentMenu" :xm-iteration="xmIteration" :disabled-mng="xmIteration&&xmIteration.id?true:false"></xm-menu-mng>
 			</el-col>
 		</el-row>
 	</section>
@@ -25,13 +25,13 @@
  	import  XmMenuMng from '@/views/xm/core/xmMenu/XmMenuMng';//新增界面
  	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
 	export default { 
-        
+        props:['xmProduct','xmIteration','selProject'],
 		components: {   
 			XmEpicFeatures,XmMenuMng,XmProductSelect
 		}, 
 		computed: {
 		    ...mapGetters([
-		      'userInfo','roles','projectInfo','xmProduct','xmIteration'
+		      'userInfo','roles'
 		    ]), 
             
 			
diff --git a/src/views/xm/core/xmMenu/XmMenuBoxForProduct.vue b/src/views/xm/core/xmMenu/XmMenuBoxForProduct.vue
new file mode 100644
index 00000000..23f8fdc4
--- /dev/null
+++ b/src/views/xm/core/xmMenu/XmMenuBoxForProduct.vue
@@ -0,0 +1,42 @@
+<template>
+	<section>  
+		<xm-menu-box :xm-product="xmProduct"></xm-menu-box>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库 
+	import XmMenuBox from './XmMenuBox.vue'
+	import { mapGetters } from 'vuex'	  
+	export default {  
+		components: {    
+			XmMenuBox
+		}, 
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles','xmProduct'
+		    ]), 
+            
+			
+        }, 
+		watch: {   
+	    },
+		data() {
+			return { 
+				 
+
+			}//end return
+		},//end data
+		methods: {  
+			  
+		},//end method
+		mounted() { 
+			
+		}//end mounted
+	}
+
+</script>
+
+<style lang="less" scoped> 
+
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmMenu/XmMenuBoxForProject.vue b/src/views/xm/core/xmMenu/XmMenuBoxForProject.vue
new file mode 100644
index 00000000..cfca3eda
--- /dev/null
+++ b/src/views/xm/core/xmMenu/XmMenuBoxForProject.vue
@@ -0,0 +1,42 @@
+<template>
+	<section>  
+		<xm-menu-box :sel-project="projectInfo"></xm-menu-box>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库 
+	import XmMenuBox from './XmMenuBox.vue'
+	import { mapGetters } from 'vuex'	  
+	export default {  
+		components: {    
+			XmMenuBox
+		}, 
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles','projectInfo'
+		    ]), 
+            
+			
+        }, 
+		watch: {   
+	    },
+		data() {
+			return { 
+				 
+
+			}//end return
+		},//end data
+		methods: {  
+			  
+		},//end method
+		mounted() { 
+			
+		}//end mounted
+	}
+
+</script>
+
+<style lang="less" scoped> 
+
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 3d42d322..daab35e0 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -3,7 +3,7 @@
 		<el-row class="padding-left padding-right">
 			<el-col :span="24">
 					<el-row>
-						<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct && !xmIteration"   :auto-select="false" :link-project-id="projectInfo?projectInfo.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select>
+						<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct&&!xmProduct.id && !xmIteration && !xmIteration.id"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select>
 
 						<el-select   v-model="filters.priority" placeholder="优先级"  clearable style="width: 100px;">
 								<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
@@ -59,7 +59,7 @@
 									<font class="more-label-font">
 										迭代:
 									</font>
-									<xm-iteration-select v-if="!xmIteration || !xmIteration.id" style="display:inline;" :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="projectInfo?projectInfo.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClearSelect">
+									<xm-iteration-select v-if="!xmIteration || !xmIteration.id" style="display:inline;" :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="selProject?selProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClearSelect">
 					    			</xm-iteration-select> 
 								</el-row> 
 								<el-row>
@@ -86,8 +86,8 @@
 									<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable style="width: 200px;">
 										<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="'未分配任务到项目【'+projectInfo.name+'】'" v-if="projectInfo && projectInfo.id"></el-option>
-										<el-option   value="join-curr-project"  :label="'已分配任务到项目【'+projectInfo.name+'】'"  v-if="projectInfo && projectInfo.id"></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-row> 
 								<el-row>
@@ -355,7 +355,7 @@
 					</el-row> 
 				<!--编辑 XmMenu xm_project_menu界面-->
 				<el-dialog title="编辑故事" :visible.sync="editFormVisible" :with-header="false" fullscreen width="90%" top="20px"    append-to-body   :close-on-click-modal="false" >
-					<xm-menu-edit :xm-menu="editForm" :sel-project="projectInfo" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @add-sub-menu="onAddSubMenu" @edit-fields="onEditSomeFields"></xm-menu-edit>
+					<xm-menu-edit :xm-menu="editForm" :sel-project="selProject" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @add-sub-menu="onAddSubMenu" @edit-fields="onEditSomeFields"></xm-menu-edit>
 				</el-dialog>
 
 				<!--新增 XmMenu xm_project_menu界面-->
@@ -370,7 +370,7 @@
 					<xm-menu-rich-detail :visible="menuDetailVisible"  :reload="false" :xm-menu="editForm" ></xm-menu-rich-detail>
 				</el-drawer>
 				<el-drawer title="选中任务" :visible.sync="selectTaskVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
-					<xm-task-list :xm-product="filters.product" :sel-project="projectInfo" query-scope="planTask" check-scope="task"  :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
+					<xm-task-list :xm-product="filters.product" :sel-project="selProject" query-scope="planTask" check-scope="task"  :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
 				</el-drawer>
 				<el-drawer title="查看任务" :visible.sync="taskListForMenuVisible" :with-header="false"  size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-task-list-for-menu  :xm-product="filters.product"  :is-multi-select="true" :menu-id="editForm.menuId"></xm-task-list-for-menu>
@@ -381,14 +381,14 @@
 					:visible.sync="taskMngVisible"
 					:with-header="false"
 					size="80%">
-					<xm-task-mng :sel-project="projectInfo"   :menu-id="editForm.menuId" :menu-name="editForm.menuName"></xm-task-mng>
+					<xm-task-mng :sel-project="selProject"   :menu-id="editForm.menuId" :menu-name="editForm.menuName"></xm-task-mng>
 				</el-drawer> 
 			</el-col>
 		</el-row>
 		
  			<tag-dialog ref="tagDialog" :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected">
 			</tag-dialog>
- 			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="projectInfo" :xm-product="filters.xmProduct" @user-confirm="onGroupUserSelect">
+ 			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="selProject" :xm-product="filters.xmProduct" @user-confirm="onGroupUserSelect">
 			</xm-group-dialog>
 		<el-drawer
 		append-to-body
@@ -440,10 +440,10 @@
 	import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 
 	export default {
-		props:[ 'xmIteration','xmProduct','disabledMng','parentMenu','paddingTop'],
+		props:[ 'xmIteration','xmProduct','disabledMng','parentMenu','paddingTop','selProject'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo','roles','projectInfo'
+		      'userInfo','roles'
 			]),
 
       		xmMenusTreeData() { 
@@ -460,7 +460,7 @@
 					this.filters.product=this.xmProduct
 					this.getXmMenus()
 			},
-			projectInfo:function(){
+			selProject:function(){
 				this.getXmMenus();
 			}
 			,
@@ -639,15 +639,15 @@
 					params.taskFilterType=this.filters.taskFilterType
 
 					if(params.taskFilterType==='not-join-curr-project'){
-						params.projectId=this.projectInfo.id
+						params.projectId=this.selProject.id
 					}
 					if(params.taskFilterType==='join-curr-project'){
-						params.projectId=this.projectInfo.id
+						params.projectId=this.selProject.id
 					}
 					params.ntype="0"
 				}
-				if(this.projectInfo && this.projectInfo.id){
-					params.linkProjectId=this.projectInfo.id
+				if(this.selProject && this.selProject.id){
+					params.linkProjectId=this.selProject.id
 				}
 				if(this.filters.product){
 					params.productId=this.filters.product.id
@@ -699,7 +699,7 @@
 					params=this.getParams(params); 
 					this.load.list = true;
 					var func=listXmMenuWithState
-					if(this.projectInfo&&this.projectInfo.id){
+					if(this.selProject&&this.selProject.id){
 						func=listXmMenuWithPlan
 					}
 					func(params).then(res=>{
@@ -745,7 +745,7 @@
 					this.load.list = false;
 				}
 				this.load.list = true;
-				if(!this.projectInfo){
+				if(!this.selProject){
 					listXmMenuWithState(params).then( callback ).catch( err => this.load.list = false );
 				}else{
 					listXmMenuWithPlan(params).then( callback ).catch( err => this.load.list = false );
diff --git a/src/views/xm/core/xmProduct/index.vue b/src/views/xm/core/xmProduct/index.vue
index 5866282d..2d9116a9 100644
--- a/src/views/xm/core/xmProduct/index.vue
+++ b/src/views/xm/core/xmProduct/index.vue
@@ -57,7 +57,7 @@ export default {
       })
     }
   },
-  beforeDestroy(){ 
+  beforeDestroy(){  
     store.dispatch('setXmProduct',null)
   }
 };
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index f82916e6..3e69f534 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -174,7 +174,7 @@
             v-if="selProject && selProject.id"
           >
             <xm-plan
-              v-if="selProject && showPanel == 'plan'"
+              v-if="selProject&&selProject.id && showPanel == 'plan'"
               queryScope="plan"
               ptype="0"
               :xm-product="xmProduct"
diff --git a/src/views/xm/core/xmTask/XmPlan.vue b/src/views/xm/core/xmTask/XmPlan.vue
index bab783e9..da549fc9 100644
--- a/src/views/xm/core/xmTask/XmPlan.vue
+++ b/src/views/xm/core/xmTask/XmPlan.vue
@@ -2,10 +2,10 @@
 	<section> 
 		<el-row class="box">
 			<el-col :span="8" class="left">
-				<xm-phase :xm-product="xmProduct" :sel-project="projectInfo" queryScope="plan" @row-click="onPhaseRowClick"></xm-phase>
+				<xm-phase :xm-product="xmProduct" :sel-project="selProject" queryScope="plan" @row-click="onPhaseRowClick"></xm-phase>
 			</el-col> 
 			<el-col :span="16">
-				<xm-task-mng :xm-product="xmProduct" :sel-project="projectInfo" queryScope="task" :parent-task="parentTask"></xm-task-mng>
+				<xm-task-mng :xm-product="xmProduct" :sel-project="selProject" queryScope="task" :parent-task="parentTask"></xm-task-mng>
 			</el-col>
 		</el-row>
 	</section>
@@ -23,10 +23,10 @@
 		components: {   
 			XmPhase,XmTaskMng
 		},
-        props:[],
+        props:['xmProduct','selProject'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo','roles','xmProduct','projectInfo'
+		      'userInfo','roles'
 		    ]), 
             
 			
diff --git a/src/views/xm/core/xmTask/XmPlanForProduct.vue b/src/views/xm/core/xmTask/XmPlanForProduct.vue
new file mode 100644
index 00000000..ffef97f7
--- /dev/null
+++ b/src/views/xm/core/xmTask/XmPlanForProduct.vue
@@ -0,0 +1,62 @@
+<template>
+	<section> 
+		<el-row class="box">
+			<el-col :span="8" class="left">
+				<xm-phase :xm-product="xmProduct"   queryScope="plan" @row-click="onPhaseRowClick" @project-row-click="onProjectRowClick"></xm-phase>
+			</el-col> 
+			<el-col :span="16">
+				<xm-task-mng v-if="selProject && selProject.id" :xm-product="xmProduct" :sel-project="selProject" queryScope="task" :parent-task="parentTask"></xm-task-mng>
+			</el-col>
+		</el-row>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库 
+	import { mapGetters } from 'vuex'	 
+	
+  	import  XmPhase from '@/views/xm/core/xmTask/XmPhase';//新增界面
+ 	import  XmTaskMng from '@/views/xm/core/xmTask/XmTaskMng';//新增界面
+	export default { 
+        
+		components: {   
+			XmPhase,XmTaskMng
+		}, 
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles','xmProduct'
+		    ]), 
+            
+			
+        }, 
+		watch: {  
+			 
+	    },
+		data() {
+			return { 
+				selProject:null,
+				parentTask:null, 
+				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				load:{ list: false, edit: false, del: false, add: false },//查询中...  
+
+			}//end return
+		},//end data
+		methods: {  
+			 onPhaseRowClick(task){
+				 this.parentTask=task
+			 },
+			 onProjectRowClick(selProject){
+				this.selProject=selProject
+			 }
+		},//end method
+		mounted() {
+			 
+			
+		}//end mounted
+	}
+
+</script> 
+
+<style lang="less" scoped> 
+ 
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTask/XmPlanForProject.vue b/src/views/xm/core/xmTask/XmPlanForProject.vue
new file mode 100644
index 00000000..eb88f1c6
--- /dev/null
+++ b/src/views/xm/core/xmTask/XmPlanForProject.vue
@@ -0,0 +1,59 @@
+<template>
+	<section> 
+		<el-row class="box">
+			<el-col :span="8" class="left">
+				<xm-phase   :sel-project="projectInfo" queryScope="plan" @row-click="onPhaseRowClick"></xm-phase>
+			</el-col> 
+			<el-col :span="16">
+				<xm-task-mng   :sel-project="projectInfo" queryScope="task" :parent-task="parentTask"></xm-task-mng>
+			</el-col>
+		</el-row>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
+	import { mapGetters } from 'vuex'	 
+	
+  	import  XmPhase from '@/views/xm/core/xmTask/XmPhase';//新增界面
+ 	import  XmTaskMng from '@/views/xm/core/xmTask/XmTaskMng';//新增界面
+	export default { 
+        
+		components: {   
+			XmPhase,XmTaskMng
+		}, 
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles','projectInfo'
+		    ]), 
+            
+			
+        }, 
+		watch: {  
+			 
+	    },
+		data() {
+			return { 
+				parentTask:null, 
+				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				load:{ list: false, edit: false, del: false, add: false },//查询中...  
+
+			}//end return
+		},//end data
+		methods: {  
+			 onPhaseRowClick(task){
+				 this.parentTask=task
+			 }
+		},//end method
+		mounted() {
+			 
+			
+		}//end mounted
+	}
+
+</script> 
+
+<style lang="less" scoped> 
+ 
+</style>
\ No newline at end of file