Browse Source

优化

master
陈裕财 4 years ago
parent
commit
5eb66921a3
  1. 2
      src/components/dateRange/index.vue
  2. 2
      src/views/xm/core/xmMenu/XmMenuEdit.vue
  3. 19
      src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
  4. 10
      src/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue

2
src/components/dateRange/index.vue

@ -52,7 +52,7 @@ export default {
styleObj:{ styleObj:{
typeof:Object, typeof:Object,
default:function(){return {'display':'block-inline'}}
default:function(){return {'display':'inline'}}
}, },
endKey: { endKey: {

2
src/views/xm/core/xmMenu/XmMenuEdit.vue

@ -252,7 +252,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
}else{ }else{
this.editForm = {...this.xmMenu}; this.editForm = {...this.xmMenu};
} }
this.activateTabPaneName="4"
this.editFormBak=Object.assign({},this.editForm) this.editFormBak=Object.assign({},this.editForm)
} }
}, },

19
src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue

@ -124,11 +124,11 @@ export default {
calcMenuLabel(){ calcMenuLabel(){
var params={label:'工作项',icon:'',color:''}; var params={label:'工作项',icon:'',color:''};
if(this.parentXmMenu.dclass==='0'){
if(this.addForm.dclass==='1'){
params={label:'史诗',icon:'el-icon-s-promotion',color:'rgb(255, 153, 51)'}; params={label:'史诗',icon:'el-icon-s-promotion',color:'rgb(255, 153, 51)'};
}else if(this.parentXmMenu.dclass==='1'){
}else if(this.addForm.dclass==='2'){
params={label:'特性',icon:'el-icon-s-flag',color:'rgb(0, 153, 51)'}; params={label:'特性',icon:'el-icon-s-flag',color:'rgb(0, 153, 51)'};
}else if(this.parentXmMenu.dclass==='2'){
}else if(this.addForm.dclass==='3'){
params={label:'故事',icon:'el-icon-document',color:' rgb(79, 140, 255)'}; params={label:'故事',icon:'el-icon-document',color:' rgb(79, 140, 255)'};
} }
return params; return params;
@ -150,8 +150,8 @@ export default {
return{ return{
load:{edit:false,list:false,add:false,del:false}, load:{edit:false,list:false,add:false,del:false},
xmMenus:[], xmMenus:[],
editForm:{menuName:''},
addForm:{menuName:''},
editForm:{menuName:'',dclass:'3'},
addForm:{menuName:'',dclass:'3'},
addFormVisible:false, addFormVisible:false,
addFormRules:{ addFormRules:{
menuName:[ menuName:[
@ -286,10 +286,10 @@ export default {
menu.mmUsername=this.userInfo.username menu.mmUsername=this.userInfo.username
menu.seqNo=this.parentXmMenu.seqNo+"."+(parseInt(this.parentXmMenu.childrenCnt)+1) menu.seqNo=this.parentXmMenu.seqNo+"."+(parseInt(this.parentXmMenu.childrenCnt)+1)
menu.pmenuId=this.parentXmMenu.menuId menu.pmenuId=this.parentXmMenu.menuId
menu.pmenuName=this.parentXmMenu.menuName
menu.dclass=(parseInt(this.parentXmMenu.dclass)+1)+'';
menu.pmenuName=this.parentXmMenu.menuName
menu.menuId=null; menu.menuId=null;
menu.menuName=this.addForm.menuName menu.menuName=this.addForm.menuName
menu.dclass=this.addForm.dclass
addXmMenu(menu).then((res) => { addXmMenu(menu).then((res) => {
this.load.edit=false this.load.edit=false
@ -302,8 +302,11 @@ export default {
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err => this.load.edit=false); }).catch( err => this.load.edit=false);
}, },
showAdd() {
showAdd(dclass) {
this.addForm.menuName=this.parentXmMenu.menuName+'---请修改' this.addForm.menuName=this.parentXmMenu.menuName+'---请修改'
if(dclass){
this.addForm.dclass=dclass
}
this.addFormVisible=true; this.addFormVisible=true;
}, },

10
src/views/xm/core/xmMenuWorkItem/XmSubWorkItem.vue

@ -4,14 +4,14 @@
<font>{{subWorkItemNum}}个子工作项</font> &nbsp;&nbsp; <font>{{subWorkItemNum}}个子工作项</font> &nbsp;&nbsp;
<span style="float:right;"> <span style="float:right;">
<xm-project-select style="display:inline;" :auto-select="false" v-if="parentXmMenu&&parentXmMenu.menuId && parentXmMenu.dclass==='3' && !linkProjectId" :link-product-id="parentXmMenu.productId" @row-click="xmProject=$event"></xm-project-select> <xm-project-select style="display:inline;" :auto-select="false" v-if="parentXmMenu&&parentXmMenu.menuId && parentXmMenu.dclass==='3' && !linkProjectId" :link-product-id="parentXmMenu.productId" @row-click="xmProject=$event"></xm-project-select>
<el-button v-if="parentXmMenu.dclass==='1'" icon="el-icon-plus" @click="showAdd(2)">
<el-button v-if="parentXmMenu.dclass==='1'" icon="el-icon-plus" @click="showAdd('2')">
<div class="icon" style="background-color: rgb(0, 153, 51);"> <div class="icon" style="background-color: rgb(0, 153, 51);">
<i class="el-icon-s-flag"></i> <i class="el-icon-s-flag"></i>
</div> 添加特性 </div> 添加特性
</el-button> </el-button>
<el-button v-if="parentXmMenu.dclass==='2'" icon="el-icon-plus" @click="showAdd(3)">
<div class="icon" :style="{backgroundColor: calcMenuLabel.color }">
<i :class="calcMenuLabel.icon"></i>
<el-button v-if="parentXmMenu.dclass==='2'||parentXmMenu.dclass==='1'" icon="el-icon-plus" @click="showAdd('3')">
<div class="icon" :style="{backgroundColor: 'rgb(79, 140, 255)' }">
<i :class="'el-icon-document'"></i>
</div> </div>
添加用户故事 添加用户故事
</el-button> </el-button>
@ -99,7 +99,7 @@ export default {
}, },
showAdd(dclass) { showAdd(dclass) {
if(dclass<4){ if(dclass<4){
this.$refs.menuList.showAdd();
this.$refs.menuList.showAdd(dclass);
}else if(dclass==='4'){ }else if(dclass==='4'){
if(!this.linkProjectId && !this.xmProject){ if(!this.linkProjectId && !this.xmProject){
this.$notify({position:'bottom-left',showClose:true,message:'请先选择一个项目',type:'warning'}) this.$notify({position:'bottom-left',showClose:true,message:'请先选择一个项目',type:'warning'})

Loading…
Cancel
Save