diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue index 56945652..b88cd198 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue @@ -15,7 +15,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -76,8 +76,8 @@ }, }, watch:{ - 'xmIteration':function(xmIteration){ - this.onIterationRowClick(xmIteration) + 'xmIteration.id':function(){ + this.onIterationRowClick(this.xmIteration) } }, data() { diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index c8ca4b2b..bdc16e33 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -176,7 +176,7 @@ - + @@ -757,10 +757,8 @@ afterAddSubmit(row){ this.addFormVisible=false; this.pageInfo.count=true; - //this.getXmMenus(); - if(!row.pmenuId){ - this.xmMenus.push(row); - } + //this.getXmMenus(); + this.xmMenus.push(row); if(this.parentMenu){ this.parentMenu.childrenCnt=this.parentMenu.childrenCnt?this.parentMenu.childrenCnt+1:1; } diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index 07e502a2..918adb16 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -138,7 +138,7 @@ 确认选择 - + @@ -161,7 +161,7 @@ @@ -203,7 +203,7 @@ import { mapGetters } from 'vuex' export default { - props:['isSelectMenu','multi','visible','xmIteration','xmProduct','selProject','checkScope'/**0-需求，1-需求池 */,'iterationFilterType','taskFilterType'], + props:['isSelectMenu','multi','visible','xmIteration','xmProduct','selProject','checkScope'/**1-史诗，2-特性，3-用户故事 */,'iterationFilterType','taskFilterType'], computed: { ...mapGetters([ 'userInfo','roles' @@ -217,25 +217,25 @@ watch:{ visible:function(visible){ if(visible==true){ - this.getXmMenus(); + this.searchXmMenus(); } }, - xmItertaion(){ + "xmIteration"(){ if(this.iterationFilterType){ this.filters.iterationFilterType=this.iterationFilterType } if(this.xmIteration){ this.filters.iteration=this.xmIteration } - this.getXmMenus(); + this.searchXmMenus(); }, - xmProduct(){ + "xmProduct"(){ this.filters.product=this.xmProduct - this.getXmMenus(); + this.searchXmMenus(); }, - selProject(){ - this.getXmMenus(); + "selProject"(){ + this.searchXmMenus(); } }, data() { diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue index cfb7aed5..24881129 100644 --- a/src/views/xm/core/xmProject/XmProjectOverview.vue +++ b/src/views/xm/core/xmProject/XmProjectOverview.vue @@ -285,10 +285,10 @@ export default { return this.selProject.totalProgress; }, taskStartTime: function (){ - return this.selProject.startTime.substring(0,10); + return this.selProject.startTime?this.selProject.startTime.substring(0,10):''; }, taskEndTime: function (){ - return this.selProject.endTime.substring(0,10); + return this.selProject.endTime?this.selProject.endTime.substring(0,10):''; }, taskMng: function (){ return this.selProject.createUsername; diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue index 11dd55a0..1235a398 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue @@ -130,7 +130,7 @@ - + @@ -177,7 +177,7 @@ } }, - props:['xmQuestion','visible',"selProject",'qtype','xmTestCaseExec','xmTestCase'], + props:['xmQuestion','visible',"selProject",'qtype','xmTestCaseExec','xmTestCase','xmProduct'], watch: { 'xmQuestion':function( xmQuestion ) { this.addForm=Object.assign(this.addForm, this.xmQuestion); @@ -280,6 +280,9 @@ params.description=params.description.replace(/

\n
\n<\p>/g,""); params.description=params.description.replace("


<\p>",""); } + if(this.xmProduct && this.xmProduct.id){ + params.productId=this.xmProduct.id + } addXmQuestion(params).then((res) => { this.load.add=false var tips=res.data.tips; diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index 6bb4f88c..821a8ddd 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -87,14 +87,14 @@ - + {{i.name}} - + {{i.name}} @@ -179,8 +179,8 @@ - - + + diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 2221c3c8..4c37b943 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -241,7 +241,7 @@ - + diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index 1d842225..3f286eff 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -352,15 +352,6 @@ taskState: [ { required: true, message: '请选择任务状态', trigger: 'change' } ], - taskType: [ - { required: true, message: '请选择任务类型', trigger: 'change' } - ], - taskClass: [ - { required: true, message: '请选择是否结算', trigger: 'change' } - ], - toTaskCenter: [ - { required: true, message: '请选择是否发布', trigger: 'change' } - ], sortLevel: [ { required: true, message: '排序号不能为空', trigger: 'change' } ], diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index 46d2afc1..b89abb29 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -230,7 +230,7 @@ - + @@ -339,16 +339,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; ], taskState: [ { required: true, message: '请选择任务状态', trigger: 'blur' } - ], - taskClass: [ - { required: true, message: '请选择是否结算', trigger: 'blur' } - ], - toTaskCenter: [ - { required: true, message: '请选择是否发布', trigger: 'blur' } - ], - sortLevel: [ - { required: true, message: '排序号不能为空', trigger: 'blur' } - ], + ], // execuser:[{ // validator: validateExec, trigger: 'blur' // }], diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue index cc4f1bc9..024ca952 100644 --- a/src/views/xm/core/xmTask/XmTaskList.vue +++ b/src/views/xm/core/xmTask/XmTaskList.vue @@ -22,9 +22,7 @@ diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue index 3a6e225a..b663507b 100644 --- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue +++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue @@ -18,7 +18,7 @@ stripe fit default-expand-all - :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" + :tree-props="{children: 'children' }" row-key="id" :height="tableHeight" ref="table" diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index e96b7cc1..a9a6b1e5 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -377,9 +377,7 @@ @submit="afterEditSubmit" > - + diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue index fba257b7..81e19a83 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -36,7 +36,7 @@ - +