From c6ba4c59966599e93deb513abca1451a6e6f1f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 30 Jun 2022 18:01:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=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/XmTaskAdd.vue | 13 ++++++-------
 src/views/xm/core/xmTask/XmTaskMng.vue | 12 ++++++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index f4cfa026..bde84ea0 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -27,13 +27,9 @@
 						
 						<el-row>
 							<el-col :span="12"> 
-								 <el-form-item v-if="addForm.ptype==='0'" label="归属项目" prop="projectId"> 
+								 <el-form-item  label="归属项目" prop="projectId"> 
 									{{addForm.projectName?addForm.projectName:addForm.projectId}}
-								</el-form-item>
-								
-								<el-form-item v-if="addForm.ptype==='1'" label="归属产品" prop="productId">
-									{{addForm.productName?addForm.productName:addForm.productId}}
-								</el-form-item>
+								</el-form-item> 
 							</el-col>
 							<el-col :span="12"> 
 								 <el-form-item label="上级计划" prop="parentTaskname">  
@@ -583,7 +579,10 @@
 					this.addForm.taskOut="0"
 					this.addForm.toTaskCenter="0"
 					this.addForm.crowd="0"
-				} 
+				}else{ 
+					this.addForm.parentTaskid=''
+					this.addForm.parentTaskname='';
+				}
 				if(this.xmProject){
 					this.addForm.projectId=this.xmProject.id
 					this.addForm.projectName=this.xmProject.name
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 8519fb4b..76e46884 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -221,6 +221,7 @@
           </el-popover> 
           <span style="float:right;"> 
           <el-popover
+            v-if="parentTask&&parentTask.id"
             placement="top-start"
             title="选择任务的方式"
             width="300"
@@ -1433,7 +1434,14 @@ export default {
       this.taskTemplateVisible = true;
     },
     checkCanAdd( parentTask){
-
+      if(!parentTask||!parentTask.id){
+         this.$notify({
+              showClose: true,
+              message: "请先选择上级计划",
+              type: "warning",
+            });
+            return false;
+      }
       if(parentTask && parentTask.id){
         if(parentTask.ntype=='0'){
            this.$notify({
@@ -1475,7 +1483,7 @@ export default {
     }, 
     //显示新增界面 XmTask xm_task
     showAdd: function (ntype) {
-      if(!this.checkCanAdd()){
+      if(!this.checkCanAdd(this.parentTask)){
         return;
       }   
       this.addForm.ntype=ntype;