diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index 20ff9d38..f053a0f9 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -1,68 +1,66 @@ @@ -154,7 +135,7 @@ return this.translateDataToTree(this.xmIterations); }, }, - props:['simple','productId','menuId','visible'], + props:['productId','menuId','visible'], watch:{ visible:function(visible){ if(visible==true){ @@ -163,22 +144,25 @@ } }, data() { - const beginDate = new Date(); - const endDate = new Date(); - beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 ); + const beginDate = new Date(); + const endDate = new Date(); + beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 ); + endDate.setTime(endDate.getTime() + 3600 * 1000 * 24 * 7 * 4 * 3 ); return { filters: { - key: '' + key: '', + queryScope:'',//迭代查询范围 iterationId\branchId\compete\'' + id:'',//迭代编号 }, - pickerOptions: util.pickerOptions('datarange'), - dateRanger: [ - util.formatDate.format(beginDate, "yyyy-MM-dd"), - util.formatDate.format(endDate, "yyyy-MM-dd") - ],//创建时间选择范围 - dateRangerOnline: [ - util.formatDate.format(beginDate, "yyyy-MM-dd"), - util.formatDate.format(endDate, "yyyy-MM-dd") - ],//上线时间选择范围 + pickerOptions: util.pickerOptions('datarange'), + dateRanger: [ + util.formatDate.format(beginDate, "yyyy-MM-dd"), + util.formatDate.format(endDate, "yyyy-MM-dd") + ],//创建时间选择范围 + dateRangerOnline: [ + util.formatDate.format(beginDate, "yyyy-MM-dd"), + util.formatDate.format(endDate, "yyyy-MM-dd") + ],//上线时间选择范围 xmIterations: [],//查询结果 pageInfo:{//分页数据 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。 @@ -260,15 +244,11 @@ pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count:this.pageInfo.count - }; - if(!this.dateRanger || this.dateRanger.length==0){ - this.$message({ message: "创建日期范围不能为空", type: 'error' }); - return; - } - if(!this.dateRangerOnline || this.dateRangerOnline.length==0){ - this.$message({ message: "上线日期范围不能为空", type: 'error' }); - return; - } + }; + if(!this.dateRangerOnline || this.dateRangerOnline.length==0){ + this.$message({ message: "上线日期范围不能为空", type: 'error' }); + return; + } if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ let orderBys=[]; for(var i=0;i { var tips=res.data.tips; diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue new file mode 100644 index 00000000..9378f05a --- /dev/null +++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue @@ -0,0 +1,349 @@ + + + + + diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue index fe929baa..d3c413e2 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue @@ -44,7 +44,7 @@ import config from '@/common/config';//全局公共库 import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 import { listXmIterationMenu, delXmIterationMenu, batchDelXmIterationMenu,batchAddXmIterationMenu } from '@/api/xm/core/xmIterationMenu'; - import XmIterationMng from '../xmIteration/XmIterationMng';//修改界面 + import XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面 import { mapGetters } from 'vuex' import xmMenuSelect from '../xmMenu/XmMenuSelect'; diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index 8f2f3a68..85ec4a62 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -8,6 +8,10 @@ + + + + - - + + - + @@ -244,9 +248,9 @@ - + @@ -277,7 +281,7 @@ import XmTaskList from '../xmTask/XmTaskList'; import XmTaskMng from '../xmTask/XmTaskMng'; import XmTaskListForMenu from '../xmTask/XmTaskListForMenu'; - import XmIterationMng from '../xmIteration/XmIterationMng';//修改界面 + import XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面 import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import {sn} from '@/common/js/sequence' @@ -330,7 +334,7 @@ key: '', product:null, mmUser:null, - itertaionFilterType:'',//join、not-join、'' + iterationFilterType:'',//join、not-join、'' taskFilterType:'',//join、not-join、'' }, xmMenus: [],//查询结果 @@ -442,18 +446,14 @@ } if(this.filters.mmUser){ params.mmUserid=this.filters.mmUser.userid; - } - - if(this.excludeIterationId ){ - params.excludeIterationId=this.excludeIterationId - if(this.filters.itertaionFilterType){ - params.itertaionFilterType=this.filters.itertaionFilterType - } - }else{ - if(this.filters.taskFilterType){ - params.taskFilterType=this.filters.taskFilterType - } - } + } + params.excludeIterationId=this.excludeIterationId + if(this.filters.iterationFilterType){ + params.iterationFilterType=this.filters.iterationFilterType + } + if(this.filters.taskFilterType){ + params.taskFilterType=this.filters.taskFilterType + } params.ctimeStart=this.dateRanger[0]+" 00:00:00" params.ctimeEnd=this.dateRanger[1]+" 23:59:59" let callback= (res)=>{ diff --git a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue index ddb51038..bd57c248 100644 --- a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue +++ b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue @@ -30,7 +30,7 @@ 查看迭代计划 - + 查看评论 @@ -46,7 +46,7 @@ //import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 import { editXmMenu,listXmMenu } from '@/api/xm/core/xmMenu'; import { mapGetters } from 'vuex' - import XmIterationMng from '../xmIteration/XmIterationMng';//修改界面 + import XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面 import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng';//修改界面 diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index f4a04fc7..e94ef450 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -8,7 +8,7 @@ - + @@ -39,13 +39,13 @@ width="400" trigger="click" > - - + + - + @@ -160,7 +160,7 @@ filters: { key: '', product:null, - itertaionFilterType:'not-join',////join,not-join,'' + iterationFilterType:'',////join,not-join,'' mmUser:null, taskFilterType:'',//join,not-join,'' }, @@ -263,17 +263,14 @@ params.ctimeEnd=this.dateRanger[1]+" 23:59:59" if( this.filters.key){ params.key="%"+this.filters.key+"%" - } - if(this.excludeIterationId ){ - params.excludeIterationId=this.excludeIterationId - if(this.filters.itertaionFilterType){ - params.itertaionFilterType=this.filters.itertaionFilterType - } - }else{ - if(this.filters.taskFilterType){ - params.taskFilterType=this.filters.taskFilterType - } - } + } + params.excludeIterationId=this.excludeIterationId + if(this.filters.iterationFilterType){ + params.iterationFilterType=this.filters.iterationFilterType + } + if(this.filters.taskFilterType){ + params.taskFilterType=this.filters.taskFilterType + } this.load.list = true; listXmMenu(params).then((res) => { @@ -387,6 +384,9 @@ }, mounted() { this.$nextTick(() => { + if(this.excludeIterationId){ + this.filters.iterationFilterType='not-join' + } this.getXmMenus(); var clientRect=this.$refs.table.$el.getBoundingClientRect(); var subHeight=80/1000 * window.innerHeight; diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index ae4058ae..ab23a47a 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -1,7 +1,28 @@