end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化bug

master
陈裕财 4 years ago
parent
274409a0c7
commit
88d642bd74
7 changed files with 34 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/xm/core/components/XmProjectSelect.vue
  2. 62
      src/views/xm/core/xmGroup/XmGroupMng.vue
  3. 4
      src/views/xm/core/xmMenu/XmMenuMngBatch.vue
  4. 8
      src/views/xm/core/xmMenu/XmMenuWithPlan.vue
  5. 8
      src/views/xm/core/xmProduct/XmProductMng.vue
  6. 4
      src/views/xm/core/xmProduct/XmProductTplMng.vue
  7. 5
      src/views/xm/core/xmQuestion/XmQuestionAdd.vue

6
src/views/xm/core/components/XmProjectSelect.vue
View File

@ -241,11 +241,11 @@
rowClick: function(row, event, column){
this.editForm=row
this.$emit('row-click',row, event, column);// @row-click="rowClick"
this.selectedProduct(row)
this.selectedProject(row)
this.projectVisible=false;
this.moreVisible=false;
},
selectedProduct:function(row){
selectedProject:function(row){
this.editForm=row
this.$emit('selected',row);
this.projectVisible=false;
@ -283,7 +283,7 @@
clearSelect(){
this.$refs.table.setCurrentRow();
this.$emit("clear");
this.selectedProduct(null);
this.selectedProject(null);
this.projectVisible=false;
this.moreVisible=false;
},

62
src/views/xm/core/xmGroup/XmGroupMng.vue
View File

@ -1,7 +1,7 @@
<template>
<section class="page-container border padding" >
<el-row>
<xm-project-select style="display:inline;" v-if="!selProject" :auto-select="true" :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectRowClick" @clear="onProjectClearSelect"></xm-project-select>
<xm-project-select style="display:inline;" v-if="!selProject" :auto-select="true" :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null" @selected="onProjectRowClick" @clear="onProjectClearSelect"></xm-project-select>
<el-input v-model="filters.key" style="width:15%;" clearable placeholder="名称过滤"></el-input>
<el-button type="primary" @click="searchXmGroups" icon="el-icon-search">刷新</el-button>
@ -54,10 +54,6 @@
<el-button type="primary" @click="loadNexGroup" icon="el-icon-search" v-loading="load.add">加载下一级小组</el-button>
<el-button @click="showProjectGroupAdd" icon="el-icon-plus" v-loading="load.add">新增项目小组</el-button>
</el-row>
<el-row v-else-if="currNodeType=='product'">
<el-button type="primary" @click="loadNexGroup" icon="el-icon-search" v-loading="load.add">加载下一级小组</el-button>
<el-button type="primary" @click="showProductGroupAdd" icon="el-icon-plus" v-loading="load.add">新增产品小组</el-button>
</el-row>
<el-row v-else-if="currNodeType=='group'">
<el-row>
<el-button type="primary" @click="loadNexGroup" icon="el-icon-search" v-loading="load.add">加载下一级小组</el-button>
@ -74,10 +70,6 @@
<el-row v-else-if="currNodeType=='groupUser'">
<el-button type="danger" icon="el-icon-delete" @click="handleDelGroupUser(editForm)" v-loading="load.del">删除组员</el-button>
</el-row>
<el-row v-else>
<el-button type="primary" @click="loadNexGroup" icon="el-icon-search" v-loading="load.add">加载下一级小组</el-button>
<el-button type="primary" @click="selectProjectVisible=true" icon="el-icon-plus" v-loading="load.add">新增项目小组</el-button>
</el-row>
</el-dialog>
<el-drawer append-to-body
@ -255,8 +247,8 @@ XmProductSelect,XmProjectSelect,
})
var groupsTree=treeTool.translateDataToTree(groups,'pgroupId','id')
var topLabel=this.userInfo.branchName+"-组织架构"
var currNodeType='branch'
var topdata={id:this.userInfo.branchId,branchName:this.userInfo.branchName,branchId:this.userInfo.branchId}
var currNodeType='project'
var topdata={}
if(this.filters.selProject && this.filters.selProject.id){
topLabel=this.filters.selProject.name+"-项目组织架构"
currNodeType='project'
@ -265,14 +257,8 @@ XmProductSelect,XmProjectSelect,
topdata.leaderUsername=this.filters.selProject.pmUsername
topdata.assUserid=this.filters.selProject.assUserid
topdata.assUsername=this.filters.selProject.assUsername
}else if(this.xmProduct && this.xmProduct.id){
topLabel=this.xmProduct.productName+"-产品组织架构"
currNodeType='product'
topdata=this.xmProduct
topdata.leaderUserid=this.xmProduct.pmUserid
topdata.leaderUsername=this.xmProduct.pmUsername
topdata.assUserid=this.xmProduct.assUserid
topdata.assUsername=this.xmProduct.assUsername
}else{
return []
}
var data=[{
...topdata,
@ -296,12 +282,6 @@ XmProductSelect,XmProjectSelect,
this.selProject=this.selProject;
this.getXmGroup();
},
xmProduct(){
this.getXmGroup();
},
xmIteration(){
this.getXmGroup();
},
"filters.key":function(val) {
this.$refs.tree.filter(val);
},
@ -434,13 +414,11 @@ XmProductSelect,XmProjectSelect,
}
params.orderBy= orderBys.join(",")
}
if( !this.filters.selProject || !this.filters.selProject.id){
return;
}
if(this.filters.selProject && this.filters.selProject.id){
params.projectId=this.filters.selProject.id
}else if(this.xmProduct && this.xmProduct.id){
params.productId=this.xmProduct.id
}else if(this.xmIteration && this.xmIteration.id){
params.iterationId=this.xmIteration.id
}
if(this.filters.key){
params.key=this.filters.key
@ -454,21 +432,8 @@ XmProductSelect,XmProjectSelect,
if(this.filters.mngUsernamekey){
params.mngUsernamekey=this.filters.mngUsernamekey
}
if(this.pgClass==='0'||!this.pgClass){
if(!params.projectId){
return;
}
}else if(this.pgClass==='1'){
if(!params.productId){
return;
}
}
var func=getGroups
this.load.list = true;
if( !params.productId && !params.projectId && !params.iterationId){
func=listXmGroup
params.lvl=1
}
func(params).then((res) => {
var tips=res.data.tips;
if(tips.isOk){
@ -699,7 +664,9 @@ XmProductSelect,XmProjectSelect,
this.$emit('row-click',row, event, column);// @row-click="rowClick"
},
initData: function(){
if(this.selProject){
this.filters.selProject=this.selProject;
}
},
renderCurrentClass (node) {
return 'label-bg-blue'
@ -758,15 +725,6 @@ XmProductSelect,XmProjectSelect,
this.addFormVisible=true;
this.selectProjectVisible=false;
},
onProductConfirm(product){
this.addForm={...this.addFormInit}
this.addForm.productId=product.id
this.addForm.groupName=product.productName+"-管理小组"
this.addForm.projectName=product.productName
this.addForm.pgClass="1"
this.addFormVisible=true;
this.selectProductVisible=false;
},
onProjectRowClick(project){
this.filters.selProject=project;
this.searchXmGroups();

4
src/views/xm/core/xmMenu/XmMenuMngBatch.vue
View File

@ -153,10 +153,6 @@
},
batchSaveMenu(){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'});
return false;
}
if(this.valueChangeRows.length==0){
this.$notify.success("没有数据被修改");
return

8
src/views/xm/core/xmMenu/XmMenuWithPlan.vue
View File

@ -412,10 +412,6 @@
},
//批量删除xmMenu
batchDel: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'});
return false;
}
this.$confirm('确认删除选中记录吗？', '提示', {
type: 'warning'
@ -506,10 +502,6 @@
},
showBatchEdit:function(){
if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'});
return false;
}
if(this.xmMenus.length==0 ){
this.$notify({position:'bottom-left',showClose:true,message:"没有数据可以修改", type: 'error'});
return ;

8
src/views/xm/core/xmProduct/XmProductMng.vue
View File

@ -512,10 +512,6 @@
},
//显示新增界面 XmProduct 产品表
showAdd: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够创建产品", type: 'error'});
return false;
}
this.addFormVisible = true;
//this.addForm=Object.assign({}, this.editForm);
},
@ -570,10 +566,6 @@
},
//批量删除xmProduct
batchDel: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够删除产品", type: 'error'});
return false;
}
var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid)
if(mmSels.length>0){
this.$notify({position:'bottom-left',showClose:true,message: "只能删除你负责的产品", type: 'error'});

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

@ -284,10 +284,6 @@
},
//显示新增界面 XmProduct 产品表
showAdd: function () {
if(!this.roles.some(i=>i.roleid=='productAdmin')){
this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够创建产品", type: 'error'});
return false;
}
this.addFormVisible = true;
//this.addForm=Object.assign({}, this.editForm);
},

5
src/views/xm/core/xmQuestion/XmQuestionAdd.vue
View File

@ -186,7 +186,12 @@
'visible':function(visible) {
if(visible==true){
//从新打开页面时某些数据需要重新加载，可以在这里添加
if(this.qtype){
this.addForm.qtype=this.qtype
}else{
this.addForm.qtype='1'
}
this.addForm.id=sn('bug_')
this.initByExec();

Write Preview
Loading…
Cancel
Save