Browse Source

优化

master
陈裕财 4 years ago
parent
commit
85e2c1f94e
  1. 16
      src/styles/index.scss
  2. 16
      src/views/mdp/workflow/biz/bizModel/BizModelMng.vue
  3. 16
      src/views/mdp/workflow/de/model/ModelMng.vue
  4. 16
      src/views/mdp/workflow/re/deployment/DeploymentMng.vue
  5. 17
      src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue
  6. 16
      src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue
  7. 16
      src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue
  8. 89
      src/views/xm/core/xmMenu/XmMenuAdd.vue
  9. 64
      src/views/xm/core/xmMenu/XmMenuEdit.vue
  10. 34
      src/views/xm/core/xmMenu/XmMenuMng.vue

16
src/styles/index.scss

@ -194,18 +194,4 @@ code {
.multiselect--active {
z-index: 1000 !important;
}
//查询按钮
.el-input-group__append,
.el-input-group__prepend {
background-color: #409EFF !important;
color: #ffffff !important;
vertical-align: middle;
display: table-cell;
position: relative;
border: 1px solid #409EFF !important;
padding: 0 20px;
width: 1px;
white-space: nowrap;
}

16
src/views/mdp/workflow/biz/bizModel/BizModelMng.vue

@ -260,18 +260,4 @@
<style scoped>
</style>
<style>
.el-input-group__append, .el-input-group__prepend {
background-color: #409EFF!important;
color: #ffffff!important;
vertical-align: middle;
display: table-cell;
position: relative;
border: 1px solid #409EFF!important;
padding: 0 20px;
width: 1px;
white-space: nowrap;
}
</style>
</style>

16
src/views/mdp/workflow/de/model/ModelMng.vue

@ -398,18 +398,4 @@
<style scoped>
</style>
<style>
.el-input-group__append, .el-input-group__prepend {
background-color: #409EFF!important;
color: #ffffff!important;
vertical-align: middle;
display: table-cell;
position: relative;
border: 1px solid #409EFF!important;
padding: 0 20px;
width: 1px;
white-space: nowrap;
}
</style>
</style>

16
src/views/mdp/workflow/re/deployment/DeploymentMng.vue

@ -392,18 +392,4 @@ export default {
</script>
<style scoped>
</style>
<style>
.el-input-group__append, .el-input-group__prepend {
background-color: #409EFF!important;
color: #ffffff!important;
vertical-align: middle;
display: table-cell;
position: relative;
border: 1px solid #409EFF!important;
padding: 0 20px;
width: 1px;
white-space: nowrap;
}
</style>
</style>

17
src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue

@ -611,19 +611,4 @@ export default {
color: black;
font-weight: bold;
}
</style>
<style>
.el-input-group__append, .el-input-group__prepend {
background-color: #409EFF!important;
color: #ffffff!important;
vertical-align: middle;
display: table-cell;
position: relative;
border: 1px solid #409EFF!important;
padding: 0 20px;
width: 1px;
white-space: nowrap;
}
</style>
</style>

16
src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue

@ -350,18 +350,4 @@
font-weight: bold;
}
</style>
<style scoped>
.el-input-group__append,
.el-input-group__prepend {
background-color: #409EFF !important;
color: #ffffff !important;
vertical-align: middle;
display: table-cell;
position: relative;
border: 1px solid #409EFF !important;
padding: 0 20px;
width: 1px;
white-space: nowrap;
}
</style>

16
src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue

@ -589,18 +589,4 @@ export default {
color: black;
font-weight: bold;
}
</style>
<style>
.el-input-group__append, .el-input-group__prepend {
background-color: #409EFF!important;
color: #ffffff!important;
vertical-align: middle;
display: table-cell;
position: relative;
border: 1px solid #409EFF!important;
padding: 0 20px;
width: 1px;
white-space: nowrap;
}
</style>
</style>

89
src/views/xm/core/xmMenu/XmMenuAdd.vue

@ -5,17 +5,17 @@
<el-form :model="addForm" label-width="120px" :rules="addFormRules" ref="addForm">
<el-collapse value="1" accordion>
<el-collapse-item title="基本信息" name="1" >
<el-form-item label="节点类型" prop="ntype">
<el-radio :disabled="parentMenu&&parentMenu.menuId&&parentMenu.ntype==='0'" v-model="addForm.ntype" label="1">需求池</el-radio>
<el-radio v-model="addForm.ntype" label="0">需求</el-radio>
<br>
<font v-if="addForm.ntype==='0'" color="red" style="font-size:12px;">需求建议按以下逻辑描述一个需求什么人做什么事为什么</font>
<font v-if="addForm.ntype==='1'" color="red" style="font-size:12px;">需求池需求池下可建立子需求池或者需求负责汇总统计下级数据分解上级需求池预算</font>
</el-form-item>
<el-collapse-item :title="calcMenuLabel.label+'基本信息'" name="1" >
<el-row>
<el-col :span="6">
<el-form-item label="序号名称" prop="seqNo" >
<el-form-item label="序号名称" prop="seqNo" >
<template slot="label">
<div class="icon" :style="{backgroundColor: calcMenuLabel.color }">
<i :class="calcMenuLabel.icon"></i>
</div>
{{calcMenuLabel.label}}
</template>
<el-input v-model="addForm.seqNo" style="width:100%;" placeholder="如1.0 , 1.1 , 1.1.1等" ></el-input>
</el-form-item>
</el-col>
@ -32,12 +32,19 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="parentMenu" label="需求池" prop="pmenuId">
<el-link type="primary" :icon="'el-icon-folder-opened'">{{parentMenu.seqNo}} &nbsp; &nbsp; {{parentMenu.menuName}}</el-link>
</el-form-item>
<el-form-item v-if="!parentMenu" label="需求池" prop="pmenuId">
无归属需求池
</el-form-item>
<el-form-item v-if="!addForm.pmenuId" :label="addForm.dclass==='3'?'归属特性':(addForm.dclass==='2'?'归属史诗':'归属')" prop="pmenuId">
</el-form-item>
<el-form-item v-else :label="addForm.dclass==='3'?'归属特性':(addForm.dclass==='2'?'归属史诗':'归属')" prop="pmenuId">
<div v-if="addForm.dclass==='2'" class="icon" style="background-color: rgb(255, 153, 51);">
<i class="el-icon-s-promotion"></i>
</div>
<div v-if="addForm.dclass==='3'" class="icon" style="background-color: rgb(0, 153, 51);">
<i class="el-icon-s-flag"></i>
</div>
{{addForm.pmenuName?addForm.pmenuName:addForm.pmenuId}}
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -147,7 +154,19 @@
computed: {
...mapGetters([
'userInfo','roles'
])
]),
calcMenuLabel(){
var params={label:'工作项',icon:'',color:''};
if(this.addForm.dclass==='1'){
params={label:'史诗',icon:'el-icon-s-promotion',color:'rgb(255, 153, 51)'};
}else if(this.addForm.dclass==='2'){
params={label:'特性',icon:'el-icon-s-flag',color:'rgb(0, 153, 51)'};
}else if(this.addForm.dclass==='3'){
params={label:'用户故事',icon:'el-icon-document',color:' rgb(79, 140, 255)'};
}
return params;
},
},
props:['xmMenu','visible','parentMenu'],
watch: {
@ -157,8 +176,7 @@
this.addForm.mmUsername=this.userInfo.username
},
'visible':function(visible) {
if(visible==true){
debugger;
if(visible==true){
this.addForm={...this.xmMenu}
if(this.parentMenu && this.parentMenu.menuId){
if(this.parentMenu.childrenCnt){
@ -166,6 +184,17 @@
}else{
this.addForm.seqNo=this.parentMenu.seqNo+"."+1
}
this.addForm.pmenuId=this.parentMenu.menuId
this.addForm.pmenuName=this.parentMenu.menuName
if(this.parentMenu.dclass==='3'){
this.addForm.dclass='4'
}else if(this.parentMenu.dclass==='2'){
this.addForm.dclass='3'
}else if(this.parentMenu.dclass==='1'){
this.addForm.dclass='2'
}else if(this.parentMenu.dclass==='0'){
this.addForm.dclass='1'
}
}
}
@ -302,9 +331,20 @@
this.addForm.seqNo=this.parentMenu.seqNo+"."+(this.parentMenu.childrenCnt+1)
}else{
this.addForm.seqNo=this.parentMenu.seqNo+"."+1
}
this.addForm.pmenuId=this.parentMenu.menuId
this.addForm.pmenuName=this.parentMenu.menuName
if(this.parentMenu.dclass==='3'){
this.addForm.dclass='4'
}else if(this.parentMenu.dclass==='2'){
this.addForm.dclass='3'
}else if(this.parentMenu.dclass==='1'){
this.addForm.dclass='2'
}else if(this.parentMenu.dclass==='0'){
this.addForm.dclass='1'
}
}
}
/**在下面写其它函数***/
}//end mounted
@ -314,4 +354,15 @@
<style scoped>
.icon {
color: #fff;
height: 20px;
width: 20px;
border-radius: 15px;
text-align: center;
line-height: 20px;
font-size: 14px;
display: inline-block;
margin-right: 5px;
}
</style>

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

