From e6626cf8cf5e084a1717e565aefbe1e0a20bcbe1 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 08:23:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=94=B1=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTask/XmTaskMng.vue | 28 +++++++++-----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index c66c0423..a3e9832e 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1613,6 +1613,7 @@ export default {
         i.id = i.menuId;
         i.parentTaskid = i.pmenuId;
         i.name = i.menuName;
+        i.ntype="1"
       });
       this.onTaskTemplatesSelected(menus2);
       this.menuVisible = false;
@@ -1640,8 +1641,7 @@ export default {
       this.getXmTasks();
       this.menuStory = false;
     },
-    onTaskTemplatesSelected(taskTemplates) {
-      debugger;
+    onTaskTemplatesSelected(taskTemplates) { 
       if (taskTemplates == null || taskTemplates.length == 0) {
         this.taskTemplateVisible = false;
         return;
@@ -1701,6 +1701,12 @@ export default {
         ptype:"0"
       } 
       params.projectId=projectId 
+      if(this.filters.xmProduct && this.filters.xmProduct.id){
+         params.productId=this.filters.xmProduct.id
+      }else if(taskTemplates2.some(k=>k.productId)){
+          params.productId=taskTemplates2.find(k=>k.productId).productId
+      }
+     
       if(this.parentTask && this.parentTask.id){
         params.parentTaskid=this.parentTask.id
       }
@@ -1766,21 +1772,7 @@ export default {
         }
         return dateStr.substr(0, 10);
       }
-    },
-    formatDicts: function (itemCode, value) {
-      if (this.dicts[itemCode]) {
-        var dicts = this.dicts[itemCode].filter(
-          (i) => i.id == value
-        );
-        if (dicts && dicts.length > 0) {
-          return dicts[0].name;
-        } else {
-          return value;
-        }
-      } else {
-        return value;
-      }
-    },
+    }, 
  
     toFixed(floatValue, xsd) {
       if (floatValue == null || floatValue == "" || floatValue == undefined) {
@@ -2163,7 +2155,7 @@ export default {
           if(tips.isOk){
             this.searchXmTasks();
             
-            var rows=[...this.sels,{id:'xxxxx',parentTaskid:task.id}]
+            var rows=[...this.sels]
             //treeTool.reloadAllChildren(this.$refs.table,this.maps,rows,'parentTaskid',this.loadXmTaskLazy)
           }
           this.$notify({