Browse Source

优化

master
陈裕财 4 years ago
parent
commit
e599820da3
  1. 10
      src/views/xm/core/xmMenu/XmMenuMng.vue
  2. 55
      src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
  3. 2
      src/views/xm/core/xmProduct/XmProductTplMng.vue
  4. 34
      src/views/xm/core/xmProject/XmProjectTplMng.vue
  5. 4
      src/views/xm/core/xmTask/XmTaskMng.vue

10
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -13,11 +13,11 @@
<el-select v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option>
</el-select>
<el-select v-model="filters.taskFilterType" placeholder="分配过任务?" clearable style="width: 160px;">
<el-option value="not-join-any-project" label="未分配过任务"></el-option>
<el-option value="join-any-project" label="已分配过任务"></el-option>
<el-option value="not-join-curr-project" label="未分配到本项目"></el-option>
<el-option value="join-curr-project" label="已分配到本项目"></el-option>
<el-select v-model="filters.taskFilterType" placeholder="已关联任务的需求?" clearable style="width: 160px;">
<el-option value="not-join-any-project" label="未关联任务"></el-option>
<el-option value="join-any-project" label="已关联任务"></el-option>
<el-option value="not-join-curr-project" label="未有本项目任务关联"></el-option>
<el-option value="join-curr-project" label="有本项目任务关联"></el-option>
</el-select>
<el-select v-model="filters.iterationFilterType" placeholder="加入过迭代?" clearable style="width: 160px;">
<el-option value="not-join-any-iteration" label="未加入过迭代"></el-option>

55
src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue

@ -1,11 +1,14 @@
<template>
<section class="page-container border">
<el-row class="page-main">
<el-col :span="4" class="padding">
<xm-product-template-mng @row-click="onProductSelected" ref="xmProductTemplateMng" :simple="true"></xm-product-template-mng>
</el-col>
<el-col :span="18" class="padding">
<el-row>
<section class="page-container border padding">
<el-row class="page-main">
<el-row>
<el-popover
placement="bottom"
width="400"
trigger="click">
<xm-product-tpl-mng :auto-select="true" :isSelect="true" showType="simple" @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-tpl-mng>
<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品模板'}}</font></el-link>
</el-popover>
<el-input v-model="filters.key" style="width: 20%;" placeholder="需求名字模糊查询"></el-input>
<el-button v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenuTemplates">查询</el-button>
<el-button type="primary" v-if="isSelectMenu" v-loading="load.del" @click="selectedMenusConfirm" :disabled="this.sels.length===0 || load.del==true">确认选择</el-button>
@ -35,17 +38,7 @@
</el-table-column>
</el-table>
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination>
</el-col>
<!--编辑 XmMenuTemplate xm_project_menu界面-->
<el-drawer title="编辑需求" :visible.sync="editFormVisible" size="50%" append-to-body :close-on-click-modal="false">
<xm-menu-template-edit :xm-menu-template="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-menu-template-edit>
</el-drawer>
<!--新增 XmMenuTemplate xm_project_menu界面-->
<el-drawer title="新增需求" :visible.sync="addFormVisible" size="50%" append-to-body :close-on-click-modal="false">
<xm-menu-template-add :product="filters.product" :parent-menu="parentMenu" :xm-menu="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-menu-template-add>
</el-drawer>
</el-row>
</section>
</template>
@ -55,10 +48,8 @@
import treeTool from '@/common/js/treeTool';//
//import Sticky from '@/components/Sticky' // header
//import { listOption } from '@/api/mdp/meta/itemOption';//
import { listXmMenu, delXmMenuTemplate, batchDelXmMenuTemplate,batchEditXmMenuTemplate } from '@/api/xm/core/xmMenu';
import XmMenuTemplateAdd from './XmMenuTemplateAdd';//
import XmMenuTemplateEdit from './XmMenuTemplateEdit';//
import XmProductTemplateMng from '../xmProductTemplate/XmProductTemplateMng';//
import { listXmMenu, delXmMenuTemplate, batchDelXmMenuTemplate,batchEditXmMenuTemplate } from '@/api/xm/core/xmMenu';
import XmProductTplMng from '../xmProduct/XmProductTplMng';//
import { mapGetters } from 'vuex'
@ -218,7 +209,7 @@
selsChange: function (sels) {
this.sels = sels;
},
onProductSelected:function(product){
onProductRowClick:function(product){
this.filters.product=product
this.getXmMenuTemplates()
},
@ -286,24 +277,16 @@
},
},//end methods
components: {
'xm-menu-template-add':XmMenuTemplateAdd,
'xm-menu-template-edit':XmMenuTemplateEdit,
XmProductTemplateMng,
components: {
XmProductTplMng,
//
},
mounted() {
this.$nextTick(() => {
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmMenuTemplates();
});
//
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
this.rowDrop();
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmMenuTemplates();
});
}
}

2
src/views/xm/core/xmProduct/XmProductTplMng.vue

@ -255,7 +255,7 @@
params.orderBy= orderBys.join(",")
}
if(this.filters.key){
params.key=this.filters.key
params.key='%'+this.filters.key+'%'
}
if(this.filters.isMy=='1'){
params.assistantUserid=this.userInfo.userid

34
src/views/xm/core/xmProject/XmProjectTplMng.vue

@ -198,10 +198,8 @@
count:this.pageInfo.count,
};
if(this.filters.key!==""){
//params.xxx=this.filters.key
}else{
//params.xxx=xxxxx
}
params.key='%'+this.filters.key+'%';
}
if(this.dateRanger&&this.dateRanger.length==2){
@ -240,33 +238,7 @@
},
menuFilter(params) {
const key = this.menukey;
const userid = this.userInfo.userid;
if( this.dataScope=='all' && key == "compete"){
params.compete = userid;
}else if( this.dataScope!='all' && (key == "compete" || key=="all")){
params.compete = userid;
} else if(key == "leader"){ //
params.pgTypeIds=['nbxmjl']
params.userid=userid
}
else if(key == "moniter"){ //
params.pgTypeIds=['yyz','xmzl']
params.userid=userid
}
else if(key == "approver"){ //
params.pgTypeIds=['nbxmjl','xmzk','nbldz']
params.userid=userid
}
else if(key == "create"){
params.createUserid = userid;
}else if(key=="myFocus"){
params.myFocus="1"
params.userid=userid
}else if(key.indexOf("myExecuserStatus")>=0){
params.userid=userid
params.myExecuserStatus=key.substring("myExecuserStatus".length)
}
return params;
},

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

@ -888,6 +888,7 @@
:is-select-menu="true"
:multi="true"
:xm-product="filters.product"
:sel-project="filters.selProject"
@menus-selected="onSelectedMenus"
></xm-menu-select>
</el-drawer>
@ -904,6 +905,7 @@
:multi="true"
@menus-selected="onSelectedStory"
:xm-product="filters.product"
:sel-project="filters.selProject"
></xm-menu-select>
</el-drawer>
@ -1594,7 +1596,7 @@ export default {
});
return false;
}else if(this.ptype==='1'){
if( !this.xmProduct && this.xmProduct.id){
if( !this.filters.product && this.filters.product.id){
this.$notify({
showClose: true,
message: "请先选择产品",

Loading…
Cancel
Save