任务优化

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

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;