From bc392cfbd2289f9a3dca7770a8656fd6dd6d82bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 28 Jan 2023 18:54:57 +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/xmTask/XmPhase.vue       | 32 ++++++++++++++++++----
 src/views/xm/core/xmTask/XmPhaseSelect.vue | 30 +++++++++++++++++---
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 791fd055..2a00750f 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -351,7 +351,27 @@ export default {
       const tasksTreeData = treeTool.translateDataToTree(xmTasks,"parentTaskid","id");
       return tasksTreeData;
     },
+    toSearchCpd(){
+      var key={iterationId:'',projectId:'',productId:'',parentTaskid:''};
+      if(this.xmIteration&&this.xmIteration.id){
+        key.iterationId=this.xmIteration.id
+        key.productId=this.xmIteration.productId
+      }else{
+        key.iterationId='' 
+      }
+      if(this.xmProduct&&this.xmProduct.id){  
+        key.productId=this.xmProduct.id
+      }else{
+        key.productId=''
+      }
 
+      if(this.selProject&&this.selProject.id){ 
+        key.projectId=this.selProject.id
+      }else{
+        key.projectId=''
+      } 
+      return key.iterationId+key.projectId+key.productId+key.parentTaskid
+    }
   },
   props: [
     "selProject",
@@ -367,16 +387,16 @@ export default {
   ],
   watch: {
     selProject: function (oval, val) {
-      this.filters.selProject = this.selProject; 
-      this.searchXmTasks();
+      this.filters.selProject = this.selProject;  
     },  
     xmProduct: function () {
-      this.filters.product = this.xmProduct;
-      this.searchXmTasks();
+      this.filters.product = this.xmProduct; 
     },
-    xmIteration: function () {
+    xmIteration: function () { 
+    }, 
+    toSearchCpd:function(){ 
       this.searchXmTasks();
-    },
+    }
   },
   data() { 
     return {
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index 00469ca7..d95e94cc 100644
--- a/src/views/xm/core/xmTask/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue
@@ -130,6 +130,27 @@ export default {
       return tasksTreeData;
     },
 
+    toSearchCpd(){
+      var key={iterationId:'',projectId:'',productId:'',parentTaskid:''};
+      if(this.xmIteration&&this.xmIteration.id){
+        key.iterationId=this.xmIteration.id
+        key.productId=this.xmIteration.productId
+      }else{
+        key.iterationId='' 
+      }
+      if(this.xmProduct&&this.xmProduct.id){  
+        key.productId=this.xmProduct.id
+      }else{
+        key.productId=''
+      }
+
+      if(this.selProject&&this.selProject.id){ 
+        key.projectId=this.selProject.id
+      }else{
+        key.projectId=''
+      } 
+      return key.iterationId+key.projectId+key.productId+key.parentTaskid
+    }
   },
   props: [
     "selProject", "xmProduct","xmIteration"
@@ -140,12 +161,13 @@ export default {
       this.changeSelKey("");
     }, 
     xmProduct: function () {
-      this.filters.product = this.xmProduct;
-      this.getXmTasks();
+      this.filters.product = this.xmProduct; 
     },
-    xmIteration: function () {
-      this.getXmTasks();
+    xmIteration: function () { 
     },
+    toSearchCpd:function(){ 
+      this.searchXmTasks();
+    }
   },
   data() { 
     return {