Browse Source

优化

master
陈裕财 4 years ago
parent
commit
2e1213ce61
  1. 4
      src/views/xm/core/xmProduct/XmProductTplMng.vue
  2. 10
      src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
  3. 2
      src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

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

@ -3,14 +3,14 @@
<el-row v-if="showType!='simple'"> <el-row v-if="showType!='simple'">
<el-checkbox v-model="filters.isMy" false-label="" true-label="1">我的模板</el-checkbox> <el-checkbox v-model="filters.isMy" false-label="" true-label="1">我的模板</el-checkbox>
<el-input style="width:300px;" v-model="filters.key" placeholder="模板名字"></el-input> <el-input style="width:300px;" v-model="filters.key" placeholder="模板名字"></el-input>
<el-button @click="searchXmProjects" icon="el-icon-search"></el-button>
<el-button @click="searchXmProducts" icon="el-icon-search"></el-button>
</el-row> </el-row>
<el-row v-if="showType=='simple'"> <el-row v-if="showType=='simple'">
<el-row> <el-row>
<el-checkbox v-model="filters.isMy" false-label="0" true-label="1">我的模板</el-checkbox> <el-checkbox v-model="filters.isMy" false-label="0" true-label="1">我的模板</el-checkbox>
</el-row> </el-row>
<el-row> <el-row>
<el-input style="width:80%;" v-model="filters.key" placeholder="模板名字"></el-input>&nbsp;&nbsp;<el-button @click="searchXmProjects" icon="el-icon-search"></el-button>
<el-input style="width:80%;" v-model="filters.key" placeholder="模板名字"></el-input>&nbsp;&nbsp;<el-button @click="searchXmProducts" icon="el-icon-search"></el-button>
</el-row> </el-row>
</el-row> </el-row>
<el-row class="page-main page-height-70" > <el-row class="page-main page-height-70" >

10
src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue

@ -183,6 +183,9 @@
expandedKeys.push(this.selProject.id) expandedKeys.push(this.selProject.id)
}else if(this.xmIteration){ }else if(this.xmIteration){
expandedKeys.push(this.xmIteration.id) expandedKeys.push(this.xmIteration.id)
}else{
var groupsLvl1=this.xmProjectGroups.filter(i=>i.lvl<=1)
expandedKeys.push(...groupsLvl1)
} }
return expandedKeys; return expandedKeys;
}, },
@ -356,9 +359,12 @@
if(this.filters.key){ if(this.filters.key){
params.key=this.filters.key params.key=this.filters.key
} }
var func=getGroups
this.load.list = true; this.load.list = true;
getGroups(params).then((res) => {
if( !params.productId && !params.projectId && !params.iterationId){
func=listXmProjectGroup
}
func(params).then((res) => {
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.pageInfo.total = res.data.total; this.pageInfo.total = res.data.total;

2
src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

@ -12,7 +12,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row class="page-main" v-loading="load.list" > <el-row class="page-main" v-loading="load.list" >
<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index">
<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index" class="padding">
<h3> <h3>
<div>{{item.groupName + ":"}} <div>{{item.groupName + ":"}}
</div> </div>

Loading…
Cancel
Save