Browse Source

优化

master
陈裕财 5 years ago
parent
commit
07379c07d4
  1. 2
      src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
  2. 14
      src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
  3. 7
      src/views/xm/core/xmMenu/XmMenuMng.vue

2
src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue

@ -23,7 +23,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="任务" lazy name="tasks" > <el-tab-pane label="任务" lazy name="tasks" >
<xm-task-mng v-if="xmIteration && showPanel=='tasks'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng> <xm-task-mng v-if="xmIteration && showPanel=='tasks'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane label="缺陷" lazy name="bugs" > <el-tab-pane label="缺陷" lazy name="bugs" >
<xm-question-mng v-if="xmIteration && showPanel=='bugs'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng> <xm-question-mng v-if="xmIteration && showPanel=='bugs'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng>
</el-tab-pane> </el-tab-pane>

14
src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue

@ -1,12 +1,12 @@
<template> <template>
<section>
<section class="page-container padding">
<el-row > <el-row >
<el-col :span="8" class="page-main" v-if="!xmIteration">
<el-col :span="8" v-if="!xmIteration">
<xm-iteration-mng :simple="true" @row-click="onIterationRowClick" @clear-select="onIterationClearSelect"></xm-iteration-mng> <xm-iteration-mng :simple="true" @row-click="onIterationRowClick" @clear-select="onIterationClearSelect"></xm-iteration-mng>
</el-col> </el-col>
<el-col :span="xmIteration?24:16"> <el-col :span="xmIteration?24:16">
<el-row class="page-main page-height-90">
<el-row>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"> <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
<template slot="append"> <template slot="append">
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterationMenus" icon="el-icon-search"></el-button> <el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterationMenus" icon="el-icon-search"></el-button>
@ -14,7 +14,7 @@
</el-input> </el-input>
<el-button type="primary" @click="showAdd" icon="el-icon-plus">加入更多故事到迭代计划</el-button> <el-button type="primary" @click="showAdd" icon="el-icon-plus">加入更多故事到迭代计划</el-button>
</el-row> </el-row>
<el-row class="page-main page-height-90">
<el-row class="page-main padding-top">
<!--列表 XmIterationMenu 迭代定义--> <!--列表 XmIterationMenu 迭代定义-->
<el-table ref="table" :height="tableHeight" :data="xmIterationMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table ref="table" :height="tableHeight" :data="xmIterationMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="selection" width="45"></el-table-column> <el-table-column type="selection" width="45"></el-table-column>
@ -34,7 +34,7 @@
<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-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-row> </el-row>
</el-col> </el-col>
<el-drawer append-to-body title="故事选择" :visible.sync="menuVisible" with-header=false size="60%" :close-on-click-modal="false">
<el-drawer append-to-body title="故事选择" :visible.sync="menuVisible" size="60%" :close-on-click-modal="false">
<xm-menu-select :xm-iteration="xmIteration" :visible="menuVisible" :is-select-menu="true" :multi="true" :exclude-iteration-id="iteration?iteration.id:''" @menus-selected="onSelectedMenus" ></xm-menu-select> <xm-menu-select :xm-iteration="xmIteration" :visible="menuVisible" :is-select-menu="true" :multi="true" :exclude-iteration-id="iteration?iteration.id:''" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-drawer> </el-drawer>
</el-row> </el-row>
@ -58,7 +58,9 @@
'userInfo','roles' 'userInfo','roles'
]), ]),
xmIterationMenusTreeData(){ xmIterationMenusTreeData(){
return this.translateDataToTree(this.xmIterationMenus);
var data= this.translateDataToTree(this.xmIterationMenus);
debugger
return data;
}, },
}, },
watch:{ watch:{

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

@ -255,12 +255,7 @@
return false; return false;
} }
}, },
watch:{
'filters.product'(product){
if(product==null){
this.productVisible=true;
}
},
watch:{
xmIteration:function(){ xmIteration:function(){
this.getXmMenus() this.getXmMenus()
}, },

Loading…
Cancel
Save