diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue index ddb64100..f0f51f0f 100644 --- a/src/views/xm/core/xmFunc/XmFuncSelect.vue +++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue @@ -23,7 +23,7 @@ width="400" trigger="hover"> - 新建子功能模块 + 新建子模块 编辑 删除 @@ -303,7 +303,7 @@ export default { }, setDatasToCache(datas){ - debugger; + if(!this.xmProduct || !this.xmProduct.id){ return; } diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue index 9908d28a..35c2b658 100644 --- a/src/views/xm/core/xmGroup/XmGroupMng.vue +++ b/src/views/xm/core/xmGroup/XmGroupMng.vue @@ -677,7 +677,7 @@ XmTaskExecuserSelect, if(groupUsers==null||groupUsers.length==0){ return; } - debugger; + var params=groupUsers.map(i=>{ var u={ userid:i.userid, diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue index 3f6e5c26..cf0989e5 100644 --- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue +++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue @@ -683,7 +683,7 @@ }, setDatasToCache(datas){ - debugger; + if(!this.filters.product || !this.filters.product.id){ return; } diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue index 0d7436b4..be630628 100644 --- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue +++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue @@ -4,7 +4,7 @@ - + @@ -103,17 +103,14 @@ } }, watch:{ - xmIteration:function(){ - this.filters.iterationFilterType="join-curr-iteration" - this.filters.iteration=this.xmIteration - }, + xmProduct:function(){ this.filters.product=this.xmProduct }, selProject:function(){ }, toSearchCpd:function(){ - this.searchXmMenus(); + this.loadDatasFirstCache(); } }, data() { @@ -208,102 +205,25 @@ this.getXmMenus(); }, getParams(params){ - if(this.filters.mmUser){ - params.mmUserid=this.filters.mmUser.userid; - } - if(this.filters.iterationFilterType){ - params.iterationFilterType=this.filters.iterationFilterType - if(params.iterationFilterType==='not-join-any-iteration'){ - - }else if(params.iterationFilterType==='join-any-iteration'){ - - }else if(params.iterationFilterType==='not-join-curr-iteration'){ - params.filterIterationId=this.filters.iteration.id - }else if(params.iterationFilterType==='join-curr-iteration'){ - params.filterIterationId=this.filters.iteration.id - } - params.ntype="0" - }else{ - if(this.filters.iteration){ - params.iterationId=this.filters.iteration.id - } - } - if(this.xmIteration && this.xmIteration.id){ - params.linkIterationId=this.xmIteration.id - } - if(this.filters.taskFilterType){ - params.taskFilterType=this.filters.taskFilterType - - if(params.taskFilterType==='not-join-curr-project'){ - params.projectId=this.selProject.id - } - if(params.taskFilterType==='join-curr-project'){ - params.projectId=this.selProject.id - } - params.ntype="0" - } - if(this.selProject && this.selProject.id){ - params.linkProjectId=this.selProject.id - } + if(this.filters.product){ params.productId=this.filters.product.id } - if(this.filters.status){ - params.status=this.filters.status - } - - if(this.filters.dlvl){ - params.dlvl=this.filters.dlvl - } - - if(this.filters.dtype){ - params.dtype=this.filters.dtype - } - - if(this.filters.priority){ - params.priority=this.filters.priority - } - - if(this.filters.source){ - params.source=this.filters.source - } - if( this.dateRanger && this.dateRanger.length==2){ - params.ctimeStart=this.dateRanger[0] - params.ctimeEnd=this.dateRanger[1] - } - if(this.filters.tags && this.filters.tags.length>0){ - params.tagIdList=this.filters.tags.map(i=>i.tagId) - } + if(this.filters.dclasss){ params.dclasss=this.filters.dclasss - } - if(this.filters.menuId){ - params.menuId=this.filters.menuId - } - if(this.filters.productId){ - params.productId=this.filters.productId - } + } return params; }, //获取列表 XmMenu xm_project_menu getXmMenus() { let params = { - //pageSize: this.pageInfo.pageSize, - //pageNum: this.pageInfo.pageNum, - //total: this.pageInfo.total, - //count:this.pageInfo.count + pageSize: this.pageInfo.pageSize, + pageNum: this.pageInfo.pageNum, + total: this.pageInfo.total, + count:this.pageInfo.count }; - //this.xmMenus=[] - if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ - let orderBys=[]; - for(var i=0;i{ Object.assign(this.dicts,res.data.data) }) - this.filters.product=this.xmProduct - - if(this.xmIteration && this.xmIteration.id){ - this.filters.iterationFilterType='join-curr-iteration' - this.filters.iteration=this.xmIteration - } + this.filters.product=this.xmProduct this.$nextTick(() => { - this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el); - - if(this.xmProduct && this.xmProduct.id){ - this.getXmMenus(); - } + this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el); + this.loadDatasFirstCache(); }); } diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue index 1e25e9ad..e61b3c58 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue @@ -178,12 +178,9 @@ 保存 - - - - + - + @@ -192,13 +189,13 @@ - - + + - + - + @@ -210,8 +207,7 @@ import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件 import {sn} from '@/common/js/sequence'; import VueEditor from '@/components/Tinymce/index'; - import XmTaskList from '../xmTask/XmTaskList'; - import xmMenuSelect from '../xmMenu/XmMenuSelect'; + import xmMenuSelect from '../xmMenu/XmMenuSelect'; import XmQuestionHandleMng from '../xmQuestionHandle/XmQuestionHandleMng';//修改界面 import TagMng from "@/views/mdp/arc/tag/TagMng"; @@ -422,30 +418,7 @@ }, handleQuestion:function(tardgetBugStatus){ this.editSubmit(tardgetBugStatus); - }, - showSelectTask:function(){ - if(this.selProject==null){ - this.$notify({position:'bottom-left',showClose:true,message: "请先选项目", type: 'error' }); - return ; - } - this.selectTaskVisible=true; - }, - onSelectedTask(task){ - if(task.ntype=='1'){ - this.$notify({position:'bottom-left',showClose:true,message: "您选择的【"+task.name+"】属于任务集，请重新选择。建议选择树中叶子节点", type: 'error' }); - return; - } - this.editForm.taskId=task.id - this.editForm.taskName=task.name - if(!this.editForm.menuId){ - this.editForm.menuId=task.menuId - this.editForm.menuName=task.menuName - this.editForm.productId=task.productId - } - this.editForm.handlerUserid=task.executorUserid - this.editForm.handlerUsername=task.executorUsername - this.selectTaskVisible=false; - }, + }, handleCloseTaskTag:function(){ this.editForm.taskId='' this.editForm.taskName="" @@ -697,7 +670,7 @@ },//end method components: { //在下面添加其它组件 'xm-question-edit':XmQuestionEdit - 'upload': AttachmentUpload,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,XmProductSelect, + 'upload': AttachmentUpload,VueEditor,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,XmProductSelect, XmMyDoFocus,XmFuncSelect,MdpSelectUserXm,TestStepConfig,TestStepResult, xmTestPlanCaseMng:()=>import('../xmTestPlanCase/XmTestPlanCaseSelect'), 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue index 6b0f69a2..9c61211f 100644 --- a/src/views/xm/core/xmTask/XmPhase.vue +++ b/src/views/xm/core/xmTask/XmPhase.vue @@ -1054,7 +1054,7 @@ export default { }, loadDatasFirstCache(){ - debugger; + if(!this.filters.selProject || !this.filters.selProject.id){ return; } @@ -1069,7 +1069,7 @@ export default { }, setDatasToCache(datas){ - debugger; + if(!this.filters.selProject || !this.filters.selProject.id){ return; } diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue index 7c639975..74cd77a3 100644 --- a/src/views/xm/core/xmTask/XmPhaseSelect.vue +++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue @@ -169,7 +169,7 @@ export default { xmIteration: function () { }, toSearchCpd:function(){ - this.searchXmTasks(); + this.loadDatasFromCache(); } }, data() { @@ -417,6 +417,35 @@ export default { } }, + + loadDatasFirstCache(){ + + if(!this.filters.selProject || !this.filters.selProject.id){ + return; + } + var key="xm_phase_cache_"+this.filters.selProject.id + var dataStr=sessionStorage.getItem(key) + if(dataStr && dataStr!='null' && dataStr!='undefined'){ + this.xmTasks=JSON.parse(dataStr) + this.pageInfo.total=this.xmTasks.length; + }else{ + this.getXmTasks() + } + + }, + setDatasToCache(datas){ + + if(!this.filters.selProject || !this.filters.selProject.id){ + return; + } + var key="xm_phase_cache_"+this.filters.selProject.id + if(!datas || datas.length==0){ + sessionStorage.removeItem(key) + }else{ + sessionStorage.setItem(key,JSON.stringify(datas)) + } + + } }, //end methods components: { XmProjectSelect, diff --git a/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue b/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue index e5771192..ec9e8897 100644 --- a/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue +++ b/src/views/xm/core/xmWorkload/XmWorkloadRecord.vue @@ -67,7 +67,7 @@ computed: { ...mapGetters([ 'userInfo' ]), initVal(){ - debugger; + var params={} if( this.xmTask && this.xmTask.id){ params.id=this.xmTask.id @@ -157,7 +157,7 @@ saveSubmit: function () { }, initData: function(){ - debugger; + this.editForm=Object.assign({},this.initVal) this.editFormBak=Object.assign({},this.editForm) }, @@ -165,7 +165,7 @@ editSomeFields(row,fieldName,$event){ - debugger; + var func=null; var emit="edit-some-fields" var params={ids:[row.id]}; diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue index c848e8c6..e0542051 100644 --- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue +++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue @@ -265,7 +265,7 @@ }, onXmTestPlanSelected(xmTestPlan){ - debugger; + this.filters.testPlan=xmTestPlan },