diff --git a/src/styles/index.scss b/src/styles/index.scss index b73c234d..6f85e562 100644 --- a/src/styles/index.scss +++ b/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; - } + \ No newline at end of file diff --git a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue index 6027e9e9..a6e22894 100644 --- a/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue +++ b/src/views/mdp/workflow/biz/bizModel/BizModelMng.vue @@ -260,18 +260,4 @@ - - + diff --git a/src/views/mdp/workflow/de/model/ModelMng.vue b/src/views/mdp/workflow/de/model/ModelMng.vue index 5171e32c..38cd4489 100644 --- a/src/views/mdp/workflow/de/model/ModelMng.vue +++ b/src/views/mdp/workflow/de/model/ModelMng.vue @@ -398,18 +398,4 @@ - - + diff --git a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue index d75d74af..5840ad9a 100644 --- a/src/views/mdp/workflow/re/deployment/DeploymentMng.vue +++ b/src/views/mdp/workflow/re/deployment/DeploymentMng.vue @@ -392,18 +392,4 @@ export default { - - + diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue index b5fe0f73..c202b6a7 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForParames.vue @@ -611,19 +611,4 @@ export default { color: black; font-weight: bold; } - - - - + diff --git a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue index 91a7b737..301b85c3 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefListForSimpleStart.vue @@ -350,18 +350,4 @@ font-weight: bold; } - - + diff --git a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue index 47dda96a..a8c0370a 100644 --- a/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue +++ b/src/views/mdp/workflow/re/procdef/ProcdefSuspend.vue @@ -589,18 +589,4 @@ export default { color: black; font-weight: bold; } - - - + diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue index 9883d93f..47dac768 100644 --- a/src/views/xm/core/xmMenu/XmMenuAdd.vue +++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue @@ -5,17 +5,17 @@ - - - 需求池 - 需求 -
- 需求：建议按以下逻辑描述一个需求：什么人？做什么事？，为什么？ - 需求池：需求池下可建立子需求池或者需求。负责汇总统计下级数据，分解上级需求池预算。 - + + - + + @@ -32,12 +32,19 @@ - - {{parentMenu.seqNo}}     {{parentMenu.menuName}} - - - 无归属需求池 - + + 无 + + + +
+ +
+
+ +
+ {{addForm.pmenuName?addForm.pmenuName:addForm.pmenuId}} + @@ -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 @@ \ No newline at end of file diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index b73f71d5..a4ada6a6 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -2,31 +2,31 @@
- + - + - - - 需求池 - 需求 -
- 需求：建议按以下逻辑描述一个需求：什么人？做什么事？，为什么？ - 需求池：需求池下可建立子需求池或者需求。负责汇总统计下级数据，分解上级需求池预算。 - + - + + - + + @@ -37,12 +37,18 @@ - - 无归属需求池 + + 无 - - {{editForm.pmenuName?editForm.pmenuName:editForm.pmenuId}} + +
+ +
+
+ +
+ {{editForm.pmenuName?editForm.pmenuName:editForm.pmenuId}} @@ -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'; diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index e7457260..039924f2 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -209,24 +209,13 @@ {{scope.row.seqNo}}   {{scope.row.menuName}}
- - - - - 直接添加{{scope.row.dclass==='1'?'新特性':'新用户故事'}} - - - 由模板快速导入{{scope.row.dclass==='1'?'新特性':'新用户故事'}} - - - - - + + + + + @@ -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,