Browse Source

优化

master
陈裕财 4 years ago
parent
commit
f9e02e85cf
  1. 18
      src/views/xm/core/xmMenu/XmMenuSelect.vue
  2. 3
      src/views/xm/core/xmProduct/XmProductSelect.vue
  3. 3
      src/views/xm/core/xmTask/XmTaskList.vue
  4. 6
      src/views/xm/core/xmTask/XmTaskMng.vue

18
src/views/xm/core/xmMenu/XmMenuSelect.vue

@ -8,7 +8,7 @@
placement="right" placement="right"
width="400" width="400"
trigger="click"> trigger="click">
<xm-product-mng :auto-select="true" v-if="!xmProduct" :xm-iteration="xmIteration" @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-mng>
<xm-product-select :auto-select="true" :sel-project="selProject" v-if="!xmProduct" :xm-iteration="xmIteration" @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-select>
<el-link type="warning" slot="reference" v-if="!xmProduct" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品'}}</font></el-link> <el-link type="warning" slot="reference" v-if="!xmProduct" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品'}}</font></el-link>
</el-popover> </el-popover>
<el-select class="hidden-md-and-down" v-if="excludeIterationId" v-model="filters.iterationFilterType" placeholder="是否加入过迭代?" clearable > <el-select class="hidden-md-and-down" v-if="excludeIterationId" v-model="filters.iterationFilterType" placeholder="是否加入过迭代?" clearable >
@ -117,7 +117,7 @@
//import Sticky from '@/components/Sticky' // header //import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';// //import { listOption } from '@/api/mdp/meta/itemOption';//
import { listXmMenu } from '@/api/xm/core/xmMenu'; import { listXmMenu } from '@/api/xm/core/xmMenu';
import XmProductMng from '../xmProduct/XmProductSelect';//
import XmProductSelect from '../xmProduct/XmProductSelect';//
import XmMenuRichDetail from './XmMenuRichDetail'; import XmMenuRichDetail from './XmMenuRichDetail';
import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@ -126,7 +126,7 @@
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
props:['isSelectMenu','excludeIterationId','multi','visible','xmIteration'],
props:['isSelectMenu','excludeIterationId','multi','visible','xmIteration','xmProduct','selProject'],
computed: { computed: {
...mapGetters([ ...mapGetters([
'userInfo','roles' 'userInfo','roles'
@ -144,6 +144,14 @@
}, },
xmItertaion(){ xmItertaion(){
this.getXmMenus(); this.getXmMenus();
},
xmProduct(){
this.filters.product=this.xmProduct
this.getXmMenus();
},
selProject(){
this.getXmMenus();
} }
}, },
data() { data() {
@ -412,7 +420,7 @@
},//end methods },//end methods
components: { components: {
XmProductMng,XmMenuRichDetail,UsersSelect
XmProductSelect,XmMenuRichDetail,UsersSelect
// //
}, },
@ -421,6 +429,8 @@
if(this.excludeIterationId){ if(this.excludeIterationId){
this.filters.iterationFilterType='not-join' this.filters.iterationFilterType='not-join'
} }
this.filters.product=this.xmProduct
this.getXmMenus(); this.getXmMenus();
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el); this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
}); });

3
src/views/xm/core/xmProduct/XmProductSelect.vue

@ -207,11 +207,10 @@
params.key="%"+this.filters.key+"%" params.key="%"+this.filters.key+"%"
}else{ }else{
//params.xxx=xxxxx //params.xxx=xxxxx
}
}
if(this.selProject){ if(this.selProject){
params.projectId=this.selProject.id params.projectId=this.selProject.id
} }
if(this.xmIteration){ if(this.xmIteration){
params.iterationId=this.xmIteration.id params.iterationId=this.xmIteration.id
} }

3
src/views/xm/core/xmTask/XmTaskList.vue

@ -118,6 +118,9 @@
this.filters.selProject=this.selProject this.filters.selProject=this.selProject
this.changeSelKey("all"); this.changeSelKey("all");
}, },
"xmProduct":function(){
this.changeSelKey("all");
}
}, },
data() { data() {
const beginDate = new Date(); const beginDate = new Date();

6
src/views/xm/core/xmTask/XmTaskMng.vue

@ -864,6 +864,8 @@
:visible="batchRelTasksWithMenuVisible" :visible="batchRelTasksWithMenuVisible"
:is-select-menu="true" :is-select-menu="true"
@selected="onBatchRelTasksWithMenu" @selected="onBatchRelTasksWithMenu"
:xm-product="filters.product"
:sel-project="filters.selProject"
></xm-menu-select> ></xm-menu-select>
</el-drawer> </el-drawer>
<el-drawer <el-drawer
@ -877,6 +879,7 @@
:visible="menuVisible" :visible="menuVisible"
:is-select-menu="true" :is-select-menu="true"
:multi="true" :multi="true"
:xm-product="filters.product"
@menus-selected="onSelectedMenus" @menus-selected="onSelectedMenus"
></xm-menu-select> ></xm-menu-select>
</el-drawer> </el-drawer>
@ -891,7 +894,8 @@
:visible="menuStory" :visible="menuStory"
:is-select-menu="true" :is-select-menu="true"
:multi="true" :multi="true"
@menus-selected="onSelectedStory"
@menus-selected="onSelectedStory"
:xm-product="filters.product"
></xm-menu-select> ></xm-menu-select>
</el-drawer> </el-drawer>

Loading…
Cancel
Save