diff --git a/src/api/mdp/meta/item.js b/src/api/mdp/meta/item.js index 29f48f2f..5595f15e 100644 --- a/src/api/mdp/meta/item.js +++ b/src/api/mdp/meta/item.js @@ -68,8 +68,19 @@ export const initSimpleDicts=function(categoryId,itemCodes){ var classNames=['info','primary','success','warning','danger']; var colors=['#909399','#409EFF','#67C23A','#E6A23C','#F56C6C','#00ced1','#c71585','#ff8c00','#c7158577','#ffd700']; var cellValueInt=parseInt(cellValue) - if( isNaN(cellValueInt) ){ - cellValueInt=cellValue.chartCodeAt(cellValue.length-1) + if( isNaN(cellValueInt) ){ + if(cellValue instanceof String && cellValue.length>0){ + cellValueInt=cellValue.chartCodeAt(cellValue.length-1) + }else if(cellValue instanceof Object){ + if(cellValue['userid']){ + cellValueInt=cellValue['userid'].chartCodeAt(cellValue['userid'].length-1) + }else{ + cellValueInt=0; + } + + }else{ + cellValueInt=0; + } } var colorIndex=cellValueInt % 10 if(cellValueInt > 0 && colorIndex==0){ diff --git a/src/common/js/util.js b/src/common/js/util.js index 3dfa7c6e..b9ed034c 100644 --- a/src/common/js/util.js +++ b/src/common/js/util.js @@ -117,7 +117,7 @@ export default { cellValueInt=cellValue.chartCodeAt(cellValue.length-1) }else if(cellValue instanceof Object){ if(cellValue['userid']){ - cellValueInt=cellValue.chartCodeAt(cellValue['userid'].length-1) + cellValueInt=cellValue['userid'].chartCodeAt(cellValue['userid'].length-1) }else{ cellValueInt=0; } diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue index 5eb3e3db..a8799321 100644 --- a/src/views/xm/core/xmTask/XmPhase.vue +++ b/src/views/xm/core/xmTask/XmPhase.vue @@ -375,6 +375,8 @@ import treeTool from "@/common/js/treeTool"; //全局公共库 //import Sticky from '@/components/Sticky' // 粘性header组件 import { initSimpleDicts } from '@/api/mdp/meta/item'; //下拉框数据查询 import { + + initDicts, getTask, delXmTask, batchDelXmTask, @@ -1270,13 +1272,12 @@ export default { mounted() { this.initData(); this.$nextTick(() => { + initDicts(this) if( this.selProject && this.selProject.id){ this.getXmTasks(); } this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el); - initSimpleDicts( "all", ["planType","taskType","priority","xmTaskSettleSchemel","priority","taskState",'xm_plan_lvl' ]).then((res) => { - Object.assign(this.dicts,res.data.data) - }); + }); }, }; diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue index 23ede5f9..2fe62602 100644 --- a/src/views/xm/core/xmTask/XmPhaseSelect.vue +++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue @@ -106,6 +106,8 @@ import treeTool from "@/common/js/treeTool"; //全局公共库 //import Sticky from '@/components/Sticky' // 粘性header组件 import { initSimpleDicts } from '@/api/mdp/meta/item'; //下拉框数据查询 import { + + initDicts, getTask, listXmTask, calcProgress, @@ -401,13 +403,12 @@ export default { mounted() { this.initData(); this.$nextTick(() => { + initDicts(this) if(this.isTaskCenter ||(this.selProject && this.selProject.id)){ this.getXmTasks(); } this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el); - initSimpleDicts( "all", ["planType","taskType","priority","xmTaskSettleSchemel","priority","taskState",'xm_plan_lvl' ]).then((res) => { - Object.assign(this.dicts,res.data.data) - }); + }); }, }; diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index eac07a1a..012eb5a1 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -246,7 +246,7 @@