@ -2,31 +2,31 @@
<section class="page-container border padding">
<el-row class="page-main ">
<el-tabs>
<el-tab-pane label="需求详情">
<el-tab-pane :label="calcMenuLabel.label+'详情'">
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm">
<el-row class="padding-bottom">
<el-steps :active="calcMenuCurrStep" simple finish-status="success" align-center>
<el-steps :active="calcMenuCurrStep" finish-status="success" align-center>
<el-step v-for="(item,index) in dicts.menuStatus" @click.native="on_click(item.id)" :title="item.name" :key="index"></el-step>
</el-steps>
</el-row>
<el-collapse value="1" accordion>
<el-collapse-item title="基本信息" name="1" >
<el-form-item label="节点类型" prop="ntype">
<el-radio v-model="editForm.ntype" label="1">需求池</el-radio>
<el-radio v-model="editForm.ntype" label="0">需求</el-radio>
<br>
<font v-if="editForm.ntype==='0'" color="red" style="font-size:12px;">需求建议按以下逻辑描述一个需求什么人做什么事为什么</font>
<font v-if="editForm.ntype==='1'" color="red" style="font-size:12px;">需求池需求池下可建立子需求池或者需求负责汇总统计下级数据分解上级需求池预算</font>
</el-form-item>
<el-collapse-item title="基本信息" name="1" >
<el-row>
<el-col :span="6">
<el-form-item label="序号名称" prop="seqNo" >
<el-form-item label="calcMenuLabel.label" prop="seqNo" >
<template slot="label">
<div class="icon" :style="{backgroundColor: calcMenuLabel.color }">
<i :class="calcMenuLabel.icon"></i>
</div>
{{calcMenuLabel.label}}
</template>
<el-input v-model="editForm.seqNo" style="width:100%;" placeholder="如1.0 , 1.1 , 1.1.1等" ></el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="" prop="menuName" label-width="0px">
<el-input v-model="editForm.menuName" placeholder="名称" ></el-input>
<el-input v-model="editForm.menuName" placeholder="名称" >
</el-input>
</el-form-item>
</el-col>
</el-row>
@ -37,12 +37,18 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="!editForm.pmenuId" label="需求池" prop="pmenuId">
归属需求池
<el-form-item v-if="!editForm.pmenuId" :label="editForm.dclass==='3'?'归属特性':(editForm.dclass==='2'?'归属史诗':'归属')" prop="pmenuId">
</el-form-item>
<el-form-item v-else label="需求池" prop="pmenuId">
<el-link type="primary" :icon="'el-icon-folder-opened'"> {{editForm.pmenuName?editForm.pmenuName:editForm.pmenuId}}</el-link>
<el-form-item v-else :label="editForm.dclass==='3'?'归属特性':(editForm.dclass==='2'?'归属史诗':'归属')" prop="pmenuId">
<div v-if="editForm.dclass==='2'" class="icon" style="background-color: rgb(255, 153, 51);">
<i class="el-icon-s-promotion"></i>
</div>
<div v-if="editForm.dclass==='3'" class="icon" style="background-color: rgb(0, 153, 51);">
<i class="el-icon-s-flag"></i>
</div>
{{editForm.pmenuName?editForm.pmenuName:editForm.pmenuId}}
</el-form-item>
</el-col>
</el-row>
@ -203,9 +209,20 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
return 1;
}
}
}
},
calcMenuLabel(){
var params={label:'工作项',icon:'',color:''};
if(this.editForm.dclass==='1'){
params={label:'史诗',icon:'el-icon-s-promotion',color:'rgb(255, 153, 51)'};
}else if(this.editForm.dclass==='2'){
params={label:'特性',icon:'el-icon-s-flag',color:'rgb(0, 153, 51)'};
}else if(this.editForm.dclass==='3'){
params={label:'用户故事',icon:'el-icon-document',color:' rgb(79, 140, 255)'};
}
return params;
},
},
props:['xmMenu','visible','parentMenu','product'],
props:['xmMenu','visible','parentMenu','product','dclass'],
watch: {
'xmMenu':function( xmMenu ) {
this.editForm = xmMenu;
@ -366,4 +383,15 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
<style scoped>
.icon {
color: #fff;
height: 20px;
width: 20px;
border-radius: 15px;
text-align: center;
line-height: 20px;
font-size: 14px;
display: inline-block;
margin-right: 5px;
}
</style>

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

@ -209,24 +209,13 @@
<span class="vlink" @click="showEdit(scope.row)" >{{scope.row.seqNo}} &nbsp; {{scope.row.menuName}} </span>
<div class="tool-bar">
<span class="u-btn">
<el-tooltip v-if="scope.row.dclass==='2'||scope.row.dclass==='1'" :content="scope.row.dclass==='1'?'新建特性':'新建用户故事'">
<el-popover style="padding-left:10px;"
placement="top-start"
width="250"
trigger="hover" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<el-button @click="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus">直接添加{{scope.row.dclass==='1'?'新特性':'新用户故事'}}</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button @click="showImportFromMenuTemplate(scope.row)" icon="el-icon-upload2">由模板快速导入{{scope.row.dclass==='1'?'新特性':'新用户故事'}}</el-button>
</el-col>
</el-row>
<el-button slot="reference" icon="el-icon-plus" circle plain size="mini"></el-button>
</el-popover>
<el-tooltip v-if="scope.row.dclass==='2'||scope.row.dclass==='1'" :content="scope.row.dclass==='1'?'新建特性':'新建用户故事'">
<el-button @click="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建" circle plain size="mini"> </el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.dclass==='2'||scope.row.dclass==='1'" :content="scope.row.dclass==='1'?'新建特性':'新建用户故事'">
<el-button @click="showImportFromMenuTemplate(scope.row)" icon="el-icon-upload2" title="批量导入" circle plain size="mini"> </el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.dclass==='3'" content="新建任务">
<el-button icon="el-icon-plus" circle plain size="mini" @click="showTaskList(scope.row,scope.$index)"></el-button>
</el-tooltip>
@ -1130,7 +1119,18 @@
this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
})
}
},
calcMenuLabel(dclass){
var params={label:'工作项',icon:'',color:''};
if(dclass==='1'){
params={label:'史诗',icon:'el-icon-s-promotion',color:'rgb(255, 153, 51)'};
}else if(dclass==='2'){
params={label:'特性',icon:'el-icon-s-flag',color:'rgb(0, 153, 51)'};
}else if(dclass==='3'){
params={label:'用户故事',icon:'el-icon-document',color:' rgb(79, 140, 255)'};
}
return params;
},
},//end methods
components: {
'xm-menu-add':XmMenuAdd,

Loading…
Cancel
Save