From b608f336e1bca8b19fa8f49cae2868ecab573d4b 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, 19 Jun 2022 09:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E9=9C=80=E6=B1=82=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmMenu/XmEpicFeaturesSelect.vue   |  13 ++-
 src/views/xm/core/xmTask/XmPhase.vue          | 110 +++++++++++-------
 src/views/xm/core/xmTask/XmTaskMng.vue        |   1 +
 3 files changed, 79 insertions(+), 45 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index c4653234..9aaeaa63 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -8,10 +8,14 @@
 						 
 						<el-input style="width:120px;" v-model="filters.key" placeholder="名称模糊查询"  clearable></el-input>
 						<el-button icon="el-icon-search" @click="searchXmMenus()"></el-button> 
+						<el-button v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button> 
 					 </el-row>
 					<el-row>
 						<el-table    stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
-							 
+							<template v-if="showSelect!==false && multi===true">
+								<el-table-column   label="" type="selection"  width="60"  >  
+								</el-table-column> 
+							</template>
 							<el-table-column prop="menuName" label="史诗、特性名称" min-width="150" >
 								<template slot-scope="scope">
 									<div  v-if="scope.row.dclass=='1'" class="icon" style="background-color:  rgb(255, 153, 51);">
@@ -26,7 +30,7 @@
 									<span>{{scope.row.seqNo}} &nbsp; {{scope.row.menuName}} </span> 
   								</template> 
 							</el-table-column> 
-							<template v-if="showSelect!==false">
+							<template v-if="showSelect!==false && multi!==true">
 							<el-table-column   label="操作"  width="100"  > 
 								<template slot-scope="scope"> 
 									<el-button      @click="select( scope.row,scope.$index)"   title="选择" type="primary"> 选择</el-button>     
