优化

src/api/mdp/meta/item.js

@@ -22,8 +22,7 @@ export const getDicts = params => { return axios.get(`${base}/mdp/meta/item/dict
     grade:[{id:'1',name:'等级1'},{id:'2',name:'等级2'}]
 }
 **/
-export const initSimpleDicts=function(categoryId,itemCodes){
-    
+export const initSimpleDicts=function(categoryId,itemCodes){ 
     if(!categoryId){
         categoryId="all"
     }

src/api/xm/core/xmProject.js

@@ -53,9 +53,9 @@ export const editXmProjectSomeFields = params => { return axios.post(`${base}/xm
 
 /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
 //初始化页面上的字典
-export const initDicts = (that) => {
+export const initDicts = (that) => { 
     //任务类型字典taskState,交易模式字典tranMode,能力要求字典capaLvl,保障要求字典supRequire,会员权益等级memInterestLvl
-    var itemCodes=["projectType", "priority", "projectStatus"];//在此添加要加载的字典 如['sex','grade','lvl']
+    var itemCodes=["projectType", "priority", "projectStatus",'xmType','workType'];//在此添加要加载的字典 如['sex','grade','lvl']
      if(itemCodes.length>0){
        initSimpleDicts('all',itemCodes).then(res=>{
            Object.assign(that.dicts,res.data.data)
@@ -68,68 +68,68 @@ export const getDefOptions= ()=>{
     
     var options={
     "projectStatus" : [ {
-        "optionValue" : "0",
-        "optionName" : "初始"
+        "id" : "0",
+        "name" : "初始"
         }, {
-        "optionValue" : "1",
-        "optionName" : "售前"
+        "id" : "1",
+        "name" : "售前"
         }, {
-        "optionValue" : "2",
-        "optionName" : "立项中"
+        "id" : "2",
+        "name" : "立项中"
         }, {
-        "optionValue" : "3",
-        "optionName" : "实施中"
+        "id" : "3",
+        "name" : "实施中"
         }, {
-        "optionValue" : "4",
-        "optionName" : "暂停中"
+        "id" : "4",
+        "name" : "暂停中"
         }, {
-        "optionValue" : "5",
-        "optionName" : "结项中"
+        "id" : "5",
+        "name" : "结项中"
         }, {
-        "optionValue" : "6",
-        "optionName" : "已结项"
+        "id" : "6",
+        "name" : "已结项"
         }, {
-        "optionValue" : "7",
-        "optionName" : "售后"
+        "id" : "7",
+        "name" : "售后"
         }, {
-        "optionValue" : "8",
-        "optionName" : "已完成"
+        "id" : "8",
+        "name" : "已完成"
         }, {
-        "optionValue" : "9",
-        "optionName" : "已关闭"
+        "id" : "9",
+        "name" : "已关闭"
         } ],
         "projectType" : [ {
-        "optionValue" : "0",
-        "optionName" : "it-新建-瀑布"
+        "id" : "0",
+        "name" : "it-新建-瀑布"
         }, {
-        "optionValue" : "2",
-        "optionName" : "it-新建-敏捷"
+        "id" : "2",
+        "name" : "it-新建-敏捷"
         }, {
-        "optionValue" : "1",
-        "optionName" : "it-存量-瀑布"
+        "id" : "1",
+        "name" : "it-存量-瀑布"
         } ],
         "priority" : [ {
-        "optionValue" : "zyx",
-        "optionName" : "最优先"
+        "id" : "zyx",
+        "name" : "最优先"
         }, {
-        "optionValue" : "yb",
-        "optionName" : "一般优先"
+        "id" : "yb",
+        "name" : "一般优先"
         }, {
-        "optionValue" : "ksh",
-        "optionName" : "可稍缓"
+        "id" : "ksh",
+        "name" : "可稍缓"
         } ],
         "urgencyLevel" : [ {
-        "optionValue" : "1",
-        "optionName" : "非常紧急"
+        "id" : "1",
+        "name" : "非常紧急"
         }, {
-        "optionValue" : "3",
-        "optionName" : "一般紧急"
+        "id" : "3",
+        "name" : "一般紧急"
         }, {
-        "optionValue" : "2",
-        "optionName" : "紧急"
+        "id" : "2",
+        "name" : "紧急"
         }, {
-        "optionValue" : "4",
-        "optionName" : "低"
+        "id" : "4",
+        "name" : "低"
         } ]
         }
         return options;

src/components/DictField/index.vue

@@ -31,14 +31,23 @@ import util from '@/common/js/util'
         var currentItem = null
         if(this.dict){
           currentItem= this.dict.find(k=>k.id==this.myVal) 
-        } 
+        }  
         var isEmpty=this.isEmpty(this.myVal)
         var obj={isNull:isEmpty,icon:'el-icon-full-screen',color:'#FFFFFF',innerText:''} 
-          if(this.getColor){
-            obj.color= this.getColor(this.myVal,currentItem,this.dict)
+          if(this.getColor||this.color){
+            if(this.getColor){
+               obj.color= this.getColor(this.myVal,currentItem,this.dict)
+            }else{
+              obj.color=this.color
+            }
+           
           }else{
             if(!isEmpty){
-              obj.color= util.getColor(this.myVal)
+              if(currentItem&&currentItem.color){
+                obj.color=currentItem.color
+              }else{
+                 obj.color= util.getColor(this.myVal)
+              } 
             } 
           } 
           if(this.getIcon||this.icon){
@@ -49,7 +58,11 @@ import util from '@/common/js/util'
             }
           }else {
             if(!isEmpty){
-              obj.icon= ''
+              if(currentItem && currentItem.icon){
+                obj.icon= currentItem.icon
+              }else{
+                obj.icon=''
+              }
             } 
           } 
           if(isEmpty){
@@ -170,8 +183,7 @@ import util from '@/common/js/util'
         onChange(data){  
           this.$emit('change',data)
         },
-        isEmpty(v) {
-          debugger;
+        isEmpty(v) { 
           switch (typeof v) {
           case 'undefined':
               return true;

src/views/xm/XmOverview.vue

@@ -133,8 +133,7 @@
 
 <script>
 import util from "@/common/js/util"; // 全局公共库
-import { mapGetters } from "vuex";
-import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+import { mapGetters } from "vuex"; 
 import { listXmBranchState  } from '@/api/xm/core/xmBranchState'; 
 import { listXmBranchFiveDayTaskCnt  } from '@/api/xm/core/xmBranchStateHis';
 import Guider from '@/components/Guider/Index.js';

src/views/xm/core/xmProject/XmProjectEdit.vue

@@ -246,9 +246,8 @@
 	import util from '@/common/js/util';//全局公共库
 	import {sn} from '@/common/js/sequence';//全局公共库
 
-	import config from "@/common/config"; //全局公共库
-	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { addXmProject,editXmProject,getDefOptions,createProjectCode,editXmProjectSomeFields } from '@/api/xm/core/xmProject'; 
+	import config from "@/common/config"; //全局公共库 
+	import { initDicts,addXmProject,editXmProject,createProjectCode,editXmProjectSomeFields } from '@/api/xm/core/xmProject'; 
 	import { uploadBase64 } from '@/api/mdp/arc/image'; 
 	
 	import { mapGetters } from 'vuex';  
@@ -452,7 +451,9 @@
 				filters: {
 					ids: [],
 				},
-				dicts: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts: {
+					"projectType":[], "priority":[], "projectStatus":[],'xmType':[],'workType':[]
+				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				load:{ list: false, add: false, del: false, edit: false },//查询中...
 				editFormRules: {
 					name: [{
@@ -920,10 +921,11 @@
 		    //在下面添加其它组件 'xm-project-add':XmProjectEdit
 		},
 		mounted() {  
-			this.initData();
-				initSimpleDicts('all',['projectType','priority','projectStatus','workType']).then(res=>{
-					this.dicts=res.data.data;
-				})
+			this.$nextTick(()=>{ 
+				initDicts(this)
+				this.initData();
+			})
+				 
 			
 		}
 	}