diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 4ef532aa..aae5c3de 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -28,7 +28,7 @@
选择新的上级
@@ -47,7 +47,7 @@
-
+
提交
-
-
-
-
+
-
+
-
+
-
+
@@ -248,8 +245,7 @@
import xmMenuSelect from '../xmMenu/XmMenuSelect';
import XmPhaseSelect from './XmPhaseSelect';
import XmTaskList from '../xmTask/XmTaskList';
- import XmGroupSelect from '../xmGroup/XmGroupSelect.vue';
- import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm'
+ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm'
import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect";
export default {
computed: {
@@ -281,6 +277,23 @@
if(this.parentTask && this.parentTask.id && this.parentTask.projectId){
return {id:this.parentTask.projectId,name:this.parentTask.projectName}
}
+ if(this.xmTask.projectId){
+ return {id:this.xmTask.projectId,name:this.xmTask.projectName}
+ }
+ return null;
+ },
+
+ xmProductCpd(){
+ if(this.xmProduct && this.xmProduct.id){
+ return this.xmProduct
+ }
+ if(this.xmIteration && this.xmIteration.id){
+ return {id:this.xmIteration.productName,productName:this.xmIteration.productName}
+ }
+
+ if(this.xmTask.productId){
+ return {id:this.xmTask.productId,productName:this.xmTask.productName}
+ }
return null;
}
},
@@ -361,16 +374,19 @@
return;
}
}
+ /**
+ if(!this.addForm.parentTaskid){
+ this.$notify({position:'bottom-left',showClose:true,message:'请选择上级计划',type: 'error'})
+ return;
+ }
+ */
}
if(!this.addForm.projectId){
this.$notify({position:'bottom-left',showClose:true,message:'请选择项目',type: 'error'})
return;
}
- if(!this.addForm.parentTaskid){
- this.$notify({position:'bottom-left',showClose:true,message:'请选择上级计划',type: 'error'})
- return;
- }
+
this.$refs.addForm.validate((valid) => {
if (valid) {
@@ -410,7 +426,13 @@
},
/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-
+ toSelectParent(){
+ if(!this.addForm.projectId && !this.xmProjectCpd){
+ this.$notify({position:'bottom-left',showClose:true,message:"请先选择归属项目", type: 'error' });
+ return;
+ }
+ this.selectParentTaskVisible=true
+ },
showSkill(){
this.skillVisible = true;
},
@@ -550,36 +572,7 @@
})
},
- /**end 在上面加自定义方法**/
-
- showGroupUserSelect:function(){
- this.groupUserSelectVisible=true;
- },
- groupUserSelectConfirm:function(users){
- if( users==null || users.length==0 ){
- this.addForm.createUserid=""
- this.createUsername=""
- this.groupUserSelectVisible=false;
- return
- }
- this.addForm.createUserid=users[0].userid
- this.addForm.createUsername=users[0].username
- this.groupUserSelectVisible=false;
-
- },
-
-
- execGroupUserSelectConfirm:function(users){
- if( users==null || users.length==0 ){
- this.execGroupUserSelectVisible=false;
- this.addForm.executorUserid='';
- this.addForm.executorUsername=''
- return
- }
- this.addForm.executorUserid=users[0].userid
- this.addForm.executorUsername=users[0].username
- this.execGroupUserSelectVisible=false;
- },
+ /**end 在上面加自定义方法**/
initData(){
this.addForm={...this.addFormInit}
if(this.parentTask && this.parentTask.id){
@@ -674,7 +667,7 @@
},//end method
components: {
xmSkillMng,
- skillMng,xmMenuSelect,XmTaskList,XmGroupSelect,MdpSelectUserXm,XmPhaseSelect,XmProjectSelect
+ skillMng,xmMenuSelect,XmTaskList,MdpSelectUserXm,XmPhaseSelect,XmProjectSelect
//在下面添加其它组件 'xm-task-edit':XmTaskEdit
},
mounted() {
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 83ba890c..ad45f87b 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -15,9 +15,9 @@
预算管理
- 去发布
+ 去发布
- 去取消发布
+ 去取消发布
参加推广活动
@@ -38,16 +38,16 @@
报工、报进度
- 开始工作
+ 开始工作
- 设为已完工、待验收
+ 设为已完工、待验收
- 设为验收成功
- 设为验收不成功
+ 设为验收成功
+ 设为验收不成功
设为已结算
@@ -73,27 +73,27 @@
预算管理
去指派执行人
执行人管理
- 设为执行中
+ 设为执行中
子工作项管理
缺陷跟踪
报工、报进度
- 设为已完工、待验收
+ 设为已完工、待验收
- 设为已验收、待结算
- 设为验收不过，待执行
+ 设为已验收、待结算
+ 设为验收不过，待执行
- 设为已结算
+ 设为已结算
- 设为已关闭
+ 设为已关闭
@@ -141,13 +141,13 @@
-
+
-
+
去管理竞标人
-
+
@@ -504,41 +504,41 @@
-->
-
+
-
+
-
+
-
+
-
+
-
+