@@ -56,7 +60,7 @@
 	import { mapGetters } from 'vuex'
 
 	export default {
-		props:['selProject','xmIteration','xmProduct','disabledMng','showSelect'],
+		props:['selProject','xmIteration','xmProduct','showSelect','multi'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
@@ -338,6 +342,9 @@
 				this.editForm=row 
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
       		},
+			selectConfirm(){
+				this.$emit('menus-selected',this.sels)
+			}
 		},//end methods
 		components: { 
 			XmProductSelect, 
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index c322a123..19919bff 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -25,7 +25,7 @@
                 </div>  
                 <el-button
                   v-if="isTaskCenter != '1' && isMy != '1'"
-                  @click="showMenu"
+                  @click="showEpicFeaturesForCreateTask"
                   type="primary"
                   icon="el-icon-plus"
                   >由用户故事快速创建计划 (推荐)</el-button
@@ -303,6 +303,23 @@
     <el-dialog title="选择新的上级计划" append-to-body :visible.sync="selectParentTaskVisible" width="60%" top="20px">
       <xm-phase-select :sel-project="filters.selProject" @select="onSelectedParentTask"></xm-phase-select>
     </el-dialog>
+    
+    <el-drawer
+      append-to-body
+      title="史诗特性选择"
+      :visible.sync="epicFeaturesForImportTaskVisible"
+      size="70%"
+      :close-on-click-modal="false"
+    >
+      <xm-epic-features-select
+        :visible="epicFeaturesForImportTaskVisible"
+        :is-select-menu="true"
+        :multi="true"
+         :xm-product="filters.product"
+         :sel-project="filters.selProject"
+        @menus-selected="onEpicFeaturesForImportTask"
+      ></xm-epic-features-select>
+    </el-drawer>
   </section>
 </template>
 
@@ -340,6 +357,8 @@ import XmPhaseSelect from "./XmPhaseSelect.vue";
   
   	import TagDialog from "@/views/mdp/arc/tag/TagDialog"; 
 
+import XmEpicFeaturesSelect from "../xmMenu/XmEpicFeaturesSelect";
+
 export default {
   computed: {
     ...mapGetters(["userInfo", "roles"]), 
@@ -492,6 +511,7 @@ export default {
        tableHeight: 300, 
        selectParentTaskVisible:false, 
       execUserVisible:false,  
+      epicFeaturesForImportTaskVisible:false,
     };
   }, //end data
   methods: {  
@@ -626,12 +646,34 @@ export default {
         .catch((err) => (this.load.list = false));
     },
        
-    showMenu: function (parentTask) {
+    showEpicFeaturesForCreateSubTask: function (parentTask) {
       if(!this.checkCanAdd(parentTask)){
         return;
       }
       this.parentTask = parentTask;
-      this.menuVisible = true;
+      this.epicFeaturesForImportTaskVisible = true;
+    },
+    showEpicFeaturesForCreateTask(){
+      if(!this.checkCanAdd(null)){
+        return;
+      }
+      this.parentTask = null;
+      this.epicFeaturesForImportTaskVisible = true;
+    },
+    onEpicFeaturesForImportTask(menus) {
+      if (menus == null || menus.length == 0) {
+        this.epicFeaturesForImportTaskVisible = false;
+        return;
+      }
+      var menus2 = JSON.parse(JSON.stringify(menus));
+      menus2.forEach((i) => {
+        i.id = i.menuId;
+        i.parentTaskid = i.pmenuId;
+        i.name = i.menuName;
+        i.ntype="1"
+      });
+      this.onTaskTemplatesSelected(menus2);
+      this.epicFeaturesForImportTaskVisible = false;
     },
     //显示编辑界面 XmTask xm_task
     showEdit: function (row, index) {
@@ -842,39 +884,30 @@ export default {
       })
       this.load.add = true;
       var projectId=null;
-      var productId=null;
-      if(this.ptype==='0'){
-        if(this.parentTask && this.parentTask.id){
-          projectId=this.parentTask.projectId
-        }else{
-          projectId=this.filters.selProject.id
-        } 
+      var productId=null; 
+      if(this.parentTask && this.parentTask.id){
+        projectId=this.parentTask.projectId
       }else{
-         if(this.parentTask && this.parentTask.id){
-          productId=this.parentTask.productId
-        }else{
-          productId=this.filters.product.id
-        }
+        projectId=this.filters.selProject.id
+      } 
+      if(this.filters.xmProduct && this.filters.xmProduct.id){
+        productId=this.filters.xmProduct.id
+      }else{
+        if(taskTemplates2.some(k=>k.productId && k.isTpl!=='1')){
+          productId=taskTemplates2.find(k=>k.productId).productId
+        } 
       }
-      taskTemplates2.forEach((i) => {
-        if(this.ptype==='1'){
-          i.ptype="1"
-          i.projectId=null;
-          i.projectName=null;
-          if(productId!=i.productId){
-            i.menuId=null;
-            i.menuName=null;
-          }
-          i.productId=productId
-        }else if(this.ptype==='0'){
+       
+      taskTemplates2.forEach((i) => { 
           i.ptype="0"
           if(i.isTpl=='1'){
-            i.productId=null;
+            i.productId=productId;
             i.menuId=null;
             i.menuName=null;
-          }
-          i.projectId=projectId
-        }
+            
+          } 
+        i.ntype="1"
+        i.projectId=projectId 
         i.budgetAt = 0;
         i.budgetWorkload = 80;
         i.level = i.level ? i.level : "3";
@@ -902,13 +935,9 @@ export default {
       });
       var params={
         xmTasks:taskTemplates2,
-        ptype:this.ptype
-      }
-      if(this.ptype==='0'){
-        params.projectId=projectId
-      }else{
-        params.productId=productId
-      }
+        ptype:"0"
+      } 
+      params.projectId=projectId 
       if(this.parentTask && this.parentTask.id){
         params.parentTaskid=this.parentTask.id
       }
@@ -917,11 +946,7 @@ export default {
         .then((res) => {
           var tips = res.data.tips;
           if (tips.isOk) {
-            this.getXmTasks();
-            if(this.parentTask && this.parentTask.id){
-              treeTool.reloadChildren(this.$refs.table,this.maps,this.parentTask.id,'parentTaskid',this.loadXmTaskLazy)
-            }
-
+            this.getXmTasks();  
           }
           this.taskTemplateVisible = false;
           this.$notify({
@@ -1191,6 +1216,7 @@ export default {
     XmGroupDialog,
     XmTableConfig, 
     XmPhaseSelect,
+    XmEpicFeaturesSelect,
     //在下面添加其它组件
   },
   mounted() {
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index a3e9832e..1d39b4e9 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1670,6 +1670,7 @@ export default {
           i.menuId=null;
           i.menuName=null;
         }
+        i.ntype="0"
         i.projectId=projectId 
         i.budgetAt = 0;
         i.budgetWorkload = 80;