From a5c9e9e87fdda64661ec40390a95ad7bc2b78723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 8 Jun 2022 04:10:07 +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/XmProjectForLinkComplex.vue | 6 ++++++
 src/views/xm/core/xmTask/XmPhase.vue                    | 2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue                  | 6 ++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index fbcdc41c..7df86a81 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -40,6 +40,10 @@
 					<el-tab-pane label="需求" lazy name="menus" v-if="selProject&&selProject.id">
 						<xm-menu-mng v-if="selProject && 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="plan" v-if="selProject&&selProject.id">
+						<xm-plan v-if="selProject && showPanel=='plan'"  queryScope="plan" ptype="0" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-plan>
+					</el-tab-pane>
 					<el-tab-pane label="任务" lazy name="tasks" v-if="selProject&&selProject.id">
 						<xm-task-mng v-if="selProject && showPanel=='tasks'"  queryScope="task" ptype="0" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
 					</el-tab-pane>
@@ -80,6 +84,7 @@ import XmProjectOverview from "./XmProjectOverview";
 
 import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue';
 import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProject.vue';
+import XmPlan from '../xmTask/XmPlan.vue';
 	export default {
 		computed: {
 		    ...mapGetters([
@@ -140,6 +145,7 @@ import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProj
       XmProjectOverview,
 	  XmProductProjectLinkMng,
 	  XmIterationLinkForProject,
+XmPlan,
 		},
 		mounted() {
 		this.$nextTick(() => {
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 908665ed..04420f94 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -220,7 +220,7 @@
             placement="top-start"
             title="选择展示方式"
             width="400"
-            trigger="hover"
+            trigger="click"
           >
             <el-row>
               <el-radio v-model="displayType" label="grant">甘特图</el-radio>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index dae1803d..317fb032 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -8,9 +8,7 @@
       >
         <el-row> 
             <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
-        	<el-select v-model="filters.lvls" placeholder="层级" clearable multiple v-if="queryScope!='task'">
-									<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.xm_plan_lvl" :key="index"></el-option> 
-          </el-select>
+
 					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable>
 									<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.taskState" :key="index"></el-option> 
           </el-select>
@@ -317,7 +315,7 @@
             placement="top-start"
             title="选择展示方式"
             width="400"
-            trigger="hover"
+            trigger="click"
           >
             <el-row>
               <el-radio v-model="displayType" label="grant">甘特图</el-radio>