Browse Source

字典bug

master
陈裕财 3 years ago
parent
commit
20100b352c
  1. 13
      src/api/mdp/meta/item.js
  2. 2
      src/common/js/util.js
  3. 7
      src/views/xm/core/xmTask/XmPhase.vue
  4. 7
      src/views/xm/core/xmTask/XmPhaseSelect.vue
  5. 6
      src/views/xm/core/xmTask/XmTaskAdd.vue
  6. 8
      src/views/xm/core/xmTask/XmTaskMng.vue

13
src/api/mdp/meta/item.js

@ -69,7 +69,18 @@ export const initSimpleDicts=function(categoryId,itemCodes){
var colors=['#909399','#409EFF','#67C23A','#E6A23C','#F56C6C','#00ced1','#c71585','#ff8c00','#c7158577','#ffd700']; var colors=['#909399','#409EFF','#67C23A','#E6A23C','#F56C6C','#00ced1','#c71585','#ff8c00','#c7158577','#ffd700'];
var cellValueInt=parseInt(cellValue) var cellValueInt=parseInt(cellValue)
if( isNaN(cellValueInt) ){ if( isNaN(cellValueInt) ){
cellValueInt=cellValue.chartCodeAt(cellValue.length-1)
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 var colorIndex=cellValueInt % 10
if(cellValueInt > 0 && colorIndex==0){ if(cellValueInt > 0 && colorIndex==0){

2
src/common/js/util.js

@ -117,7 +117,7 @@ export default {
cellValueInt=cellValue.chartCodeAt(cellValue.length-1) cellValueInt=cellValue.chartCodeAt(cellValue.length-1)
}else if(cellValue instanceof Object){ }else if(cellValue instanceof Object){
if(cellValue['userid']){ if(cellValue['userid']){
cellValueInt=cellValue.chartCodeAt(cellValue['userid'].length-1)
cellValueInt=cellValue['userid'].chartCodeAt(cellValue['userid'].length-1)
}else{ }else{
cellValueInt=0; cellValueInt=0;
} }

7
src/views/xm/core/xmTask/XmPhase.vue

@ -375,6 +375,8 @@ import treeTool from "@/common/js/treeTool"; //全局公共库
//import Sticky from '@/components/Sticky' // header //import Sticky from '@/components/Sticky' // header
import { initSimpleDicts } from '@/api/mdp/meta/item'; // import { initSimpleDicts } from '@/api/mdp/meta/item'; //
import { import {
initDicts,
getTask, getTask,
delXmTask, delXmTask,
batchDelXmTask, batchDelXmTask,
@ -1270,13 +1272,12 @@ export default {
mounted() { mounted() {
this.initData(); this.initData();
this.$nextTick(() => { this.$nextTick(() => {
initDicts(this)
if( this.selProject && this.selProject.id){ if( this.selProject && this.selProject.id){
this.getXmTasks(); this.getXmTasks();
} }
this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el); 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)
});
}); });
}, },
}; };

7
src/views/xm/core/xmTask/XmPhaseSelect.vue

@ -106,6 +106,8 @@ import treeTool from "@/common/js/treeTool"; //全局公共库
//import Sticky from '@/components/Sticky' // header //import Sticky from '@/components/Sticky' // header
import { initSimpleDicts } from '@/api/mdp/meta/item'; // import { initSimpleDicts } from '@/api/mdp/meta/item'; //
import { import {
initDicts,
getTask, getTask,
listXmTask, listXmTask,
calcProgress, calcProgress,
@ -401,13 +403,12 @@ export default {
mounted() { mounted() {
this.initData(); this.initData();
this.$nextTick(() => { this.$nextTick(() => {
initDicts(this)
if(this.isTaskCenter ||(this.selProject && this.selProject.id)){ if(this.isTaskCenter ||(this.selProject && this.selProject.id)){
this.getXmTasks(); this.getXmTasks();
} }
this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el); 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)
});
}); });
}, },
}; };

6
src/views/xm/core/xmTask/XmTaskAdd.vue

@ -246,7 +246,7 @@
<script> <script>
import util from '@/common/js/util';// import util from '@/common/js/util';//
import { initSimpleDicts } from '@/api/mdp/meta/item';// import { initSimpleDicts } from '@/api/mdp/meta/item';//
import {addTask,addXmTask } from '@/api/xm/core/xmTask';
import {initDicts,addTask,addXmTask } from '@/api/xm/core/xmTask';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import {sn} from '@/common/js/sequence'; import {sn} from '@/common/js/sequence';
import xmSkillMng from '../xmTaskSkill/XmTaskSkillMng'; import xmSkillMng from '../xmTaskSkill/XmTaskSkillMng';
@ -635,9 +635,7 @@
}, },
mounted() { mounted() {
this.initData(); this.initData();
initSimpleDicts('all',['planType','taskType','priority','xmTaskSettleSchemel','taskState']).then(res=>{
this.dicts=res.data.data;
})
initDicts(this)
/**在下面写其它函数***/ /**在下面写其它函数***/
}//end mounted }//end mounted

8
src/views/xm/core/xmTask/XmTaskMng.vue

@ -847,10 +847,8 @@
<script> <script>
import Vue from "vue"; import Vue from "vue";
import util from "@/common/js/util"; // import util from "@/common/js/util"; //
import treeTool from "@/common/js/treeTool"; //
//import Sticky from '@/components/Sticky' // header
import { initSimpleDicts } from '@/api/mdp/meta/item'; //
import { import {
initDicts,
getTask, getTask,
listXmTask, listXmTask,
editXmTask, editXmTask,
@ -2199,13 +2197,11 @@ export default {
mounted() { mounted() {
this.initData(); this.initData();
this.$nextTick(() => { this.$nextTick(() => {
initDicts(this)
if(this.isTaskCenter ||(this.selProject && this.selProject.id)){ if(this.isTaskCenter ||(this.selProject && this.selProject.id)){
this.getXmTasks(); this.getXmTasks();
} }
this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el); 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)
});
}); });
}, },
}; };

Loading…
Cancel
Save