diff --git a/src/api/mdp/meta/item.js b/src/api/mdp/meta/item.js
index c4d64730..eea08e0b 100644
--- a/src/api/mdp/meta/item.js
+++ b/src/api/mdp/meta/item.js
@@ -2,17 +2,118 @@ import axios from '@/utils/request'
 
 import config from '@/common/config'
 
-let base=config.getSysBasePath();
+let base = config.getSysBasePath();
+
 
 /**
  * 数据项定义
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'主键 主键',itemCode:'代码',itemName:'名称',remark:'备注',categoryId:'分类编号',itemSize:'长度',itemType:'类型',branchId:'机构编号',deptid:'部门编号'}
+ *2 查询、新增、修改的参数格式  params={id:'主键 主键',itemCode:'代码，小写,下横线分割，请不要用驼峰命名',itemName:'名称',remark:'备注',categoryId:'分类编号',itemSize:'长度',itemType:'类型',branchId:'机构编号',deptid:'部门编号',cmenu:'是否创建菜单',values:'默认值,如果是列表，则存储列表编号，多个逗号分割',names:'默认名称，如果是列表，则存储列表名称，多个则逗号分割',options:'item_type=4,5时的选项列表[{value:值,name:显示名称}]',inputFormat:'输入提示',required:'是否必须0否1是',seq:'排序顺序',table:'表名',show:'是否显示0否1是',qx:'权限，是否可以0-新增，1-删除，2-编辑，3-查询，多个以逗号分割'}
  **/
  
 //普通查询 条件之间and关系  
 export const listItem = params => { return axios.get(`${base}/mdp/meta/item/list`, { params: params }); };
 
+export const getDicts = params => { return axios.get(`${base}/mdp/meta/item/dicts`, { params: params }); };
+
+/**下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex','grade']} 返回结果 
+{
+    sex:  [{id:'1',name:'男'},{id:'2',name:'女'}],
+    grade:[{id:'1',name:'等级1'},{id:'2',name:'等级2'}]
+}
+**/
+export const initSimpleDicts=function(categoryId,itemCodes){
+    
+    if(!categoryId){
+        categoryId="all"
+    }
+    return new Promise((resolve, reject) => {
+        var keys=itemCodes
+        var localDicts={}
+        var nolocalDictsKeys=[];
+        var datetime=new Date().getTime();
+        var millSec=24*60*60*1000;//一天的毫秒数
+        keys.forEach(i=>{
+            var key=categoryId+"_@"+i;
+           var value= localStorage.getItem(key)
+           if(value!=null &&value.length>0){
+               var data=JSON.parse(value)
+               var time=data.time;
+               if((datetime-time)>millSec){
+                nolocalDictsKeys.push(i)
+                localStorage.removeItem(key);
+               }else{
+                localDicts[i]=data.options
+               }
+                
+           }else{
+                nolocalDictsKeys.push(i)
+           }
+        })
+        if(nolocalDictsKeys.length==0){
+            var res={data:{tips:{isOk:true,msg:"成功"},data:localDicts}}
+            resolve(res)
+        }else{
+            getDicts({categoryId:categoryId,itemCodes:nolocalDictsKeys}).then(res=>{ 
+                if(!res.data.tips){
+                    reject(res)
+                }else if(res.data.tips.isOk){
+                    var data=res.data.data
+                    var dicts=localDicts;
+                    data.forEach(dict=>{
+                        if(dict.optionList){
+                            dict.options=JSON.parse(dict.optionList)
+                        }else{
+                        dict.options=[]
+                        }
+                        dicts[dict.itemCode]=dict.options
+                        localStorage.setItem(categoryId+'_@'+dict.itemCode,JSON.stringify({options:dict.options,time:datetime}))
+                    })
+                    res.data.data=dicts;
+                    resolve(res);
+                }else{
+                    resolve(res);
+                }  
+            }).catch(e=>reject(e));
+        } 
+    });
+};
+/**下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex','grade']} 返回结果 
+  {
+      sex:{id:'',itemCode:'',itemName:'',itemType:'',values:'',names:'','options':[{id:'1',name:'男'},{id:'2',name:'女'}]}
+      grade:{id:'',itemCode:'',itemName:'',itemType:'',values:'',names:'','options':[{id:'1',name:'等级1'},{id:'2',name:'等级2'}]}
+  }
+  
+ ***/
+export const initComplexDicts=function(categoryId,itemCodes){
+    
+    if(!categoryId){
+        categoryId="all"
+    }
+    return new Promise((resolve, reject) => {
+        getDicts({categoryId:categoryId,itemCodes:itemCodes}).then(res=>{ 
+                if(!res.data.tips){
+                    reject(res)
+                }else if(res.data.tips.isOk){
+                    var data=res.data.data
+                    var dicts={};
+                    data.forEach(dict=>{
+                        if(dict.optionList){
+                            dict.options=JSON.parse(dict.optionList)
+                        }else{
+                        dict.options=[]
+                        }
+                        dicts[dict.itemCode]=dict
+                    })
+                    res.data.data=dicts;
+                    resolve(res);
+                }else{
+                    resolve(res);
+                }  
+        }).catch(e=>reject(e));
+    });
+};
+ 
 //模糊查询数据项定义 条件之间or关系  
 //export const listItemKey = params => { return axios.get(`${base}/mdp/meta/item/listKey`, { params: params }); };
 
@@ -26,4 +127,12 @@ export const batchDelItem = params => { return axios.post(`${base}/mdp/meta/item
 export const editItem = params => { return axios.post(`${base}/mdp/meta/item/edit`, params); };
 
 //新增一条数据项定义
-export const addItem = params => { return axios.post(`${base}/mdp/meta/item/add`, params); };
\ No newline at end of file
+export const addItem = params => { return axios.post(`${base}/mdp/meta/item/add`, params); };
+
+//新增一条数据项定义
+export const copyToNewCategory = params => { return axios.post(`${base}/mdp/meta/item/copyToNewCategory`, params); };
+
+//新增或者修改
+export const insertOrUpdateItem = params => { return axios.post(`${base}/mdp/meta/item/insertOrUpdate`, params); };
+
+
diff --git a/src/views/xm/XmOverview.vue b/src/views/xm/XmOverview.vue
index 8a6e81f8..816ff9ad 100644
--- a/src/views/xm/XmOverview.vue
+++ b/src/views/xm/XmOverview.vue
@@ -335,7 +335,7 @@
 <script>
 import util from "@/common/js/util"; // 全局公共库
 import { mapGetters } from "vuex";
-import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询  
+import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
 	import { listXmBranchState,loadProjectStateToXmBranchState } from '@/api/xm/core/xmBranchState';
   
 	import Guider from '@/components/Guider/Index.js';
@@ -411,7 +411,7 @@ export default {
       isActive: true,
       xmBranchState:{},
       maxTableHeight:300,
-     // options: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+     // dicts: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
     };
   },
 
diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue
index bcc9e06f..25bd06b8 100644
--- a/src/views/xm/core/skill/skillMng.vue
+++ b/src/views/xm/core/skill/skillMng.vue
@@ -104,7 +104,7 @@
 <script>
 import util from "@/common/js/util"; //全局公共库
 //import Sticky from "@/components/Sticky"; // 粘性header组件
-//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 import {
   getAllHrSkill,
   delHrSkillCategory,
diff --git a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
index 74da524b..67b0a16b 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
@@ -37,7 +37,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmAttachment } from '@/api/xm/core/xmAttachment';
 	import { mapGetters } from 'vuex'
 	
@@ -60,7 +60,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
index cce7cb30..a3e79ac1 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
@@ -37,7 +37,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmAttachment } from '@/api/xm/core/xmAttachment';
 	import { mapGetters } from 'vuex'
 	
@@ -60,7 +60,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
index 65cd53f4..afb4b8b3 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
@@ -43,7 +43,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmAttachment, delXmAttachment, batchDelXmAttachment } from '@/api/xm/core/xmAttachment';
 	import  XmAttachmentAdd from './XmAttachmentAdd';//新增界面
 	import  XmAttachmentEdit from './XmAttachmentEdit';//修改界面
@@ -71,7 +71,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmAttachment界面是否显示
 				//新增xmAttachment界面初始化数据
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
index 3173cb29..46454373 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
@@ -172,7 +172,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmBranchState } from '@/api/xm/core/xmBranchState';
 	import { mapGetters } from 'vuex'
 	
@@ -195,7 +195,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
index ad44ba25..436c1af6 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
@@ -172,7 +172,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmBranchState } from '@/api/xm/core/xmBranchState';
 	import { mapGetters } from 'vuex'
 	
@@ -195,7 +195,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
index 93999d07..f9a05656 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
@@ -90,7 +90,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmBranchState, delXmBranchState, batchDelXmBranchState,loadProjectStateToXmBranchState } from '@/api/xm/core/xmBranchState';
 	import  XmBranchStateAdd from './XmBranchStateAdd';//新增界面
 	import  XmBranchStateEdit from './XmBranchStateEdit';//修改界面
@@ -118,7 +118,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -295,9 +295,9 @@
 				this.getXmBranchStates();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
index a3af048b..5f79bdfb 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
@@ -76,7 +76,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmBranchTaskTypeState } from '@/api/xm/core/xmBranchTaskTypeState';
 	import { mapGetters } from 'vuex'
 	
@@ -99,7 +99,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
index a873f284..2c937deb 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
@@ -76,7 +76,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmBranchTaskTypeState } from '@/api/xm/core/xmBranchTaskTypeState';
 	import { mapGetters } from 'vuex'
 	
@@ -99,7 +99,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
index e4ce888b..3eb5449f 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
@@ -56,7 +56,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmBranchTaskTypeState, delXmBranchTaskTypeState, batchDelXmBranchTaskTypeState } from '@/api/xm/core/xmBranchTaskTypeState';
 	import  XmBranchTaskTypeStateAdd from './XmBranchTaskTypeStateAdd';//新增界面
 	import  XmBranchTaskTypeStateEdit from './XmBranchTaskTypeStateEdit';//修改界面
@@ -84,7 +84,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -242,9 +242,9 @@
 				this.getXmBranchTaskTypeStates();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
index 8be2905a..26daad30 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
@@ -72,7 +72,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmEnvList } from '@/api/xm/core/xmEnvList';
 	import { mapGetters } from 'vuex'
 	
@@ -119,7 +119,7 @@
 			};
 
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					startTime: [
diff --git a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
index 278ecddd..2937fc44 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
@@ -72,7 +72,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmEnvList } from '@/api/xm/core/xmEnvList';
 	import { mapGetters } from 'vuex'
 	
@@ -98,7 +98,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index 8b03f654..e591cb58 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -57,7 +57,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmEnvList, delXmEnvList, batchDelXmEnvList } from '@/api/xm/core/xmEnvList';
 	import  XmEnvListAdd from './XmEnvListAdd';//新增界面
 	import  XmEnvListEdit from './XmEnvListEdit';//修改界面
@@ -85,7 +85,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmEnvList界面是否显示
 				//新增xmEnvList界面初始化数据
diff --git a/src/views/xm/core/xmExchange/XmExchangeAdd.vue b/src/views/xm/core/xmExchange/XmExchangeAdd.vue
index 266b1321..36c88029 100644
--- a/src/views/xm/core/xmExchange/XmExchangeAdd.vue
+++ b/src/views/xm/core/xmExchange/XmExchangeAdd.vue
@@ -85,7 +85,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmExchange } from '@/api/xm/core/xmExchange';
 	import { mapGetters } from 'vuex'
 	
@@ -108,7 +108,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmExchange/XmExchangeEdit.vue b/src/views/xm/core/xmExchange/XmExchangeEdit.vue
index e0cad227..09080c0f 100644
--- a/src/views/xm/core/xmExchange/XmExchangeEdit.vue
+++ b/src/views/xm/core/xmExchange/XmExchangeEdit.vue
@@ -85,7 +85,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmExchange } from '@/api/xm/core/xmExchange';
 	import { mapGetters } from 'vuex'
 	
@@ -108,7 +108,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmExchange/XmExchangeMng.vue b/src/views/xm/core/xmExchange/XmExchangeMng.vue
index c42c08a3..057dc044 100644
--- a/src/views/xm/core/xmExchange/XmExchangeMng.vue
+++ b/src/views/xm/core/xmExchange/XmExchangeMng.vue
@@ -43,7 +43,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmExchange, delXmExchange, batchDelXmExchange,addXmExchange } from '@/api/xm/core/xmExchange'; 
 	import TaskUserEditor from './TaskUserEditor'
 	import { mapGetters } from 'vuex'
@@ -77,7 +77,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -262,9 +262,9 @@
 				this.getXmExchanges();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmFile/XmFileAdd.vue b/src/views/xm/core/xmFile/XmFileAdd.vue
index 3a7e4ff0..890b963d 100644
--- a/src/views/xm/core/xmFile/XmFileAdd.vue
+++ b/src/views/xm/core/xmFile/XmFileAdd.vue
@@ -32,7 +32,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { addXmFile } from '@/api/xm/core/xmFile';
 	import { mapGetters } from 'vuex';
 	import VueEditor from '@/components/Tinymce/index';
@@ -59,7 +59,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmFile/XmFileEdit.vue b/src/views/xm/core/xmFile/XmFileEdit.vue
index 6089ee83..2903247d 100644
--- a/src/views/xm/core/xmFile/XmFileEdit.vue
+++ b/src/views/xm/core/xmFile/XmFileEdit.vue
@@ -34,7 +34,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmFile } from '@/api/xm/core/xmFile';
 	import { mapGetters } from 'vuex'
 	import VueEditor from '@/components/Tinymce/index';
@@ -59,7 +59,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue
index 594e343c..c4ad7a04 100644
--- a/src/views/xm/core/xmFile/XmFileMng.vue
+++ b/src/views/xm/core/xmFile/XmFileMng.vue
@@ -76,7 +76,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmFile, delXmFile, batchDelXmFile } from '@/api/xm/core/xmFile';
 	import  XmFileAdd from './XmFileAdd';//新增界面
 	import  XmFileEdit from './XmFileEdit';//修改界面
@@ -108,7 +108,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmFile界面是否显示
 				//新增xmFile界面初始化数据
diff --git a/src/views/xm/core/xmGroup/XmGroupEdit.vue b/src/views/xm/core/xmGroup/XmGroupEdit.vue
index a5476e1c..9c454791 100644
--- a/src/views/xm/core/xmGroup/XmGroupEdit.vue
+++ b/src/views/xm/core/xmGroup/XmGroupEdit.vue
@@ -141,7 +141,14 @@
                 if(this.opType=='edit'){
 
                 }else{
-
+					if(!this.editForm.leaderUserid){
+						this.editForm.leaderUserid=this.userInfo.userid
+						this.editForm.leaderUsername=this.userInfo.username
+					}
+					if(!this.editForm.assUserid){
+						this.editForm.assUserid=this.userInfo.userid
+						this.editForm.assUsername=this.userInfo.username
+					}
                 }
             },
 			showUserSelect(userType){
diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index ef4da34e..57dd14bc 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -2,17 +2,13 @@
 	<section class="page-container border padding" >
 		<el-row> 
 			 
-			<el-popover v-if="filters.pgClass==='0' && (!selProject  || !selProject.id)"
+			<el-popover v-if="pgClass==='0' && (!selProject  || !selProject.id)"
 				placement="right"
 				width="400"
 				trigger="click"> 
 				<xm-project-select :auto-select="true"   :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
 					<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
-			</el-popover>
-			<span v-if="xmProduct && xmProduct.id && (!selProject || !selProject.id)">
-			<el-radio v-model="filters.pgClass" label="1">产品组</el-radio>
-			<el-radio v-model="filters.pgClass" label="0">项目组</el-radio>
-			</span>
+			</el-popover> 
 			<el-input v-model="filters.key" style="width:15%;" clearable placeholder="名称过滤"></el-input>   
 			<el-button  type="primary" @click="searchXmGroups" icon="el-icon-search">刷新</el-button> 
 			<el-button  type="plain" @click="showGroupState" icon="el-icon-s-data">小组进度</el-button> 
@@ -237,7 +233,7 @@
 		    XmGroupEdit,VueOkrTree,UsersSelect,XmGroupStateMng,XmGroupUserMng,XmProjectList,
 XmProductSelect,XmProjectSelect,
 		},
-		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'],
+		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration','pgClass'],
 		computed: {
 		    ...mapGetters(['userInfo']),
 			expandedKeys(){  
@@ -322,14 +318,7 @@ XmProductSelect,XmProjectSelect,
 			},
 			"filters.key":function(val) {
 				this.$refs.tree.filter(val);
-			},
-			"filters.pgClass":function(val) { 
-				if(val==='1'){
-					this.filters.selProject=null; 
-					this.xmGroups=[]
-					this.searchXmGroups();
-				}
-			}
+			}, 
 		}, 
 		data() {
 			return {
@@ -338,8 +327,7 @@ XmProductSelect,XmProjectSelect,
 					groupNameKey:'',
 					mngUsernamekey:'',
 					groupUsernameKey:'',
-					selProject:null,
-					pgClass:'',
+					selProject:null, 
 				},
 				xmGroups: [],//查询结果
 				pageInfo:{//分页数据
@@ -480,6 +468,15 @@ XmProductSelect,XmProjectSelect,
 				if(this.filters.mngUsernamekey){
 					params.mngUsernamekey=this.filters.mngUsernamekey
 				}
+				if(this.pgClass==='0'||!this.pgClass){
+					if(!params.projectId){
+						return;
+					}
+				}else if(this.pgClass==='1'){
+					if(!params.productId){
+						return;
+					}
+				}
 				var func=getGroups
 				this.load.list = true;
 				if( !params.productId && !params.projectId && !params.iterationId){
@@ -716,14 +713,7 @@ XmProductSelect,XmProjectSelect,
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
 			},
             initData: function(){
-				this.filters.selProject=this.selProject;
-				if(this.selProject && this.selProject.id){
-					this.filters.pgClass="0"
-				}else if(this.xmProduct && this.xmProduct.id){
-					this.filters.pgClass="1"
-				}else{
-					this.filters.pgClass="0"
-				}
+				this.filters.selProject=this.selProject; 
             },
 			renderCurrentClass (node) {
 				return 'label-bg-blue'
diff --git a/src/views/xm/core/xmGroup/XmGroupSelect.vue b/src/views/xm/core/xmGroup/XmGroupSelect.vue
index 65f6deb1..010fd7de 100644
--- a/src/views/xm/core/xmGroup/XmGroupSelect.vue
+++ b/src/views/xm/core/xmGroup/XmGroupSelect.vue
@@ -1,17 +1,21 @@
 <template>
 	<section class="border padding-left">
-		<el-row class="padding-top">
-				<el-col :span="6"> 
-					<el-button   type="primary" @click="userConfirm" icon="el-icon-finished">确认选择</el-button> 
-				</el-col>
-				<el-col :span="18" class="hidden-sm-and-down">
- 					<el-tooltip    content="黄色表示选中"><span class="addXmGroupFormworkSquare"></span></el-tooltip> 
-					 {{this.filters.selProject?"项目：":""}}<el-tag type="primary" @click="selectProjectVisible=true" v-if="this.filters.selProject" closable @close="onProjectClose">{{this.filters.selProject.name}}</el-tag>
-					 <el-tag v-else type="warning" @click="selectProjectVisible=true"> 选择项目</el-tag>
-						&nbsp;&nbsp;
- 					 {{this.filters.xmProduct?"产品：":""}}<el-tag type="primary" @click="selectProductVisible=true" v-if="this.filters.xmProduct&&this.filters.xmProduct.id" closable @close="onProductClose">{{this.filters.xmProduct.productName}}</el-tag>
-					 <el-tag v-else type="warning" @click="selectProductVisible=true">选择产品</el-tag>
- 				</el-col> 
+		<el-row class="padding-top"> 
+					<el-popover v-if="(pgClass==='0'||!pgClass) && (!selProject  || !selProject.id)"
+						placement="right"
+						width="400"
+						trigger="click"> 
+						<xm-project-select :auto-select="true" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClose"></xm-project-select>
+							<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
+					</el-popover>
+					<el-popover v-if="pgClass==='1' && (!xmProduct  || !xmProduct.id)"
+						placement="right"
+						width="400"
+						trigger="click"> 
+							<xm-product-select :auto-select="true"  :sel-project="selProject" @row-click="onProductRowClick" @clear-select="onProductClose"></xm-product-select>
+							<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.xmProduct?filters.xmProduct.productName:'选择项目'}}</font></el-link> 
+					</el-popover> 
+					<el-button   type="primary" @click="userConfirm" icon="el-icon-finished">确认选择</el-button>  
 		</el-row>  
 		<el-row class="padding-top" v-loading="load.list" :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table">
 			<el-row v-for="(item,index) in xmGroupFormworkSels" :key="index"> 
@@ -28,12 +32,12 @@
 		</el-row>  
 		
 		<el-drawer title="选中项目团队" :visible.sync="selectProjectVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
-			<xm-project-list    @project-confirm="onPorjectConfirm"></xm-project-list>
+			<xm-project-list    @project-confirm="onProjectRowClick"></xm-project-list>
 		</el-drawer> 
 		
 		
 		<el-drawer title="选中产品团队" :visible.sync="selectProductVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
-			<xm-product-select  :isSelectProduct="true"  @selected="onProductConfirm"></xm-product-select>
+			<xm-product-select  :isSelectProduct="true"  @selected="onProductRowClick"></xm-product-select>
 		</el-drawer> 
 	</section>
 </template>
@@ -41,9 +45,9 @@
 <script>
 	import util from '@/common/js/util'; //全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
    	import {  getGroups } from '@/api/xm/core/xmGroup';
-   	import XmProjectList from '../xmProject/XmProjectList';
+   	import XmProjectSelect from '../xmProject/XmProjectSelect';
 
 	import {mapGetters} from 'vuex' 
 import XmProductSelect from '../xmProduct/XmProductSelect.vue';
@@ -55,7 +59,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 			])
 		},
 		//
-		props: ['visible','selProject','isSelectSingleUser','isSelectMultiUser','xmProduct'],
+		props: ['visible','selProject','isSelectSingleUser','isSelectMultiUser','xmProduct','pgClass'],
 		watch: {
 			"selGroups": function(selGroups) {
 				if(this.selGroups){
@@ -94,7 +98,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 				selGroups:[],
 				load: {list: false,edit: false,del: false,add: false}, //查询中...
 				sels: [], //列表选中数据
-				options: {
+				dicts: {
 					projectGroupType:[]
 				}, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
@@ -153,14 +157,14 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 				if(this.filters.xmProduct && this.filters.xmProduct.id){
 					params.productId=this.filters.xmProduct.id
 				}
-				if(!params.projectId && !params.productId){
-					this.$notify({showClose:true,message:'产品团队或者项目团队最少选中一个',type:'error'})
+				if(this.pgClass==='1' && !params.productId){
+					this.$notify({showClose:true,message:'请选择产品',type:'error'})
 					return;
 				}
 				
-				if(params.projectId && params.productId){
+				if((this.pgClass==='0' || !this.pgClass )&& !params.projectId){
 					params.productId=null
-					this.$notify({showClose:true,message:'产品团队或者项目团队只能选中一个，两个都选以项目团队为准',type:'warning'})
+					this.$notify({showClose:true,message:'请选择项目',type:'warning'})
 				}
 				getGroups(params).then(res=>{
 					var tips = res.data.tips;
@@ -172,7 +176,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 				})
 			},
 			
-			onPorjectConfirm:function(project){
+			onProjectRowClick:function(project){
 				this.filters.selProject=project
 				this.filters.xmProduct=null;
 				this.selectProjectVisible=false;
@@ -180,7 +184,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 			},
 			 
 			
-			onProductConfirm:function(product){
+			onProductRowClick:function(product){
 				this.filters.xmProduct=product
 				this.filters.selProject=null
 				this.selectProductVisible=false;
@@ -199,7 +203,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
 		}, //end methods
 		components: {
 			
-			XmProjectList,XmProductSelect			 
+			XmProjectSelect,XmProductSelect			 
 		},
 		mounted() {
 			this.$nextTick(() => { 
diff --git a/src/views/xm/core/xmGroupState/XmGroupStateMng.vue b/src/views/xm/core/xmGroupState/XmGroupStateMng.vue
index 7e2e66cd..6ca4fd3e 100644
--- a/src/views/xm/core/xmGroupState/XmGroupStateMng.vue
+++ b/src/views/xm/core/xmGroupState/XmGroupStateMng.vue
@@ -53,7 +53,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmGroupState, delXmGroupState, batchDelXmGroupState,loadTasksToXmGroupState } from '@/api/xm/core/xmGroupState';
 	import { mapGetters } from 'vuex'
 import XmGroupStateOverview from './XmGroupStateOverview.vue';
@@ -88,7 +88,7 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
@@ -274,9 +274,9 @@ XmGroupStateOverview
 				this.getXmGroupStates();
         	});
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmGroupState/XmGroupStateOverview.vue b/src/views/xm/core/xmGroupState/XmGroupStateOverview.vue
index 65322ec6..278253e6 100644
--- a/src/views/xm/core/xmGroupState/XmGroupStateOverview.vue
+++ b/src/views/xm/core/xmGroupState/XmGroupStateOverview.vue
@@ -207,7 +207,7 @@
 
 <script>
 import util from '@/common/js/util';//全局公共库
-//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 import { mapGetters } from 'vuex'
 
 
diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
index f735cd49..450259d9 100644
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue
@@ -39,7 +39,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmIteration } from '@/api/xm/core/xmIteration';
 	import { mapGetters } from 'vuex'	
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@@ -67,7 +67,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					iterationName: [
diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue
index 9878b9d4..4e164dcc 100644
--- a/src/views/xm/core/xmIteration/XmIterationEdit.vue
+++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue
@@ -1,5 +1,15 @@
 <template>
 	<section class="page-container  padding border">
+		
+		<el-row class="padding-header">
+			<el-steps :active="calcIterationCurrStep" simple finish-status="success">
+ 				<el-step  v-for="(i,index) in dicts['iterationStatus']" :title="i.name" :key="index" @click.native.stop="editForm.iphase=i.id">
+					 <el-link slot="title" >
+						 {{i.name}} 
+					 </el-link>
+				</el-step> 
+			</el-steps>
+		</el-row>
 		<el-row>
 			<!--新增界面 XmIteration 迭代定义--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">  
@@ -19,14 +29,13 @@
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item>   
 				<el-form-item label="负责人姓名" prop="adminUsername">
-					{{editForm.adminUsername}} <el-button @click="userSelectVisible=true">选择负责人</el-button>
+					{{editForm.adminUsername}} <el-button type="text" @click="userSelectVisible=true">选择负责人</el-button>
 				</el-form-item>  
 				<el-form-item label="预算工作量" prop="budgetWorkload">
 					<el-input v-model="editForm.budgetWorkload" type="number" min="0" style="width:60%;" placeholder="预算工作量"></el-input> 人时 ，1人工作1日=8人时
 				</el-form-item>    
 				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
+					<el-col :span="24" :offset="8">  
 						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
 					</el-col>
 				</el-form-item> 
@@ -41,7 +50,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { editXmIteration } from '@/api/xm/core/xmIteration';
 	import { mapGetters } from 'vuex'	
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@@ -51,7 +60,20 @@
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
-		    ])
+		    ]),
+			calcIterationCurrStep(){
+				var istatus= this.dicts.iterationStatus
+				if(!istatus){
+					return 1;
+				}else{
+					var status=istatus.findIndex(i=>this.editForm.iphase==i.id)
+					if(status>=0){
+						return status+1;
+					}else{
+						return 1;
+					}
+				}
+			} 
 		},
 		props:['xmIteration','visible'],
 		watch: {
@@ -65,7 +87,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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: { 
 					iterationName: [
@@ -77,7 +99,7 @@
 				},
 				//新增界面数据 迭代定义
 				editForm: {
-					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',seqNo:'',
+					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',seqNo:'',iphase:'0'
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				userSelectVisible:false,
@@ -134,8 +156,10 @@
 			//在下面添加其它组件 'xm-iteration-edit':XmIterationEdit
 			UsersSelect
 		},
-		mounted() {
-
+		mounted() { 
+			initSimpleDicts('all',['iterationStatus'] ).then(res=>{
+			this.dicts=res.data.data;
+			})
 			this.editForm=Object.assign(this.editForm, this.xmIteration);   
 			/**在下面写其它函数***/
 			
diff --git a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
index 786902b2..ef939ce3 100644
--- a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
@@ -16,7 +16,7 @@
 					</el-tab-pane>
 
 
-					<el-tab-pane  lazy   name="iterations" disabled> 
+					<el-tab-pane  lazy   name="iterations2" disabled> 
 						<div  slot="label">
 							<el-popover
 								placement="bottom"
@@ -60,7 +60,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { delXmIterationLink } from '@/api/xm/core/xmIterationLink';
 
  	import XmIterationSelect from './XmIterationSelect.vue'
diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue
index b14f85a2..e1f7c094 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfo.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfo.vue
@@ -50,7 +50,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject,editStatus , delXmProject, batchDelXmProject } from '@/api/xm/core/xmProject';
 	import  XmProjectAdd from '../xmProject/XmProjectAdd';//新增界面
 	import  XmProjectEdit from '../xmProject/XmProjectEdit';//修改界面
@@ -251,13 +251,13 @@
               } else {
                 return v[j];
               }
-              const options = this.$refs.xmMenuWithPlan.options;
-              if(options[key]==undefined || options[key]==null || options[key].length==0   ){
+              const dicts = this.$refs.xmMenuWithPlan.dicts;
+              if(dicts[key]==undefined || dicts[key]==null || dicts[key].length==0   ){
                 return v[j];
               }
-              var rowData=options[key].filter(i=>i.optionValue==v[j])
+              var rowData=dicts[key].filter(i=>i.id==v[j])
               if(rowData.length>0){
-                return rowData[0].optionName
+                return rowData[0].name
               }else{
                 return v[j];
               }
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 525d459b..ed19922b 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -129,7 +129,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmIteration,listXmIterationWithState, delXmIteration, batchDelXmIteration,loadTasksToXmIterationState } from '@/api/xm/core/xmIteration';
 	import { addXmIterationLink,delXmIterationLink } from '@/api/xm/core/xmIterationLink';
 
@@ -191,7 +191,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
@@ -530,9 +530,9 @@ import XmIterationSelect from './XmIterationSelect.vue';
         	});
           // console.log(this.dateRanger,this.dateRangerOnline);
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue
index 4769b7a9..17f69933 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverview.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue
@@ -5,14 +5,8 @@
         <el-card class="box-card" style="padding:0px ;height:100px">
           <div>
             <el-row style="padding:10px">
-              <el-steps :active="this.xmIteration.iphase+1" align-center finish-status="success">
-                <el-step title="未开始"></el-step>
-                <el-step title="需求评审"></el-step>
-                <el-step title="计划会"></el-step>
-                <el-step title="研发中"></el-step>
-                <el-step title="测试中"></el-step>
-                <el-step title="迭代上线"></el-step>
-                <el-step title="已完成"></el-step>
+              <el-steps :active="calcIterationCurrStep" align-center finish-status="success">
+                <el-step :title="item.name" v-for="(item,index) in dicts['iterationStatus']" :key="index"></el-step> 
               </el-steps>
             </el-row>
           </div>
@@ -245,6 +239,7 @@
 
 <script>
 import util from "@/common/js/util"; // 全局公共库
+import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 import { mapGetters } from "vuex";
 
 export default {
@@ -303,6 +298,19 @@ export default {
     xmIterationStateCpd(){
       return this.xmIteration
     },
+    calcIterationCurrStep(){
+				var istatus= this.dicts.iterationStatus
+				if(!istatus){
+					return 1;
+				}else{
+					var status=istatus.findIndex(i=>this.xmIteration.iphase==i.id)
+					if(status>=0){
+						return status+1;
+					}else{
+						return 1;
+					}
+				}
+			} 
   },
 
   props:['xmIteration'],
@@ -318,6 +326,7 @@ export default {
     return {
       isActive: true,
       maxTableHeight:300,
+      dicts:{},
       };
   },
 
@@ -574,6 +583,10 @@ export default {
   },
 
   mounted() {
+    
+    initSimpleDicts('all',['iterationStatus'] ).then(res=>{
+      this.dicts=res.data.data;
+    })
     this.$nextTick(() => { 
       this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
     });
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 8e20d83d..3684d086 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -6,12 +6,12 @@
 					<el-table-column type="index" label="序号" ></el-table-column>
 				   <el-table-column prop="iterationName" label="迭代名称" >
 					<template slot="header" slot-scope="scope">
-					迭代名称 <el-button type="text" @click="clearSelectIteration">清空所选</el-button>
+					迭代名称 <el-button type="text" @click="clearSelectIteration">清空所选</el-button> &nbsp;<el-button type="text" @click="close">关闭</el-button>
 					<el-popover v-if=" !menuId && !productId"
 						placement="top-start"
 						title=""
 						width="400"
-						trigger="click" >
+						trigger="hover" >
 						<el-row>  
 							<el-col :span="24" style="padding-top:5px;">
 								<font class="more-label-font">
@@ -54,7 +54,7 @@
 								<el-button  type="primary" icon="el-icon-search" @click="getXmIterations">查询</el-button>
 							</el-col> 
 						</el-row>
-						<el-button type="text" slot="reference" icon="el-icon-more">更多条件</el-button>
+						<el-button type="text" slot="reference">更多条件</el-button>
 					</el-popover>
 				</template>
 					 <template slot-scope="scope">
@@ -72,7 +72,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmIteration,listXmIterationWithState, delXmIteration, batchDelXmIteration,loadTasksToXmIterationState } from '@/api/xm/core/xmIteration';
   
 
@@ -125,7 +125,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
@@ -337,7 +337,9 @@
 					return 0;
 				}
 			},
-			
+			close(){
+				this.$emit("close")
+			},
 			loadTasksToXmIterationState(row){
 
 				this.load.edit=true;
diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue
index f2c018a4..83b4e1c3 100644
--- a/src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue
+++ b/src/views/xm/core/xmIterationLink/XmIterationLinkAdd.vue
@@ -34,7 +34,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmIterationLink } from '@/api/xm/core/xmIterationLink';
 	import { mapGetters } from 'vuex'
 	
@@ -57,7 +57,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					iterationId: [
diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkEdit.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkEdit.vue
index 10270d88..0422ef02 100644
--- a/src/views/xm/core/xmIterationLink/XmIterationLinkEdit.vue
+++ b/src/views/xm/core/xmIterationLink/XmIterationLinkEdit.vue
@@ -34,7 +34,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmIterationLink } from '@/api/xm/core/xmIterationLink';
 	import { mapGetters } from 'vuex'
 	
@@ -57,7 +57,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					iterationId: [
diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
index a07110cc..d45d37f1 100644
--- a/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
+++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
@@ -42,7 +42,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmIterationLinkWithProductInfo,addXmIterationLink, delXmIterationLink, batchDelXmIterationLink } from '@/api/xm/core/xmIterationLink';
  
 	import { mapGetters } from 'vuex'
@@ -82,7 +82,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -287,9 +287,9 @@
                 this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.xmIterationLink.$el)
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue
index d7fc4182..597cdf2e 100644
--- a/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue
+++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProject.vue
@@ -42,7 +42,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmIterationLinkWithProjectInfo,addXmIterationLink, delXmIterationLink, batchDelXmIterationLink } from '@/api/xm/core/xmIterationLink';
  
 	import { mapGetters } from 'vuex'
@@ -82,7 +82,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -287,9 +287,9 @@
                 this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.xmIterationLink.$el)
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
index 18405e60..bcf000fd 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
@@ -34,7 +34,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmIterationMenu } from '@/api/xm/core/xmIterationMenu';
 	import { mapGetters } from 'vuex'
 	
@@ -57,7 +57,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
index f5135035..7420cbf3 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
@@ -34,7 +34,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmIterationMenu } from '@/api/xm/core/xmIterationMenu';
 	import { mapGetters } from 'vuex'
 	
@@ -57,7 +57,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 78b68b2c..07a342c7 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -46,7 +46,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmIterationMenu, delXmIterationMenu, batchDelXmIterationMenu,batchAddXmIterationMenu } from '@/api/xm/core/xmIterationMenu'; 
 	import  XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面
 	import { mapGetters } from 'vuex'
@@ -86,7 +86,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -336,9 +336,9 @@
 				this.getXmIterationMenus();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
index 9423807a..05a6a4a2 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
@@ -79,7 +79,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmIterationState } from '@/api/xm/core/xmIterationState';
 	import { mapGetters } from 'vuex'
 	
@@ -102,7 +102,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
index 13f07edb..31bd4063 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
@@ -79,7 +79,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmIterationState } from '@/api/xm/core/xmIterationState';
 	import { mapGetters } from 'vuex'
 	
@@ -102,7 +102,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
index ba9e9b5e..21ec0ea3 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
@@ -50,7 +50,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmIterationState, delXmIterationState, batchDelXmIterationState } from '@/api/xm/core/xmIterationState';
 	import  XmIterationStateAdd from './XmIterationStateAdd';//新增界面
 	import  XmIterationStateEdit from './XmIterationStateEdit';//修改界面
@@ -84,7 +84,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -247,9 +247,9 @@
 				this.getXmIterationStates();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
index 80345c89..c6f6db76 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
@@ -50,7 +50,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmIterationState, delXmIterationState, batchDelXmIterationState } from '@/api/xm/core/xmIterationState';
 	import  XmIterationStateAdd from './XmIterationStateAdd';//新增界面
 	import  XmIterationStateEdit from './XmIterationStateEdit';//修改界面
@@ -84,7 +84,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -246,9 +246,9 @@
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 04bddb8d..9883d93f 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -2,50 +2,133 @@
 	<section class="page-container  padding border">
 		<el-row class="page-main ">
 			<!--新增界面 XmMenu 项目需求表--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
+			<el-form :model="addForm"  label-width="120px"  :rules="addFormRules" ref="addForm">
 				
-
-				<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 label="名称" prop="menuName">
-					<el-input v-model="addForm.menuName" placeholder="名称" ></el-input>
-				</el-form-item>   
-				<el-form-item label="序号" prop="seqNo">
-					<el-input v-model="addForm.seqNo" placeholder="如1.0 ， 1.1 ， 1.1.1等" ></el-input>
-					<span v-if="parentMenu" style="color:red;">建议：{{parentMenu.seqNo}}.{{parentMenu.childrenCnt?parentMenu.childrenCnt+1:1}} </span> 
-				</el-form-item> 
-				<el-form-item label="负责人" prop="mmUserid">
-					 <el-tag v-if="addForm.mmUserid" closable @close="clearPmUser">{{addForm.mmUsername}}</el-tag>
-					 <el-tag v-else>未配置</el-tag> 
-					 <el-button @click="selectUser">选负责人</el-button>
-				</el-form-item>   
-				<el-form-item label="需求链接" prop="demandUrl"> 
-					<el-input v-model="addForm.demandUrl" placeholder="需求链接" ></el-input> 
-				</el-form-item>  
-				<el-form-item label="代码链接" prop="codeUrl">
-					<el-input v-model="addForm.codeUrl" placeholder="代码链接" ></el-input>  
-				</el-form-item>  
-				<el-form-item label="设计链接" prop="designUrl">
-					<el-input v-model="addForm.designUrl" placeholder="设计链接" ></el-input>  
-				</el-form-item>   
-				<el-form-item label="操作手册链接" prop="operDocUrl">
-					<el-input v-model="addForm.operDocUrl" placeholder="操作手册链接" ></el-input>  
-				</el-form-item>  
-				<el-form-item label="概述" prop="remark">
-					<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" v-model="addForm.remark" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
-				</el-form-item>  
+				<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-row> 
+							<el-col :span="6">
+								<el-form-item label="序号名称" prop="seqNo" >
+									<el-input v-model="addForm.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="addForm.menuName" placeholder="名称" ></el-input>
+								</el-form-item>   
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="12">
+								<el-form-item label="归属产品" prop="productId">
+									<font v-if="addForm.productId">{{addForm.productName?addForm.productName:addForm.productId}}</font>
+								</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-col>
+						</el-row> 
+						<el-row> 
+							
+							<el-col :span="12">
+								<el-form-item  label="需求类型" prop="dtype" >   
+									<el-select v-model="addForm.dtype">
+										<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>  
+								</el-form-item>   
+							</el-col>
+							<el-col :span="12">
+								<el-form-item  label="需求来源" prop="source">   
+									<el-select v-model="addForm.source">
+										<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>  
+								</el-form-item>   
+							</el-col> 
+							<el-col :span="12">
+								<el-form-item  label="需求层次" prop="dlvl" >   
+									<el-select v-model="addForm.dlvl">
+										<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>  
+								</el-form-item>   
+							</el-col>
+							<el-col :span="12">
+							<el-form-item  label="优先级" prop="priority" >  
+								<el-select v-model="addForm.priority">
+										<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+								</el-select>    
+							</el-form-item>  
+							</el-col>
+						</el-row>
+							<el-row>
+								<el-col :span="12">
+									<el-form-item label="提出人" prop="proposerId">
+										<el-tag type="text" v-if="addForm.proposerId" closable @close="clearProposer">{{addForm.proposerName}}</el-tag> 
+										<el-button type="text" @click="selectProposer">选提出人</el-button>
+									</el-form-item>   
+								</el-col>
+								<el-col  :span="12">
+									<el-form-item label="跟进人" prop="mmUserid">
+										<el-tag type="text" v-if="addForm.mmUserid" closable @close="clearMmUser">{{addForm.mmUsername}}</el-tag> 
+										<el-button type="text" @click="mmUserSelectVisible=true">选跟进人</el-button>
+									</el-form-item>   
+								</el-col>
+							</el-row>
+					</el-collapse-item> 
+						<el-collapse-item title="需求概述" name="4"> 
+							<el-form-item label="需求概述" prop="remark">
+								<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="addForm.remark" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
+							</el-form-item>  
+						</el-collapse-item> 
+					<el-collapse-item title="成本进度预估" name="2">
+						<el-form-item label="预估工期" prop="budgetHours">
+							<el-input-number style="width:200px;"  v-model="addForm.budgetHours"  :precision="2" :step="8" :min="0" placeholder="预计工期(小时)"></el-input-number>&nbsp;小时
+						</el-form-item> 
+						<el-form-item label="预估工作量" prop="budgetWorkload">
+							<el-input-number style="width:200px;"  v-model="addForm.budgetWorkload" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)"></el-input-number> <el-tag>人时，{{this.toFixed(addForm.budgetWorkload/8/20)}}人月</el-tag>
+						</el-form-item> 
+						<el-form-item label="预估金额" prop="budgetAmount">
+							  <el-input-number style="width:200px;"  v-model="addForm.budgetAmount" :precision="2" :step="100" :min="0" placeholder="预算金额"></el-input-number>   元 
+						</el-form-item> 
+					</el-collapse-item>
+					<el-collapse-item title="相关链接" name="3"> 
+						<el-form-item label="需求链接" prop="demandUrl"> 
+							<el-input v-model="addForm.demandUrl" placeholder="需求链接" ></el-input> 
+						</el-form-item>  
+						<el-form-item label="代码链接" prop="codeUrl">
+							<el-input v-model="addForm.codeUrl" placeholder="代码链接" ></el-input>  
+						</el-form-item>  
+						<el-form-item label="设计链接" prop="designUrl">
+							<el-input v-model="addForm.designUrl" placeholder="设计链接" ></el-input>  
+						</el-form-item>   
+						<el-form-item label="操作手册链接" prop="operDocUrl">
+							<el-input v-model="addForm.operDocUrl" placeholder="操作手册链接" ></el-input>  
+						</el-form-item>  
+					</el-collapse-item>
+				</el-collapse>
 			</el-form>
 			
-			<el-drawer title="选择员工" :visible.sync="userSelectVisible" size="60%" append-to-body>
-				<users-select  @confirm="onUserSelected" ref="usersSelect"></users-select>
-			</el-drawer>	
+			<el-drawer title="选择提出人" :visible.sync="proposerSelectVisible" size="60%" append-to-body>
+				<users-select  @confirm="onProposerSelected" ref="usersSelect"></users-select>
+			</el-drawer>
+			
+			<el-drawer title="选择跟进人" :visible.sync="mmUserSelectVisible" size="60%" append-to-body>
+				<users-select  @confirm="onMmUserSelected" ref="mmUsersSelect"></users-select>
+			</el-drawer>
 			
 		</el-row>
-		<el-row>
+		<el-row class="padding">
 			<el-button @click.native="handleCancel">取消</el-button>  
 			<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
 		</el-row>
@@ -54,7 +137,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmMenu } from '@/api/xm/core/xmMenu';
 	import { mapGetters } from 'vuex'	
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
@@ -66,30 +149,31 @@
 		      'userInfo','roles'
 		    ])
 		},
-		props:['xmMenu','visible','parentMenu','product'],
+		props:['xmMenu','visible','parentMenu'],
 		watch: {
 	      'xmMenu':function( xmMenu ) {
-			this.addForm = xmMenu; 
+			this.addForm = {...xmMenu}; 
 			this.addForm.mmUserid=this.userInfo.userid
 			this.addForm.mmUsername=this.userInfo.username
 	      },
 	      'visible':function(visible) { 
 	      	if(visible==true){
-				  if(this.parentMenu){
-					  if(this.parentMenu.children){
-						    this.addForm.seqNo=this.parentMenu.seqNo+"."+(this.parentMenu.children.length+1)
-					  }else{
-						  this.addForm.seqNo=this.parentMenu.seqNo+"."+1
-					  }
-					  
-				  }
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
+				  debugger;
+				  this.addForm={...this.xmMenu}
+				if(this.parentMenu && this.parentMenu.menuId){
+					if(this.parentMenu.childrenCnt){
+						this.addForm.seqNo=this.parentMenu.seqNo+"."+(this.parentMenu.childrenCnt+1)
+					}else{
+						this.addForm.seqNo=this.parentMenu.seqNo+"."+1
+					}
+					
+				}
 	      	}
 	      } 
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					menuId: [
@@ -107,9 +191,11 @@
 				},
 				//新增界面数据 项目需求表
 				addForm: {
-						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:''
+						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:'',
+					proposerId:'',proposerName:'',dlvl:'',dtype:'',priority:'',source:''
 				},
-				userSelectVisible:false,
+				proposerSelectVisible:false,
+				mmUserSelectVisible:false,
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				
 				/**end 在上面加自定义属性**/
@@ -122,12 +208,12 @@
 			},
 			//新增提交XmMenu 项目需求表 父组件监听@submit="afterAddSubmit"
 			addSubmit: function () {
-				if(this.parentMenu==null && this.product ==null ){
+				if(this.addForm.productId==null){
 					this.$notify({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); 
 					return;
 				}
 				if(this.parentMenu && this.parentMenu.ntype=="0"){
-					 this.$notify({showClose: true, message: '需求集下不能再建立子需求', type:'error' }); 
+					 this.$notify({showClose: true, message: '需求池下不能再建立子需求', type:'error' }); 
 					return;
 				}
 				this.$refs.addForm.validate((valid) => {
@@ -139,13 +225,14 @@
 							if(this.parentMenu!=null){
 								params.productId=this.parentMenu.productId
 								params.pmenuId=this.parentMenu.menuId
-							}else if(this.product){
-								params.productId=this.product.id
 							}
 							if(params.productId==null|| params.productId==''){
 								this.$notify({showClose: true, message: '产品编号不能为空', type:'error' }); 
 								return;
 							}
+							if(params.remark=='作为   ，我需要   ，以便我能够   。'){
+								params.remark=""
+							}
 							addXmMenu(params).then((res) => {
 								this.load.add=false
 								var tips=res.data.tips;
@@ -160,22 +247,40 @@
 					}
 				});
 			},
-			selectUser(){
-				this.userSelectVisible=true;
+			selectProposer(){
+				this.proposerSelectVisible=true;
+			},
+			onProposerSelected(users){
+				if(users && users.length>0){
+					this.addForm.proposerId=users[0].userid
+					this.addForm.proposerName=users[0].username
+				}
+				this.proposerSelectVisible=false
+			},
+			clearProposer:function(){
+				this.addForm.proposerId=''
+				this.addForm.proposerName=''
 			},
-			onUserSelected(users){
+			onMmUserSelected(users){
 				if(users && users.length>0){
 					this.addForm.mmUserid=users[0].userid
 					this.addForm.mmUsername=users[0].username
 				}
-				this.userSelectVisible=false
+				this.mmUserSelectVisible=false
 			},
-			clearPmUser:function(){
+			clearMmUser:function(){
 				this.addForm.mmUserid=''
 				this.addForm.mmUsername=''
-			}
+			},
 			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
 				
+			toFixed(floatValue){
+				if(floatValue ==null || floatValue=='' || floatValue == undefined){
+					return 0;
+				}else{
+					return parseFloat(floatValue).toFixed(2);
+				}
+			},
 			/**end 在上面加自定义方法**/
 			
 		},//end method
@@ -184,6 +289,10 @@
 			UsersSelect
 		},
 		mounted() {
+			
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority'] ).then(res=>{
+				this.dicts=res.data.data;
+			})
 			this.addForm=Object.assign(this.addForm, this.xmMenu);  
 			this.addForm.mmUserid=this.userInfo.userid
 			this.addForm.mmUsername=this.userInfo.username
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index a8dd9c3a..b73f71d5 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -3,50 +3,150 @@
 		<el-row class="page-main ">
 			<el-tabs>
 				<el-tab-pane  label="需求详情">
-					<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
+					<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm"> 
 						<el-row class="padding-bottom"> 
-						<el-steps :active="parseInt(editForm.status)" simple finish-status="success" align-center>
+						<el-steps :active="calcMenuCurrStep" simple 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-form-item label="名称" prop="menuName">
-							<el-input v-model="editForm.menuName" placeholder="名称" ></el-input>
-						</el-form-item>
-						<el-row class="padding-bottom">
-							<el-col :span="12">
-							<el-form-item label="序号" prop="seqNo">
-								<el-input v-model="editForm.seqNo" placeholder="如1.0 ， 1.1 ， 1.1.1等" ></el-input>
+						<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-row> 
+								<el-col :span="6">
+									<el-form-item label="序号名称" prop="seqNo" >
+										<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-form-item>   
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="12">
+									<el-form-item label="归属产品" prop="productId">
+										<font v-if="editForm.productId">{{editForm.productName?editForm.productName:editForm.productId}}</font>
+									</el-form-item>
+								</el-col>
+								<el-col :span="12">
+									<el-form-item v-if="!editForm.pmenuId" label="需求池" 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>  
+								</el-col>
+							</el-row> 
+							<el-row> 
+								
+								<el-col :span="12">
+									<el-form-item  label="需求类型" prop="dtype" >   
+										<el-select v-model="editForm.dtype">
+											<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+										</el-select>  
+									</el-form-item>   
+								</el-col>
+								<el-col :span="12">
+									<el-form-item  label="需求来源" prop="source">   
+										<el-select v-model="editForm.source">
+											<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+										</el-select>  
+									</el-form-item>   
+								</el-col> 
+								<el-col :span="12">
+									<el-form-item  label="需求层次" prop="dlvl" >   
+										<el-select v-model="editForm.dlvl">
+											<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+										</el-select>  
+									</el-form-item>   
+								</el-col>
+								<el-col :span="12">
+								<el-form-item  label="优先级" prop="priority" >  
+									<el-select v-model="editForm.priority">
+											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+									</el-select>    
+								</el-form-item>  
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-col :span="12">
+									<el-form-item label="提出人" prop="proposerId">
+										<el-tag type="text" v-if="editForm.proposerId" closable @close="clearProposer">{{editForm.proposerName}}</el-tag> 
+										<el-button type="text" @click="selectProposer">选提出人</el-button>
+									</el-form-item>   
+								</el-col>
+								<el-col  :span="12">
+									<el-form-item label="跟进人" prop="mmUserid">
+										<el-tag type="text" v-if="editForm.mmUserid" closable @close="clearMmUser">{{editForm.mmUsername}}</el-tag> 
+										<el-button type="text" @click="mmUserSelectVisible=true">选跟进人</el-button>
+									</el-form-item>   
+								</el-col>
+							</el-row>
+						</el-collapse-item>
+						<el-collapse-item title="需求概述" name="4"> 
+							<el-form-item label="需求概述" prop="remark">
+								<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.remark" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
 							</el-form-item>  
-							</el-col>
-							<el-col :span="12">
-							<el-form-item label="标签" prop="ntype">
-								{{editForm.tagNames?editForm.tagNames:''}} 
-								<el-button type="text" icon="el-icon-plus" @click="tagSelectVisible=true">标签</el-button> 
+						</el-collapse-item> 
+						<el-collapse-item title="工期与工作量预估" name="2">
+							<el-form-item label="预估工期" prop="budgetHours">
+								<el-input-number style="width:200px;"  v-model="editForm.budgetHours"  :precision="2" :step="8" :min="0" placeholder="预计工期(小时)"></el-input-number>&nbsp;小时
+							</el-form-item> 
+							<el-form-item label="预估工作量" prop="budgetWorkload">
+								<el-input-number style="width:200px;"  v-model="editForm.budgetWorkload" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)"></el-input-number> <el-tag>人时，{{this.toFixed(editForm.budgetWorkload/8/20)}}人月</el-tag>
+							</el-form-item> 
+							<el-form-item label="预估金额" prop="budgetAmount">
+								<el-input-number style="width:200px;"  v-model="editForm.budgetAmount" :precision="2" :step="100" :min="0" placeholder="预算金额"></el-input-number>   元 
+							</el-form-item> 
+							<font color="red" style="font-size:10px;">控制规则：下级预估工作量总和不能大于上级预估工作量</font>
+						</el-collapse-item>
+						<el-collapse-item title="进度与实际工作量填报" name="3">
+							<el-form-item label="数据收集方式" prop="calcType"> 
+								<el-radio   v-model="editForm.calcType"  label="3" placeholder="下级往上级汇总" :disabled="editForm.ntype==='0'">下级往上级汇总</el-radio>
+ 								<el-radio   v-model="editForm.calcType"  label="1" placeholder="由任务汇总" :disabled="editForm.ntype==='1'">由任务汇总</el-radio> 
+								<el-radio   v-model="editForm.calcType"  label="2" placeholder="手工填报" :disabled="editForm.ntype==='1'">手工填报</el-radio>
+							</el-form-item> 
+							<el-form-item label="当前进度" prop="mactRate" v-if="editForm.calcType==='2'">
+								<el-input-number style="width:200px;" v-model="editForm.mactRate" :precision="2" :step="5" :min="0" :max="100" placeholder="进度"></el-input-number> &nbsp;%
+							</el-form-item> 
+							<el-form-item label="实际工作量" prop="mactWorkload" v-if="editForm.calcType==='2'">
+								<el-input-number style="width:200px;"  v-model="editForm.mactWorkload" :precision="2" :step="8" :min="0" placeholder="实际总工作量(人时)"></el-input-number> <el-tag>人时，{{this.toFixed(editForm.budgetWorkload/8/20)}}人月</el-tag>
+							</el-form-item> 
+							<el-form-item label="实际金额" prop="mactAmount" v-if="editForm.calcType==='2'">
+								<el-input-number style="width:200px;"  v-model="editForm.mactAmount" :precision="2" :step="100" :min="0" placeholder="实际金额"></el-input-number>   元 
+							</el-form-item> 
+							<font color="red" style="font-size:10px;">控制规则:
+								<br>下级往上汇总：指需求池的数据来自直接下级的需求池(需求)的数据之和。逐级往上汇总。
+								<br>由任务汇总： 指需求(不包括需求池)的数据来自与该需求关联的任务的数据之和。
+								<br>手工填报：  指需求(不包括需求池)的数据来自手工填报，无论是否关联了任务，都不从任务汇总。
+							</font>
+						</el-collapse-item>
+						<el-collapse-item title="相关链接" name="4"> 
+							<el-form-item label="需求链接" prop="demandUrl"> 
+								<el-input v-model="editForm.demandUrl" placeholder="需求链接" ></el-input> 
 							</el-form-item>  
-							</el-col>
-						</el-row> 
-						<el-form-item label="负责人" prop="mmUserid">
-							<el-tag v-if="editForm.mmUserid" closable @close="clearPmUser">{{editForm.mmUsername}}</el-tag>
-							<el-tag v-else>未配置</el-tag>
-							<el-button @click="selectUser">选负责人</el-button>
-						</el-form-item>
-						<el-form-item label="需求链接" prop="demandUrl">
-							<el-input v-model="editForm.demandUrl" placeholder="需求链接" ></el-input>
-						</el-form-item>
-						<el-form-item label="代码链接" prop="codeUrl">
-							<el-input v-model="editForm.codeUrl" placeholder="代码链接" ></el-input>
-						</el-form-item>
-						<el-form-item label="设计链接" prop="designUrl">
-							<el-input v-model="editForm.designUrl" placeholder="设计链接" ></el-input>
-						</el-form-item>
-						<el-form-item label="操作手册链接" prop="operDocUrl">
-							<el-input v-model="editForm.operDocUrl" placeholder="操作手册链接" ></el-input>
-						</el-form-item>
-						<el-form-item label="概述" prop="remark">
-							<el-input type="textarea" v-model="editForm.remark" :autosize="{ minRows: 4, maxRows: 20}"  placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
-						</el-form-item>
+							<el-form-item label="代码链接" prop="codeUrl">
+								<el-input v-model="editForm.codeUrl" placeholder="代码链接" ></el-input>  
+							</el-form-item>  
+							<el-form-item label="设计链接" prop="designUrl">
+								<el-input v-model="editForm.designUrl" placeholder="设计链接" ></el-input>  
+							</el-form-item>   
+							<el-form-item label="操作手册链接" prop="operDocUrl">
+								<el-input v-model="editForm.operDocUrl" placeholder="操作手册链接" ></el-input>  
+							</el-form-item>  
+						</el-collapse-item> 
+						</el-collapse>
 					</el-form> 
-					<el-row >
+					<el-row class="padding">
 						<el-button @click.native="handleCancel">取消</el-button>
 						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>
 					</el-row>
@@ -59,8 +159,12 @@
 					<xm-menu-exchange-mng :xm-menu="xmMenu"></xm-menu-exchange-mng>
 				</el-tab-pane>
 			</el-tabs>
-			<el-drawer title="选择员工" :visible.sync="userSelectVisible" size="60%" append-to-body>
-				<users-select  @confirm="onUserSelected" ref="usersSelect"></users-select>
+			<el-drawer title="选择提出人" :visible.sync="proposerSelectVisible" size="60%" append-to-body>
+				<users-select  @confirm="onProposerSelected" ref="usersSelect"></users-select>
+			</el-drawer>
+			
+			<el-drawer title="选择跟进人" :visible.sync="mmUserSelectVisible" size="60%" append-to-body>
+				<users-select  @confirm="onMmUserSelected" ref="mmUsersSelect"></users-select>
 			</el-drawer>
 		</el-row>
 			
@@ -73,7 +177,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmMenu } from '@/api/xm/core/xmMenu';
 	import { mapGetters } from 'vuex'
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@@ -86,7 +190,20 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
-		    ])
+		    ]),
+			calcMenuCurrStep(){
+				var menuStatus= this.dicts.menuStatus
+				if(!menuStatus){
+					return 1;
+				}else{
+					var status=menuStatus.findIndex(i=>this.editForm.status==i.id)
+					if(status>=0){
+						return status+1;
+					}else{
+						return 1;
+					}
+				}
+			}
 		},
 		props:['xmMenu','visible','parentMenu','product'],
 		watch: {
@@ -101,7 +218,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				//dicts:{},//下拉选择框的所有静态数据  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: {
 					menuId: [
@@ -119,9 +236,11 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 				},
 				//新增界面数据 项目需求表
 				editForm: {
-						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:''
+						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:'',
+						proposerId:'',proposerName:'',dlvl:'',dtype:'',priority:'',source:'',calcType:'1',mactWorkload:0,mactAmount:0,mactRate:0
 				},
-				userSelectVisible:false,
+				proposerSelectVisible:false,
+				mmUserSelectVisible:false,
 				dicts:{
 					menuStatus:[
 						
@@ -175,17 +294,28 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 					}
 				});
 			},
-			selectUser(){
-				this.userSelectVisible=true;
+			selectProposer(){
+				this.proposerSelectVisible=true;
 			},
-			onUserSelected(users){
+			onProposerSelected(users){
+				if(users && users.length>0){
+					this.editForm.proposerId=users[0].userid
+					this.editForm.proposerName=users[0].username
+				}
+				this.proposerSelectVisible=false
+			},
+			clearProposer:function(){
+				this.editForm.proposerId=''
+				this.editForm.proposerName=''
+			},
+			onMmUserSelected(users){
 				if(users && users.length>0){
 					this.editForm.mmUserid=users[0].userid
 					this.editForm.mmUsername=users[0].username
 				}
-				this.userSelectVisible=false
+				this.mmUserSelectVisible=false
 			},
-			clearPmUser:function(){
+			clearMmUser:function(){
 				this.editForm.mmUserid=''
 				this.editForm.mmUsername=''
 			},
@@ -205,6 +335,13 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 			},
 			/**end 在上面加自定义方法**/
 
+			toFixed(floatValue){
+				if(floatValue ==null || floatValue=='' || floatValue == undefined){
+					return 0;
+				}else{
+					return parseFloat(floatValue).toFixed(2);
+				}
+			},
 		},//end method
 		components: {
 			//在下面添加其它组件 'xm-menu-edit':XmMenuEdit
@@ -214,6 +351,11 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
 			XmMenuExchangeMng,
 		},
 		mounted() {
+			
+			
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
+				this.dicts=res.data.data;
+			})
 			this.editForm=Object.assign(this.editForm, this.xmMenu);
 			/**在下面写其它函数***/
 
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index d6ae6c48..03244610 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -1,35 +1,63 @@
 <template>
 	<section class="padding">
-		<el-row v-if=" !batchEditVisible">  
+		<el-row v-show=" !batchEditVisible">  
 			<el-col :span="24" class="padding-left">
 					<el-row>   
+						
 						<el-popover
-							placement="right"
+							placement="bottom"
 							width="400"
-							trigger="click"> 
-							<xm-product-select v-if="!xmProduct" :auto-select="true" :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :xm-iteration="xmIteration" :simple="true" @clear-select="filters.product=null"></xm-product-select>
-								<el-link type="warning" slot="reference" v-if="!xmProduct" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品'}}</font></el-link> 
-						</el-popover> 
-						<el-select  v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
-							<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option> 
-						</el-select>   
-						<el-select  v-model="filters.taskFilterType" placeholder="已关联任务的需求？" clearable style="width: 160px;">
-							<el-option   value="not-join-any-project"  label="未关联任务"></el-option>  
-							<el-option   value="join-any-project"  label="已关联任务"></el-option>  
-							<el-option   value="not-join-curr-project"  label="未有本项目任务关联"></el-option>  
-							<el-option   value="join-curr-project"  label="有本项目任务关联"></el-option>  
+							trigger="manual"
+							v-model="productVisible"> 
+							<xm-product-select v-if="!xmProduct" :auto-select="false" :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :xm-iteration="xmIteration" :simple="true" @clear-select="onProductClearSelect" @close="productVisible=false"></xm-product-select>
+								<el-link title="产品，点击选择、清除选择" @click="productVisible=true" type="warning" slot="reference" v-if="!xmProduct" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品'}}</font></el-link> 
+						</el-popover>  
+						
+						<el-popover
+							placement="bottom"
+							width="400"
+							trigger="manual"
+							v-model="iterationVisible"> 
+							<xm-iteration-select v-if="!xmIteration" :auto-select="false" :sel-project="selProject" @row-click="onIterationSelected" ref="xmProductMng" :xm-product="xmProduct" :simple="true" @clear-select="onIterationClearSelect"  @close="iterationVisible=false"></xm-iteration-select>
+								<el-link title="迭代，点击选择、清除选择" @click="iterationVisible=true" type="warning" slot="reference" v-if="!xmIteration" icon="el-icon-search"><font style="font-size:14px;">{{filters.iteration?filters.iteration.iterationName:'选择迭代'}}</font></el-link> 
+						</el-popover>  
+						<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable style="width: 160px;">
+							<el-option   value="not-join-any-project"  label="未分配任务"></el-option>  
+							<el-option   value="join-any-project"  label="已分配任务"></el-option>  
+							<el-option   value="not-join-curr-project"  label="未分配任务到本项目" v-if="selProject && selProject.id"></el-option>  
+							<el-option   value="join-curr-project"  label="已分配任务到本项目"  v-if="selProject && selProject.id"></el-option>  
 						</el-select>   
 						<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable  style="width: 160px;">
 							<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>  
 							<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>  
-							<el-option   value="not-join-curr-iteration"  label="未加入本迭代"></el-option>  
-							<el-option   value="join-curr-iteration"  label="已加入本迭代"></el-option>  
-						</el-select>
+							<el-option   value="not-join-curr-iteration"  label="未加入本迭代"  v-if="filters.iteration && filters.iteration.id"></el-option>  
+							<el-option   value="join-curr-iteration"  label="已加入本迭代" v-if="filters.iteration && filters.iteration.id"></el-option>  
+						</el-select> 
+						
+						<el-select v-model="filters.dtype" clearable placeholder="需求类型">
+							<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+						</el-select>    
+						<el-select v-model="filters.source" placeholder="需求来源"  clearable>
+							<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+						</el-select>     
+						<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable class="hidden-md-and-down">
+							<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+						</el-select>    
+						<el-button class="hidden-md-and-down" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签条件</el-button>
+						<el-tag class="hidden-md-and-down" v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
+					</el-row>
+					<el-row>     
+						
+						<el-select v-model="filters.priority" placeholder="优先级"  clearable>
+								<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+						</el-select>      
+						<el-select  v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
+							<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option> 
+						</el-select> 
 						<el-input v-model="filters.key" style="width: 15%;" placeholder="需求名称查询" clearable> 
 						</el-input> 
-						<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
-						<el-button class="hidden-md-and-down" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签</el-button>
-						<el-tag class="hidden-md-and-down" v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
+						<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search">查询</el-button>
+						
 						<el-popover style="padding-left:10px;"  
 							placement="top-start"
 							width="250" 
@@ -44,8 +72,10 @@
 							</el-row>   
 							<el-button type="primary"    slot="reference" icon="el-icon-plus">需求</el-button>
 						</el-popover>
-						<el-button type="primary" @click="showParentMenu">更换上级</el-button>
- 						<el-button  v-if="!selProject&&!xmIteration&&disabledMng!=false"  type="danger" @click="batchDel" icon="el-icon-delete">删除</el-button> 
+						
+						<el-button  @click="batchEditVisible=true">批量修改</el-button> 
+						<el-button  @click="showParentMenu">更换上级</el-button>
+ 						<el-button  v-if="disabledMng!=false"  type="danger" @click="batchDel" icon="el-icon-delete">删除</el-button> 
 
 						<el-button class="hidden-md-and-down"  v-if=" batchEditVisible==false&&disabledMng!=false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">汇总进度</el-button>  
 						<el-popover
@@ -56,7 +86,7 @@
 							<el-row>  
 								<el-col  :span="24"  style="padding-top:5px;" >
 									<font class="more-label-font">标签条件:</font>  
-									<el-button v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签</el-button>
+									<el-button type="text" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签</el-button>
 									<el-tag v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
  
 								</el-col> 
@@ -83,12 +113,13 @@
 									<el-button   v-else @click="selectFiltersMmUser()">选责任人</el-button>
 									<el-button    @click="setFiltersMmUserAsMySelf()">我的</el-button>
 								</el-col>
-								<el-col  :span="24"  style="padding-top:5px;">
+								<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
 									<font class="more-label-font">
-										需求名称:
-									</font> 
-									<el-input   v-model="filters.key" style="width:100%;"  placeholder="输入需求名字关键字" clearable>  
-									</el-input> 
+										需求层次:
+									</font>  
+									<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable>
+										<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>  
 								</el-col>
 								<el-col  :span="24"  style="padding-top:5px;">
 									<el-button type="primary"  @click="searchXmMenus" icon="el-icon-search">查询</el-button>
@@ -106,15 +137,37 @@
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="需求名称" min-width="260" show-overflow-tooltip> 
 								<template slot-scope="scope"> 
-									<span class="vlink" @click="showEdit(scope.row)">{{scope.row.seqNo}} &nbsp; {{scope.row.menuName}} </span>
+									<span class="vlink" @click="showEdit(scope.row)" :class="scope.row.ntype==='1'?'el-icon-folder-opened':''">{{scope.row.seqNo}} &nbsp; {{scope.row.menuName}} </span>
 								</template>
 							</el-table-column>  
 							<el-table-column prop="status" label="状态"  min-width="80" show-overflow-tooltip> 
 								<template slot-scope="scope"> 
 									{{dicts.menuStatus.some(i=>i.id==scope.row.status)?dicts.menuStatus.find(i=>scope.row.status==i.id).name:''}}
 								</template>
-							</el-table-column>  
-							<el-table-column prop="iterationName" label="迭代"  min-width="80" show-overflow-tooltip>  
+							</el-table-column>   
+							<el-table-column prop="dtype" label="类型" width="100" :formatter="formaterByDicts"  show-overflow-tooltip>   
+							</el-table-column> 
+							<el-table-column prop="source"  label="来源" width="100"  :formatter="formaterByDicts"  show-overflow-tooltip>   
+							</el-table-column> 
+							<el-table-column prop="dlvl"  label="层次" width="100"  :formatter="formaterByDicts"  show-overflow-tooltip>   
+							</el-table-column> 
+							<el-table-column prop="priority"  label="优先级" width="100"  :formatter="formaterByDicts"  show-overflow-tooltip>   
+							</el-table-column> 
+							<el-table-column prop="iterationName" label="迭代"  min-width="120" show-overflow-tooltip>  
+								<template slot="header">
+									迭代 
+									<el-popover v-if="xmIteration && xmIteration.id"
+										placement="top"
+										width="300"
+										v-model="linkIterationPopoverVisible">
+										<p>将需求加入还是移出迭代 <span v-if="xmIteration && xmIteration.id">【{{xmIteration.iterationName}}】</span>?</p>
+										<div style="text-align: right; margin: 0">
+											<el-button size="mini" type="text" @click="doBatchDelXmIterationMenu">移出</el-button>
+											<el-button type="primary" size="mini" @click="doBatchAddXmIterationMenu">加入</el-button>
+										</div>
+										<el-button type="text" slot="reference" icon="el-icon-edit" title="点击设置需求与迭代的关联关系" @click="linkIterationPopoverVisible=true">关联</el-button>
+										</el-popover> 
+								</template>
 							</el-table-column>  
 							
 							<el-table-column prop="taskCnt" label="任务数"  min-width="80" show-overflow-tooltip>   
@@ -146,7 +199,7 @@
 										 <span>{{scope.row.ctime}} </span>  
 								</template>
 							</el-table-column> 
-							<el-table-column prop="menuName" label="负责人"  min-width="100" show-overflow-tooltip> 
+							<el-table-column prop="menuName" label="跟进人"  min-width="100" show-overflow-tooltip> 
 								<template slot-scope="scope"> 
 										 <span>{{scope.row.mmUsername}} </span>  
 								</template>
@@ -169,15 +222,15 @@
 											<el-button type="text"    slot="reference" icon="el-icon-plus">{{scope.row.ntype=='1'?'子需求':''}}</el-button>
 										</el-popover>   
 										<font>
-											<el-button  v-if="scope.row.ntype!='1'"  type="text"  @click="showTaskListForMenu(scope.row,scope.$index)"  icon="el-icon-s-operation">查任务</el-button>
-											<el-button  v-if="scope.row.ntype!='1'"  type="text"  @click="showTaskList(scope.row,scope.$index)"  icon="el-icon-s-operation">关联任务</el-button> 
+											<el-button  v-if="scope.row.ntype!=='1'"  type="text"  @click="showTaskListForMenu(scope.row,scope.$index)"  icon="el-icon-s-operation">查任务</el-button>
+											<el-button  v-if="scope.row.ntype!=='1'"  type="text"  @click="showTaskList(scope.row,scope.$index)"  icon="el-icon-s-operation">关联任务</el-button> 
 										</font>
 									</el-row>
 								</template>
 							</el-table-column>   
 							
 						</el-table>
-						<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
+						
 							
 					</el-row> 
 				<!--编辑 XmMenu xm_project_menu界面-->
@@ -187,7 +240,7 @@
 		
 				<!--新增 XmMenu xm_project_menu界面-->
 				<el-drawer title="新增需求" :visible.sync="addFormVisible"  :with-header="false" size="50%"  append-to-body   :close-on-click-modal="false">
-					<xm-menu-add  :product="filters.product"   :parent-menu="parentMenu"  :xm-menu="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-menu-add>
+					<xm-menu-add  :parent-menu="parentMenu"  :xm-menu="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-menu-add>
 				</el-drawer> 
 				<el-drawer title="需求模板" :visible.sync="menuTemplateVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-menu-template-mng  :is-select-menu="true"  :visible="menuTemplateVisible" @cancel="menuTemplateVisible=false" @selected-menus="onSelectedMenuTemplates"></xm-menu-template-mng>
@@ -195,13 +248,9 @@
 				
 				<el-drawer title="需求谈论" :visible.sync=" menuDetailVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-menu-rich-detail :visible="menuDetailVisible"  :reload="false" :xm-menu="editForm" ></xm-menu-rich-detail>
-				</el-drawer> 
-				
-				<el-drawer  title="选择产品" :visible.sync="productVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
-					<xm-product-select :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-select>
-				</el-drawer> 
+				</el-drawer>  
 				<el-drawer title="选中任务" :visible.sync="selectTaskVisible"   size="80%"  append-to-body   :close-on-click-modal="false">
-					<xm-task-list :xm-product="filters.product" :sel-project="selProject" :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
+					<xm-task-list :xm-product="filters.product" :sel-project="selProject" query-scope="planTask" check-scope="task"  :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
 				</el-drawer> 
 				<el-drawer title="查看任务" :visible.sync="taskListForMenuVisible" :with-header="false"  size="80%"  append-to-body   :close-on-click-modal="false">
 					<xm-task-list-for-menu  :xm-product="filters.product"  :is-multi-select="true" :menu-id="editForm.menuId"></xm-task-list-for-menu>
@@ -213,26 +262,17 @@
 					:with-header="false"
 					size="80%">
 					<xm-task-mng :sel-project="selProject"   :menu-id="editForm.menuId" :menu-name="editForm.menuName"></xm-task-mng> 
-				</el-drawer>
-				<el-drawer
-					append-to-body
-					title="需求关联的迭代查询" 
-					:with-header="false"
-					size="80%"
-					:visible.sync="iterationVisible" 
-					>
-						<xm-iteration-mng :visible="iterationVisible" :product-id="editForm.productId" :menu-id="editForm.menuId" ></xm-iteration-mng>
-				</el-drawer>
-
+				</el-drawer>  
 				<el-drawer title="选择员工" :visible.sync="selectFiltersMmUserVisible" size="60%" append-to-body>
 					<users-select  @confirm="onFiltersMmUserSelected" ref="selectFiltersMmUser"></users-select>
 				</el-drawer>	
 			</el-col> 	 
 		</el-row>
 		
-		<el-row v-if="batchEditVisible && filters.product" :span="24">
-			<xm-menu-mng-batch :sel-project="selProject"  @no-batch-edit="noBatchEdit" :product="filters.product"></xm-menu-mng-batch>
+		<el-row v-if="batchEditVisible">
+			<xm-menu-mng-batch :xm-menus="xmMenus" :dicts="dicts"  @no-batch-edit="noBatchEdit" :product="filters.product"></xm-menu-mng-batch>
 		</el-row>
+		<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
 		
 		<el-drawer append-to-body title="标签条件" :visible.sync="tagSelectVisible"  size="60%">
 			<tag-mng :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected">
@@ -261,11 +301,12 @@
 	import util from '@/common/js/util';//全局公共库
 	import treeTool from '@/common/js/treeTool';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmMenu, delXmMenu, batchDelXmMenu,batchAddXmMenu,batchEditXmMenu,listXmMenuWithState,listXmMenuWithPlan,batchChangeParentMenu } from '@/api/xm/core/xmMenu';
 	import { batchRelTasksWithMenu } from '@/api/xm/core/xmTask';
 	import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState';
 
+	import {   batchDelXmIterationMenu,batchAddXmIterationMenu } from '@/api/xm/core/xmIterationMenu'; 
 	
 	import  XmMenuAdd from './XmMenuAdd';//新增界面
 	import  XmMenuEdit from './XmMenuEdit';//修改界面
@@ -276,7 +317,7 @@
 	import XmTaskList from '../xmTask/XmTaskList';
 	import XmTaskMng from '../xmTask/XmTaskMng'; 
 	import XmTaskListForMenu from '../xmTask/XmTaskListForMenu';
-	import  XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面
+	import  XmIterationSelect from '../xmIteration/XmIterationSelect';//修改界面
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
 	
 	import XmMenuSelect from "../xmMenu/XmMenuSelect";
@@ -295,21 +336,14 @@
 			
       xmMenusTreeData() {  
 				let xmMenus = JSON.parse(JSON.stringify(this.xmMenus || []));  
-				let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","id");  
+				let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","menuId");  
 				 return xmMenusTreeData;
-			},
-			isPmUser(){
-				if(this.filters.product){
-					if(this.userInfo.userid==this.filters.product.pmUserid){
-						return true;
-					}
-				}
-				return false;
-			}
+			}, 
 		},
 		watch:{  
 			xmIteration:function(){
 				this.filters.iterationFilterType="join-curr-iteration"
+				this.filters.iteration=this.xmIteration
 				this.getXmMenus()
 			},
 			xmProduct:function(){  
@@ -332,11 +366,14 @@
 					mmUser:null,
 					iterationFilterType:'',//join、not-join、''
 					taskFilterType:'',//join、not-join、''
-					tags:[],
-					parentMenu:null,
-					parentMenuList:[],
+					tags:[], 
 					status:'',
-				},
+					iteration:null,
+					dlvl:'',
+					dtype:'',
+					priority:'',
+					source:'',
+				}, 
 				xmMenus: [],//查询结果
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
@@ -393,6 +430,7 @@
 				tagSelectVisible:false,
 				parentMenuVisible:false,
 				maps:new Map(),
+				linkIterationPopoverVisible:false,
  				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -425,11 +463,7 @@
 				 this.pageInfo.count=true; 
 				 this.getXmMenus();
 			},
-			getParams(params){
-
-				if(!params.productId){
-					params.branchId=this.userInfo.branchId
-				}
+			getParams(params){ 
 				
 				if( this.filters.key){
 					params.key="%"+this.filters.key+"%"
@@ -440,26 +474,53 @@
 				}  
 				if(this.filters.iterationFilterType){
 					params.iterationFilterType=this.filters.iterationFilterType
-				} 
-				if(this.xmIteration){ 
-					params.filterIterationId=this.xmIteration.id
+					if(params.iterationFilterType==='not-join-any-iteration'){
+
+					}else if(params.iterationFilterType==='join-any-iteration'){
+
+					}else if(params.iterationFilterType==='not-join-curr-iteration'){
+						params.filterIterationId=this.filters.iteration.id
+					}else if(params.iterationFilterType==='join-curr-iteration'){
+						params.filterIterationId=this.filters.iteration.id
+					} 
+					params.ntype="0"
+				}else{
+					if(this.filters.iteration){
+						params.iterationId=this.filters.iteration.id
+					}
+				}
+				if(this.xmIteration && this.xmIteration.id){ 
+					params.linkIterationId=this.xmIteration.id
 				}
 				if(this.filters.taskFilterType){
-					params.taskFilterType=this.filters.taskFilterType
+					params.taskFilterType=this.filters.taskFilterType 
+					params.projectId=this.selProject.id 
+					params.ntype="0"
+				} 
+				if(this.selProject && this.selProject.id){
+					params.linkProjectId=this.selProject.id
 				} 
-				if(this.selProject){
-					params.projectId=this.selProject.id
-				}
-				 
 				if(this.filters.product){
 					params.productId=this.filters.product.id
+				}  
+				if(this.filters.status){
+					params.status=this.filters.status
+				}
+				
+				if(this.filters.dlvl){
+					params.dlvl=this.filters.dlvl
 				}
-				if(this.filters.parentMenu){
-					params.pmenuId=this.filters.parentMenu.menuId
+				
+				if(this.filters.dtype){
+					params.dtype=this.filters.dtype
 				}
 				
-				if(this.filters.status){
-					params.status=this.filters.status
+				if(this.filters.priority){
+					params.priority=this.filters.priority
+				}
+				
+				if(this.filters.source){
+					params.source=this.filters.source
 				}
 				if( this.dateRanger && this.dateRanger.length==2){
 					params.ctimeStart=this.dateRanger[0] 
@@ -467,10 +528,7 @@
 				} 
 				if(this.filters.tags && this.filters.tags.length>0){
 					params.tagIdList=this.filters.tags.map(i=>i.tagId)
-				}
-				if(!(params.ctimeStart||params.pmenuId||params.projectId||params.filterIterationId||params.iterationFilterType||params.mmUserid||params.key||params.taskFilterType||params.tagIdList||params.status)){
-					params.isTop="1"
-				}
+				} 
 				return params;
 			},
 			loadXmMenusLazy(tree, treeNode, resolve) {   
@@ -513,11 +571,7 @@
 				} 
 				if( this.filters.product  && this.filters.product.id){
 					params.productId=this.filters.product.id
-				}else {
-					//this.$notify({showClose: true, message: "请先选择产品", type: 'warning'});
-					return;
-				} 
-					
+				}  
 				params=this.getParams(params);
 				params.withParents="1"
 				//params.isTop="1" 
@@ -547,13 +601,27 @@
 			},
 			//显示新增界面 XmMenu xm_project_menu
 			showAdd: function () {  
-				this.parentMenu=null;
-				this.addFormVisible = true;
+				if(this.filters.product && this.filters.product.id){
+					this.parentMenu=null;
+					this.addForm.productId=this.filters.product.id
+					this.addForm.productName=this.filters.product.productName
+					this.addFormVisible = true;
+				}else{
+					this.productVisible=true;
+					this.$notify({showClose: true, message: "请先选择一个产品", type: 'error'});
+				}
+				
 				//this.addForm=Object.assign({}, this.editForm);
 			},
 			showSubAdd:function(row){ 
 				this.editForm=row
 				this.parentMenu=row
+				this.addForm.productId=row.productId
+				if(this.filters.product && row.productId==this.filters.product.id){
+					this.addForm.productName=this.filters.product.productName
+				}else{
+					this.addForm.productName=null;
+				}
 				this.addFormVisible=true
 			},
 			showProdcutAdd:function(){
@@ -576,13 +644,29 @@
 				this.sels = sels;
 			}, 
 			onProductSelected:function(product){
-				this.filters.product=product
-				this.filters.parentMenu=null;
-				this.filters.parentMenuList=[];
+				this.filters.product=product 
 				this.productVisible=false;
 				this.xmMenus=[]
 				this.getXmMenus()
 			},
+			onProductClearSelect:function(){
+				this.filters.product=null  
+				this.productVisible=false;
+				this.xmMenus=[]
+				this.getXmMenus()
+			},
+			onIterationSelected:function(iteration){
+				this.filters.iteration=iteration  
+				this.iterationVisible=false;
+				this.xmMenus=[]
+				this.getXmMenus()
+			},
+			onIterationClearSelect:function(){
+				this.filters.iteration=null  
+				this.iterationVisible=false;
+				this.xmMenus=[]
+				this.getXmMenus()
+			},
 			//删除xmMenu
 			handleDel: function (row,index) {  
 				this.$confirm('确认删除该记录吗?', '提示', {
@@ -606,7 +690,11 @@
 			},
 			//批量删除xmMenu
 			batchDel: function () { 
-				this.$confirm('确认删除选中记录吗？', '提示', {
+				if(this.sels.length==0){
+					this.$notify({showClose: true, message: "请先选择要删除的需求或者需求池", type: 'error'});
+					return;
+				}
+				this.$confirm('确认删除选中的'+this.sels.length+'条数据吗？删除后数据不可恢复', '提示', {
 					type: 'warning'
 				}).then(() => { 
 					this.load.del=true;
@@ -845,30 +933,10 @@
 			toSelectProduct(){ 
 				this.productVisible=true;
 			},
-			searchSubMenus(row,index){
-				
-				this.filters.parentMenu=row
-				this.filters.parentMenuList.push(row);
+			searchSubMenus(row,index){ 
 				this.pageInfo.count=true;
 				this.searchXmMenus();
-			},
-			clearParentMenu(menu,index){
-				if(index==0){
-					this.filters.parentMenu=null;
-					this.filters.parentMenuList=[];
-				}else{
-					this.filters.parentMenu=this.filters.parentMenuList[index-1];
-					this.filters.parentMenuList.splice(index,this.filters.parentMenuList.length-index)
-				} 
-				this.pageInfo.count=true
-				this.searchXmMenus();
-			},
-			onParentMenuClick(menu,index){
-				this.filters.parentMenu=this.filters.parentMenuList[index];
-				this.filters.parentMenuList.splice(index+1,this.filters.parentMenuList.length-index)
-				this.pageInfo.count=true
-				this.searchXmMenus();
-			}, 
+			},  
 			clearFiltersTag(tag){
 				var index=this.filters.tags.findIndex(i=>i.tagId==tag.tagId)
 				this.filters.tags.splice(index,1);
@@ -917,7 +985,61 @@
 					}
 					this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
 				})
-			} 
+			},
+			formaterByDicts(row,column,cellValue,index){ 
+				var property=column.property
+				var dict=null;
+				if(property=='source'){
+					dict=this.dicts['demandSource']
+				}else if(property=='dlvl'){
+					dict=this.dicts['demandLvl']
+				}else if(property=='dtype'){
+					dict=this.dicts['demandType']
+				}else if(property=='priority'){
+					dict=this.dicts['priority']
+				}  
+				if(!dict){
+					return cellValue;
+				}else{
+					var item=dict.find(i=>i.id==cellValue)
+					return item?item.name:cellValue;
+				}
+			},
+			doBatchDelXmIterationMenu(){
+				if(this.sels.length==0){
+					this.$notify({showClose:true,message:"请选择一个或者多个需求进行操作",type:'warning'})
+					return;
+				}
+				var params={
+					menuIds:this.sels.map(i=>i.menuId),
+					iterationId:this.xmIteration.id
+				}
+				batchDelXmIterationMenu(params).then(res=>{
+					var tips =res.data.tips;
+					if(tips.isOk){
+						this.searchXmMenus();
+					} 
+					this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) 
+				})
+			},
+			doBatchAddXmIterationMenu(){
+				if(this.sels.length==0){
+					this.$notify({showClose:true,message:"请选择一个或者多个需求进行操作",type:'warning'})
+					return;
+				}
+				var params={
+					menuIds:this.sels.map(i=>i.menuId),
+					iterationId:this.xmIteration.id
+				}
+				batchAddXmIterationMenu(params).then(res=>{
+					var tips =res.data.tips;
+					if(tips.isOk){
+						this.searchXmMenus();
+					} 
+					this.$notify({showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
+
+				})
+			}
 		},//end methods
 		components: { 
 		    'xm-menu-add':XmMenuAdd,
@@ -928,7 +1050,7 @@
 			XmTaskList,
 			XmTaskMng,
 			XmTaskListForMenu,
-			XmIterationMng,
+			XmIterationSelect,
 			UsersSelect,
 			XmMenuMngBatch,
 		    TagMng,
@@ -936,6 +1058,9 @@
 		    //在下面添加其它组件
 		},
 		mounted() {   
+  			initSimpleDicts("all",['menuStatus','demandSource','demandLvl','demandType','priority']).then(res=>{
+				this.dicts=res.data.data;
+			})
 			this.filters.product=this.xmProduct
 			if(this.xmProduct && this.xmProduct.id){
 				this.productVisible=false;
@@ -946,6 +1071,7 @@
 			
 			if(this.xmIteration && this.xmIteration.id){ 
 				this.filters.iterationFilterType='join-curr-iteration'
+				this.filters.iteration=this.xmIteration
 			}
 			this.$nextTick(() => {  
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index d3ba253c..15569975 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -1,117 +1,16 @@
 <template>
 	<section class="page-container  padding border">
 		<el-row>  
-			<el-row >  
-				<el-select class="hidden-lg-and-down" v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable >
-					<el-option   value="not-join"  label="未分配任何任务的需求"></el-option>  
-					<el-option   value="join"  label="已分配任务的需求"></el-option>  
-				</el-select> 
-				<el-date-picker
-					v-model="dateRanger" 
-					type="daterange"
-					align="right"
-					class="hidden-md-and-down"
-					unlink-panels
-					range-separator="至"
-					start-placeholder="创建日期"
-					end-placeholder="创建日期"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					:default-time="['00:00:00','23:59:59']"
-					:picker-options="pickerOptions"
-				></el-date-picker> 
-				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询" clearable>
-					<template slot="append">
-						<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
-					</template>
-				</el-input> 
-				
-				
+			<el-row >    
 				<el-button    type="warning" @click="batchSaveMenu" icon="el-icon-finished">保存</el-button> 
-				<el-button   type="success"  @click="handlePopover(null,'add')" icon="el-icon-plus">需求</el-button>
 				<el-button      @click="noBatchEdit" icon="el-icon-back">返回</el-button>  
-
-				<el-button    type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button> 
-				
-				<el-popover
-					placement="top-start"
-					title="更多查询条件或操作"
-					width="400"
-					trigger="click" >
-					<el-row>  
-						<el-col  :span="24"  style="padding-top:5px;" >
-							<el-select   v-model="filters.iterationFilterType" placeholder="是否加入过迭代？" clearable  >
-								<el-option   value="not-join"  label="未加入任何迭代的需求"></el-option>  
-								<el-option   value="join"  label="已加入迭代的需求"></el-option>  
-							</el-select>
-						</el-col>
-						<el-col  :span="24"  style="padding-top:5px;"> 
-							<el-select  v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable >
-								<el-option   value="not-join"  label="未分配任何任务的需求"></el-option>  
-								<el-option   value="join"  label="已分配任务的需求"></el-option>  
-							</el-select> 
-						</el-col> 
-						<el-col :span="24"  style="padding-top:5px;">
-							<font class="more-label-font">创建日期:</font>  
-							<el-date-picker
-								v-model="dateRanger" 
-								type="daterange"
-								align="right"
-								unlink-panels
-								range-separator="至"
-								start-placeholder="创建日期"
-								end-placeholder="创建日期"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								:default-time="['00:00:00','23:59:59']"
-								:picker-options="pickerOptions"
-							></el-date-picker>   
-						</el-col>   
-						<el-col  :span="24"  style="padding-top:5px;">
-							<font class="more-label-font">
-								责任人:
-							</font>  
-							<el-tag v-if="filters.mmUser" closable @close="clearFiltersMmUser()">{{filters.mmUser.username}}</el-tag> 
-							<el-button   v-else @click="selectFiltersMmUser()">选责任人</el-button>
-							<el-button    @click="setFiltersMmUserAsMySelf()">我的</el-button>
-						</el-col>
-						<el-col  :span="24"  style="padding-top:5px;">
-							<font class="more-label-font">
-								需求名称:
-							</font> 
-							<el-input   v-model="filters.key" style="width:100%;"  placeholder="输入需求名字关键字" clearable>  
-							</el-input> 
-						</el-col>
-						<el-col  :span="24"  style="padding-top:5px;">
-							<el-button type="primary"  @click="searchXmMenus" icon="el-icon-search">查询</el-button>
-							<el-button  v-if=" batchEditVisible==false "  @click="handleExport" icon="el-icon-download">导出</el-button> 
-							<el-button   v-if=" batchEditVisible==true "  type="success" @click="showImportFromMenuTemplate" icon="el-icon-upload2">由模板快速导入</el-button> 
-							
-							<el-button   v-if=" batchEditVisible==false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">刷新统计数据</el-button>  
-						</el-col> 
-					</el-row> 
-					<el-button  slot="reference" icon="el-icon-more"></el-button>
-				</el-popover> 
-			
 			</el-row>
 			<el-row style="padding-top:12px;"> 
-				<el-table ref="table" :height="maxTableHeight" :data="xmMenusTreeData" class="drag-table" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table ref="table" :indent="16" lazy :load="loadXmMenusLazy" :height="maxTableHeight" :data="xmMenusTreeData" class="drag-table"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}"   highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column  type="selection" width="45"></el-table-column>
-					<el-table-column  prop="seqNo"  label="序号" min-width="100">
-						<template slot-scope="scope">
-							<div style="display:flex;width:100%;">
-								<el-popover
-									placement="top"
-									width="400"
-									trigger="click">
-									<div style="text-align: center; margin: 0">
-										<div :ref="'menu_'+scope.$index" :data-menu-id="scope.row.menuId"></div>
-										<el-button type="primary"    @click="handlePopover(scope.row,'highestPmenuId')">成为顶级节点</el-button> 
-										<el-button type="danger"    @click="handlePopover(scope.row,'delete')">删除当前行</el-button> 
-										<el-button type="success"    @click="handlePopover(scope.row,'addSub')">增加子行</el-button> 
-									</div>
-									<el-button slot="reference" :type="scope.row.opType?'success':'plain'"   icon="el-icon-more"></el-button> 
-								</el-popover>
+					<el-table-column  prop="seqNo"  label="序号" width="150">
+						<template slot-scope="scope"> 
 								<el-input   style="width:100%;"   v-model="scope.row.seqNo"  @change="fieldChange(scope.row,'seqNo')"></el-input>
-							</div>
 						</template>
 					
 					</el-table-column>  
@@ -120,13 +19,37 @@
 							<el-input    v-model="scope.row.menuName"  @change="fieldChange(scope.row,'menuName')"></el-input>
 						</template>
 					</el-table-column> 
-					<el-table-column prop="mmUsername" label="负责人" min-width="100" > 
+					<el-table-column prop="mmUsername" label="跟进人" min-width="100" > 
+						
+						<template slot="header">
+							<el-button type="text" icon="el-icon-user" title="批量修改跟进人" @click="showBatchMmUserSelectVisible">批量修改</el-button>
+						</template>
+						<template slot-scope="scope"> 
+							<el-tag v-if="scope.row.mmUserid" @click="selectUser(scope.row)" closable @close="clearPmUser(scope.row)">{{scope.row.mmUsername}}</el-tag> 
+							<el-button v-else type="text" @click="selectUser(scope.row)">选人</el-button>
+						</template>
+					</el-table-column> 
+					
+					<el-table-column  label="需求属性" width="500" >  
 						<template slot-scope="scope"> 
-							<el-tag v-if="scope.row.mmUserid" closable @close="clearPmUser(scope.row)">{{scope.row.mmUsername}}</el-tag>
-							<el-tag v-else>未配置</el-tag> 
-							<el-button @click="selectUser(scope.row)">选人</el-button>
+							 <el-select v-model="scope.row.dtype" title="需求类型" clearable placeholder="需求类型" @change="fieldChange(scope.row,'dtype')">
+								<el-option v-for="i in dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>    
+							<el-select v-model="scope.row.source"  title="需求来源" placeholder="需求来源"  clearable @change="fieldChange(scope.row,'dtype')">
+								<el-option v-for="i in dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>     
+							<el-select v-model="scope.row.dlvl"  title="需求层次" placeholder="需求层次"  clearable class="hidden-md-and-down" @change="fieldChange(scope.row,'dtype')">
+								<el-option v-for="i in dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>    
+							<el-select v-model="scope.row.priority"  title="优先级" placeholder="优先级"  clearable @change="fieldChange(scope.row,'dtype')">
+									<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+							</el-select>  
 						</template>
 					</el-table-column> 
+
+
+					
+						
 					<el-table-column prop="remark" label="描述" min-width="140"  show-overflow-tooltip> 
 						<template slot-scope="scope">
 
@@ -134,116 +57,43 @@
 						</template>
 					</el-table-column>  
 				</el-table>
-				<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-					
-		</el-row> 
-			<!--编辑 XmMenu xm_project_menu界面-->
-			<el-drawer title="编辑需求" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				<xm-menu-edit :xm-menu="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-menu-edit>
-			</el-drawer>
-	
-			<!--新增 XmMenu xm_project_menu界面-->
-			<el-drawer title="新增需求" :visible.sync="addFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				<xm-menu-add  :product="filters.product"   :parent-menu="parentMenu"  :xm-menu="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-menu-add>
-			</el-drawer> 
-			<el-drawer title="需求模板" :visible.sync="menuTemplateVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
-				<xm-menu-template-mng  :is-select-menu="true"  :visible="menuTemplateVisible" @cancel="menuTemplateVisible=false" @selected-menus="onSelectedMenuTemplates"></xm-menu-template-mng>
-			</el-drawer> 
-			
-			<el-drawer title="需求谈论" :visible.sync=" menuDetailVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
-				<xm-menu-rich-detail :visible="menuDetailVisible"  :reload="false" :xm-menu="editForm" ></xm-menu-rich-detail>
-			</el-drawer> 
-			
-			<el-drawer title="选中任务" :visible.sync="selectTaskVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
-				<xm-task-list  :sel-project="selProject" :is-multi-select="true"  @tasks-selected="onSelectedTasks"></xm-task-list>
-			</el-drawer> 
-			<el-drawer title="查看任务" :visible.sync="taskListForMenuVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
-				<xm-task-list-for-menu   :is-multi-select="true" :menu-id="editForm.menuId"></xm-task-list-for-menu>
-			</el-drawer> 
-			<el-drawer
-				append-to-body
-				title="任务"
-				:visible.sync="taskMngVisible"
-				fullscreen>
-				<xm-task-mng :sel-project="selProject"   :menu-id="editForm.menuId" :menu-name="editForm.menuName"></xm-task-mng> 
-			</el-drawer>
-			<el-drawer
-				append-to-body
-				title="需求关联的迭代查询"
-				:visible.sync="iterationVisible" 
-				>
-					<xm-iteration-mng :visible="iterationVisible" :product-id="editForm.productId" :menu-id="editForm.menuId" ></xm-iteration-mng>
-			</el-drawer>
-
-			<el-drawer title="选择员工" :visible.sync="selectFiltersMmUserVisible" size="60%" append-to-body>
-				<users-select  @confirm="onFiltersMmUserSelected" ref="selectFiltersMmUser"></users-select>
-			</el-drawer>	
+				 
+		</el-row>     	
 			<el-drawer title="选择员工" :visible.sync="userSelectVisible" size="60%" append-to-body>
 				<users-select  @confirm="onUserSelected" ref="usersSelect"></users-select>
-			</el-drawer>	 
+			</el-drawer>	
+			<el-drawer title="选择员工" :visible.sync="batchMmUserSelectVisible" size="60%" append-to-body>
+				<users-select  @confirm="onBatchMmUserSelectConfirm" ref="batchMmUserSelect"></users-select>
+			</el-drawer>	
+			 
 		</el-row>
 	</section>
 </template>
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { listXmMenu, delXmMenu, batchDelXmMenu,batchAddXmMenu,batchEditXmMenu,listXmMenuWithState } from '@/api/xm/core/xmMenu';
-	import { batchRelTasksWithMenu } from '@/api/xm/core/xmTask';
-	import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState';
-
-	
-	import  XmMenuAdd from './XmMenuAdd';//新增界面
-	import  XmMenuEdit from './XmMenuEdit';//修改界面
-	import  XmProductMng from '../xmProduct/XmProductSelect';//新增界面
-	import  XmMenuTemplateMng from '../xmMenuTemplate/XmMenuTemplateMng';//新增界面
-	import XmMenuRichDetail from './XmMenuRichDetail';
-	import XmTaskList from '../xmTask/XmTaskList';
-	import XmTaskMng from '../xmTask/XmTaskMng'; 
-	import XmTaskListForMenu from '../xmTask/XmTaskListForMenu';
-	import  XmIterationMng from '../xmIteration/XmIterationSelect';//修改界面
-	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
-
-	import {sn} from '@/common/js/sequence'
+	import treeTool from '@/common/js/treeTool';//全局公共库
+ 	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
+	import {  batchEditXmMenu,listXmMenuWithState } from '@/api/xm/core/xmMenu';
+    	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
+ 
 
 	import { mapGetters } from 'vuex'
 	
 	export default { 
-		props:['selProject','product'],
+		props:['product','xmMenus','dicts'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
 			]),
 			
       xmMenusTreeData() {
-        let xmMenus = JSON.parse(JSON.stringify(this.xmMenus || []));
-        if (this.valueChangeRows && this.valueChangeRows.length) {
-          this.valueChangeRows.forEach(c => {
-            var index = xmMenus.findIndex(i=>i.id==c.id);
-            const oldRow = JSON.parse(JSON.stringify(xmMenus[index]));
-            xmMenus.splice(index,1);
-            c.parentTaskid = oldRow.parentTaskid;
-            xmMenus.push(c);
-          })
-        }
-        
-        const xmMenusTreeData = this.translateDataToTree(xmMenus); 
-				if(xmMenusTreeData!=null && xmMenusTreeData.length>0){
-					this.rowDrop(); 
-				}
-          
+        let xmMenus = JSON.parse(JSON.stringify(this.xmMenus || [])); 
         
+        const xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","menuId"); 
+				 
 				 return xmMenusTreeData;
-			},
-			isPmUser(){
-				if(this.filters.product){
-					if(this.userInfo.userid==this.filters.product.pmUserid){
-						return true;
-					}
-				}
-				return false;
-			}
+			}, 
 		},
 		watch:{ 
 			product(product){
@@ -251,598 +101,42 @@
 			}
     	},
 		data() {
-			const beginDate = new Date();
-			const endDate = new Date();
-			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
+			 
 			return {
-				filters: {
-					key: '',
-					product:null,
-					mmUser:null,
-					iterationFilterType:'',//join、not-join、''
-					taskFilterType:'',//join、not-join、''
-				},
-				xmMenus: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:50,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
+				filters: { 
+				},  
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				options2:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
-				addFormVisible: false,//新增xmMenu界面是否显示
-				//新增xmMenu界面初始化数据
+ 				//新增xmMenu界面初始化数据
 				addForm: {
 						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:''
 				},
-				
-				editFormVisible: false,//编辑界面是否显示
+				 
 				//编辑xmMenu界面初始化数据
 				editForm: {
 						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:''
-				},
-				parentMenu:null,
-				menuTemplateVisible:false,
-				batchEditVisible:false,
-				valueChangeRows:[],
-				 menuDetailVisible:false,
-				selectTaskVisible:false, 
-				taskMngVisible:false,
-				taskListForMenuVisible:false,
-				iterationVisible:false,
-				userSelectVisible:false,
-				selectFiltersMmUserVisible:false,
-				maxTableHeight:300,
-				dateRanger: [ ],  
-				pickerOptions:  util.pickerOptions('datarange'),
- 				/**begin 自定义属性请在下面加 请加备注**/
-					
-				/**end 自定义属性请在上面加 请加备注**/
+				},  
+				valueChangeRows:[],  
+ 				userSelectVisible:false, 
+				 batchMmUserSelectVisible:false,
+				maxTableHeight:300, 
+				pickerOptions:  util.pickerOptions('datarange'), 
+				
+				maps:new Map(),
 			}
 		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
-				this.getXmMenus();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmMenus();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmMenus();
-			},
-			searchXmMenus(){
-				 this.pageInfo.count=true; 
-				 this.getXmMenus();
-			},
-			//获取列表 XmMenu xm_project_menu
-			getXmMenus() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				} 
-					if( this.filters.product!==null && this.filters.product.id!=''){
-						params.productId=this.filters.product.id
-					}else {
-						this.$notify({showClose: true, message: "请先选择产品", type: 'success' });
-						return;
-						//params.xxx=xxxxx
-					} 
-				if(!params.productId){
-					params.branchId=this.userInfo.branchId
-				}
-				
-				if( this.filters.key){
-					params.key="%"+this.filters.key+"%"
-				} 
-				if(this.filters.mmUser){
-					params.mmUserid=this.filters.mmUser.userid;
-				} 
-				params.excludeIterationId=this.excludeIterationId
-				if(this.filters.iterationFilterType){
-					params.iterationFilterType=this.filters.iterationFilterType
-				} 
-				if(this.filters.taskFilterType){
-					params.taskFilterType=this.filters.taskFilterType
-				}  
-				if( this.dateRanger && this.dateRanger.length==2){
-					params.ctimeStart=this.dateRanger[0] 
-					params.ctimeEnd=this.dateRanger[1] 
-				} 
-				
-				params.withParents="1"
-				let callback= (res)=>{
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmMenus = res.data.data;
-					}else{
-						this.$notify({showClose: true, message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}
-				this.load.list = true;
-				listXmMenuWithState(params).then( callback ).catch( err => this.load.list = false );
-			},
-
-			//显示编辑界面 XmMenu xm_project_menu
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmMenu xm_project_menu
-			showAdd: function () { 
-				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
-					this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); 
-					return false;
-				}
-				if(this.filters.product==null){
-					this.$notify({showClose: true, message: "请先选择产品", type: 'error' });
-					return;
-				}
-				this.parentMenu=null;
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			showSubAdd:function(row){
-				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
-					this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); 
-					return false;
-				}
-				this.editForm=row
-				this.parentMenu=row
-				this.addFormVisible=true
-			},
-			showProdcutAdd:function(){
-				this.$refs.xmProductMng.showAdd();
-			},
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.parentMenu=null;
-				this.getXmMenus();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-				this.getXmMenus();
-			},
+		methods: {
+			
 			//选择行xmMenu
 			selsChange: function (sels) {
 				this.sels = sels;
 			}, 
-			onProductSelected:function(product){
-				this.filters.product=product
-				this.getXmMenus()
-			},
-			//删除xmMenu
-			handleDel: function (row,index) { 
-				if(row.mmUserid!=this.userInfo.userid){
-					this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'}); 
-					return false;
-				}
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					let params = { menuId: row.menuId };
-					delXmMenu(params).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.count=true;
-							this.getXmMenus();
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			//批量删除xmMenu
-			batchDel: function () {
-				var mmSels=this.sels.filter(i=>i.mmUserid!=this.userInfo.userid)
-				if(mmSels.length>0){
-					this.$notify({showClose: true, message: "只能操作你负责的需求", type: 'error'}); 
-					return false;
-				}
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					batchDelXmMenu(this.sels).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if( tips.isOk ){ 
-							this.pageInfo.count=true;
-							this.getXmMenus(); 
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
-					}).catch( err  => this.load.del=false );
-				});
-			},
 			
 			rowClick: function(row, event, column){
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-      },
-            // 行拖拽
-      rowDrop() {
-        const _this = this
-        // 被拖动的元素的索引
-        let dragged = null;
-        // 被拖动的元素的索引
-        let draggedIndex = -1;
-
-        // 目标元素
-        let target = document.querySelector('.drag-table .el-table__body-wrapper .el-table__body tbody');
-        console.log('rowDrop--target==', target);
-        
-        let rows = 0;//行数
-        setTimeout(function () {
-          rows = target.childElementCount
-        console.log('rowDrop--rows==', rows);
-          for (let i = 0; i < target.childElementCount; i++) {
-            const child = target.children[i]
-            child.draggable = true
-            // child.style.cursor = 'copy'
-            child.ondragstart = function(e){
-              console.log('开始--ondragstart--e==', e);
-              
-              dragged = e.path[0]
-              draggedIndex = e.path[0].rowIndex
-              console.log('child'+i+'开始拖拽'+draggedIndex);
-              _this.cellMouseIndex = -1
-              dragged.style.cursor = 'grabbing'
-            }
-            child.ondragend = function(){
-              console.log('child'+i+'拖拽结束');
-            }
-          }
-        },0)
-
-        // 被拖动的元素正在那个容器里
-        let dragIndex = -1
-
-        target.ondragenter = function(e){
-          clearTimeout(loop)
-
-          // 由于被拖动的元素 经过tbody中的每一元素都会触发该事件, 但是我们只需要它正在那一行上就行了
-          if(e.path[0].nodeName === 'TD'){
-            // throughRow 表示被拖动的元素正在哪一行上
-            const throughRow = e.path.find(path => {
-              if(path.className.split(' ').includes('el-table__row')){
-                return path
-              }
-            })
-            if(dragIndex !== throughRow.rowIndex){
-              if(dragIndex > -1){
-                // 清除上次进入的容器的状态
-                const last = target.children[dragIndex];
-                clearClass(last)
-              }
-              // console.log('拖动进入目标元素'+selectRow.rowIndex);
-              // 不是自己或未文件夹时才改变状态
-              if(draggedIndex !== throughRow.rowIndex ){
-                // 改变本次进入的容器的状态
-                dragged.style.cursor = 'copy'
-                throughRow.style.height = 60+'px'
-                throughRow.style.backgroundColor = '#e9fdcf'
-              }
-              dragIndex = throughRow.rowIndex
-            }
-          }
-          leaveIndex = -1
-        }
-        target.ondragover = function(e){
-          // console.log('目标元素中拖拽...');
-          e.preventDefault();
-          leaveIndex = -1
-        }
-
-        let loop = null
-        let leaveIndex = -1 // 是否拖出了整个table, -1表示还在table内
-
-        target.ondragleave = function(e){
-          console.log('ondragleave--e==', e);
-
-          clearTimeout(loop)
-
-          if(e.path[0].nodeName){
-            const throughRow = e.path.find(path => {
-              if(path.className.split(' ').includes('el-table__row')){
-                return path;
-              }
-            })
-            if(throughRow && dragIndex !== throughRow.rowIndex){
-              // console.log('拖动离开目标元素'+selectRow.rowIndex);
-              // selectRow.style.height = 'unset'
-              // selectRow.style.backgroundColor = '#fff'
-              // dragIndex = selectRow.rowIndex
-            }
-            if(throughRow.rowIndex === 0 || throughRow.rowIndex === rows-1){
-              // 离开第一行或最后一行
-              leaveIndex = throughRow.rowIndex
-              loop = setTimeout(function () {
-                if(leaveIndex > -1){
-                  console.log("离开了",leaveIndex)
-                  const leave = target.children[leaveIndex];
-                  clearClass(leave)
-                  dragIndex = -1
-                }
-              },100)
-            }``
-          }
-        }
-        target.ondrop = function(){
-          console.log('ondrop--放下了'+draggedIndex);
-          // 清除上次进入的容器的状态
-          const last = target.children[dragIndex];
-          clearClass(last)
-          dragged.style.cursor = 'default'
-
-          console.log('ondrop--draggedIndex==', draggedIndex);
-          console.log('ondrop--dragIndex==', dragIndex);
-          
-
-          const form = _this.xmMenusTreeData[draggedIndex];
-          const to = _this.xmMenusTreeData[dragIndex];
-
-          const startId = _this.$refs['menu_'+draggedIndex].dataset.menuId;;
-          const endId = _this.$refs['menu_'+dragIndex].dataset.menuId;
-
-          if (startId !== endId) {
-            _this.changePmenuId(startId, endId)
-          }
-        }
-
-        let clearClass = function (node) {
-          if(node){
-            node.style.height = 'unset'
-            node.style.backgroundColor = '#fff'
-          }
-          dragged.style.cursor = 'grabbing'
-        }
-        // if(last && form.menuId !== to.menuId && to.isFolder){
-        //   // 移动文件/文件夹
-        //   _this.copyOrMoveApi('move', form.menuId, to.menuId)
-        // }
-      },
-      // 判断前后两个数据是否存在同一回路里面
-      // dict 为字典；sId拖拽到menuId; ePmeuId 是放置位置的祖先 menuId;
-      judgePmenuId(dict, sId, ePmeuId) {
-        if (sId === ePmeuId) {
-          return true;
-        } else if (dict[ePmeuId]) {
-          return this.judgePmenuId(dict, sId, dict[ePmeuId]);
-        } else {
-          return false;
-        }
-      },
-      handleExport() {
-        this.downloadLoading = true
-        const pageNum = this.pageInfo.pageNum;
-        const header = ['需求名称', '负责人', '总体进度', '描述'];
-        const keyList = ['menuName', 'mmUsername', 'finishRate', 'remark'];
-        const filename = `需求管理_${this.filters.product.productName}_第${pageNum}页`;
-				const data = this.formatJson(keyList, this.xmMenusTreeData);
-				import('@/vendor/Export2Excel').then(excel => {
-					excel.export_json_to_excel({
-						header,
-						data,
-						filename,
-						// autoWidth: this.autoWidth,
-						bookType: 'xlsx'
-					})
-					this.downloadLoading = false
-				})
-			},
-			formatJson(filterVal, jsonData, dataList = []) {
-        jsonData.forEach(v => {
-          const row = filterVal.map(j => {
-            let key = '';
-            if (j === 'menuName') {
-              return `${v.seqNo}  ${v[j]}`;
-            } else if(j == 'finishRate') {
-              return `${ (v[j] !== null ? v[j] : 0 )+'%' }`;
-            } else {
-              return v[j];
-            }
-          })
-        dataList.push(row);
-          if (v.children && v.children.length) {
-            dataList = this.formatJson(filterVal, v.children, dataList);
-          }
-        })
-        return dataList;
-      },
-      changePmenuId(sId, eId) {
-        let dict = {};
-        this.xmMenus.forEach(d => {
-          dict[d.menuId] = d.pmenuId || '';
-        });
-        if (!dict[eId]) {
-          this.xmMenus.find(d => {
-            if (d.menuId === sId) {
-              d.pmenuId = eId;
-              console.log('更新关系1');
-              this.fieldChange(d,'pmenuId',true);
-            }
-          })
-        } else {
-          const isSynezesis = this.judgePmenuId(dict, sId, dict[eId]);
-          if (!isSynezesis) {
-            this.xmMenus.find(d => {
-              if (d.menuId === sId) {
-                d.pmenuId = eId;
-                console.log('更新关系2');
-                this.fieldChange(d,'pmenuId',true);
-              }
-            })
-          } else {
-            console.log('形成闭合回路--拖拽不更新');
-            
-          }
-        }
-			}, 
-			
-			/**begin 自定义函数请在下面加**/
-			translateDataToTree(data2) { 
-				var data=JSON.parse(JSON.stringify(data2));
-				let parents = data.filter(value =>{
-					//如果我的上级为空，则我是最上级 
-					if(value.pmenuId == 'undefined' || value.pmenuId == null  || value.pmenuId == ''){
-						return true;
-
-						//如果我的上级不在列表中，我作为最上级
-					}else if(data.some(i=>value.pmenuId==i.menuId)){
-						return false;
-					}else {
-						return true
-					}
-				 
-				}) 
-				let children = data.filter(value =>{
-					if(data.some(i=>value.pmenuId==i.menuId)){
-						return true;
-					}else{
-						return false;
-					} 
-				})  
-				let translator = (parents, children) => {
-					parents.forEach((parent) => {
-						children.forEach((current, index) => {
-							if (current.pmenuId === parent.menuId) {
-								let temp = JSON.parse(JSON.stringify(children))
-								temp.splice(index, 1)
-								translator([current], temp)
-								typeof parent.children !== 'undefined' ? parent.children.push(current) : parent.children = [current]
-							}
-						}
-						)
-					}
-					)
-				}
-
-				translator(parents, children)
-
-				return parents
-			},	
-			/**begin 自定义函数请在下面加**/
-			selectedMenu:function(row){
-				this.$emit("selected",row)
-			},
-			showImportFromMenuTemplate(row){
-				
-				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
-					this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); 
-					return false;
-				}
-				if(!this.filters.product){
-					this.$notify.error("请选择产品模板")
-					return;
-				}
-				this.parentMenu=row
-				this.menuTemplateVisible=true;
-			},
-			onSelectedMenuTemplates:function(menuTemplates){
-				
-				if(menuTemplates==null || menuTemplates.length==0){
-					this.menuTemplateVisible=false;
-					return;
-				}
-				var menuTemplates2=JSON.parse(JSON.stringify(menuTemplates))
-				this.load.add=true
-				let parents = menuTemplates2.filter(value =>{
-					//如果我的上级为空，则我是最上级
-					if(value.pmenuId == 'undefined' || value.pmenuId == null  || value.pmenuId == ''){
-						return true;
-
-						//如果我的上级不在列表中，我作为最上级
-					}else if(menuTemplates2.some(i=>value.pmenuId==i.menuId)){
-						return false;
-					}else {
-						return true
-					}
-				 
-				})
-				if(this.parentMenu!=null &&  this.parentMenu!=undefined){
-					parents.forEach(i=>i.pmenuId=this.parentMenu.menuId);
-				}else{
-					parents.forEach(i=>i.pmenuId=null);
-				}
-				let children = menuTemplates2.filter(value =>{
-					if(menuTemplates2.some(i=>value.pmenuId==i.menuId)){
-						return true;
-					}else{
-						return false;
-					} 
-				}) 
-				let translator = (parents, children) => {
-					parents.forEach((parent) => {
-						var newId=sn();
-						var myChildren=[];
-						if(children!=null && children.length>0){
-							myChildren=children.filter(current=>current.pmenuId===parent.menuId);
-						}  
-						myChildren.forEach((current, index) => {
-							 current.pmenuId=newId;
-							 var mySubChildren=children.filter(c=>c.pmenuId===current.menuId);
-							 translator([current],mySubChildren)
-						})
-						parent.menuId=newId;
-					})
-				}
-
-				translator(parents, children)
-				menuTemplates2.forEach(i=>{
-					i.productId=this.filters.product.id 
-					i.productName=this.filters.product.productName 
-				});
-				batchAddXmMenu(menuTemplates2).then(res=>{ 
-					this.menuTemplateVisible=false;
-					this.load.add=false
-					var tips =res.data.tips
-					if(tips.isOk){ 
-						this.getXmMenus()
-					}else{ 
-						this.$notify({showClose: true, message: tips.msg, type: 'error' });
-					}
-				}).catch( err  => this.load.add=false );
-			},
-			toBatchEdit(){
-				
-				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
-					this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); 
-					return false;
-				}
-				this.valueChangeRows=[];
-				this.batchEditVisible=true;
-
-			},
+      		},   
 			noBatchEdit(){
 				this.batchEditVisible=false; 
 				this.valueChangeRows=[];
@@ -861,8 +155,7 @@
 				batchEditXmMenu(this.valueChangeRows).then(res=>{
 					var tips=res.data.tips;
 					if(tips.isOk){
-						this.valueChangeRows=[]
-						this.getXmMenus()
+						this.valueChangeRows=[] 
 					}
 					this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
 				});
@@ -897,128 +190,7 @@
 					}
 				} 
 			},
-			showTaskList(row){ 
-				
-				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
-					this.$notify({showClose: true, message: "只有产品经理、产品组长能够修改需求", type: 'error'}); 
-					return false;
-				}
-				this.editForm=row
-				this.selectTaskVisible=true; 
-			}, 
-			
-			onSelectedTasks:function(xmTasks){
-				 
-				 
-				if(xmTasks==null || xmTasks.length==0){
-					this.$notify.error("请最少选择一个任务进行关联");
-					return;
-				}
-				var menu=this.editForm
-				xmTasks.forEach(i=>{
-					i.menuId=menu.menuId
-					i.menuName=menu.menuName
-					i.productId=menu.productId
-					i.productName=menu.productName
-				});
-				this.selectTaskVisible=false;
-
-				batchRelTasksWithMenu(xmTasks).then(res=>{
-					var tips = res.data.tips
-					if(tips.isOk){
-						this.getXmMenus()
-					}
-					this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
-				});
-			},
-			showMenuExchange:function(row){
-				this.editForm=row
-				this. menuDetailVisible=true;
-			},
-			toProjectList:function(product){
-				this.$router.push({name:'xmProjectMng',params:{productId:product.id,productName:product.productName}})
-			},
-			toIterationList:function(row){
-				 this.editForm=row
-				 this.iterationVisible=true;
-
-			},
-			showTasks(row){
-				this.editForm=row
-				this.taskMngVisible=true
-			}, 
-
-			showTaskListForMenu(row){
-				this.editForm=row
-				this.taskListForMenuVisible=true
-			}, 
-			/**end 自定义函数请在上面加**/
-			handlePopover:function(row,opType){
-				if('add'==opType){
-					var subRow=JSON.parse(JSON.stringify(this.addForm));
-					subRow.pmenuId=null
-					subRow.menuId=sn();
-					subRow.seqNo="1"
-					subRow.opType=opType
-					subRow.productId=this.filters.product.id 
-					subRow.productName=this.filters.product.productName 
-					this.fieldChange(subRow,'seqNo');
-					this.xmMenus.unshift(subRow);
-				}else if('addSub'==opType){
-					var subRow=JSON.parse(JSON.stringify(row));
-					subRow.children=[];
-					subRow.pmenuId=row.menuId
-					subRow.menuId=sn();
-					subRow.seqNo=row.seqNo+".1"
-					subRow.opType=opType
-					this.fieldChange(subRow,'seqNo');
-					this.xmMenus.unshift(subRow);
-				}else if('delete'==opType){
-					if(row.opType && (row.opType=='addSub' || row.opType=='add')){
-						if(row.children && row.children.length>0){
-							this.$notify.error("请先删除子元素");
-							return;
-						}else{ 
-
-							var index=this.xmMenus.findIndex(i=>i.menuId==row.menuId)
-							var indexValueChanges=this.valueChangeRows.findIndex(i=>i.menuId==row.menuId)
-							this.valueChangeRows.splice(indexValueChanges,1);
-							this.xmMenus.splice(index,1);
-						}
-					}else{
-						this.$notify.error("只能删除未保存的行");
-						return;
-					}
-					 
-				} else if ('highestPmenuId' === opType) {  
-					if (row.pmenuId) {
-						this.xmMenus.find(d => {
-							
-							if (d.menuId === row.menuId) { 
-								d.pmenuId = '';
-								this.fieldChange(d,'seqNo', true); 
-							}
-						});
-					}
-				}
-            
-			},
-			loadTasksToXmMenuState: function () {  
-				this.load.edit=true;
-				if(!this.filters.product){
-					this.$notify.error("请先选择产品");
-				}
-				let params = { productId: this.filters.product.id };
-				loadTasksToXmMenuState(params).then((res) => {
-					this.load.edit=false;
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.count=true;
-						this.getXmMenus();
-					}
-					this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-				}).catch( err  => this.load.edit=false ); 
-			},
+			 
 			selectUser(row){
 				this.editForm=row
 				this.userSelectVisible=true;
@@ -1038,59 +210,57 @@
 				 row.mmUsername=''
 				 this.fieldChange(row,"mmUsername");
 			},
-			clearFiltersMmUser:function(){
-				 this.filters.mmUser=null;
-				  this.searchXmMenus();
-			},			
-			selectFiltersMmUser(){
-				this.selectFiltersMmUserVisible=true;
-			},
-			onFiltersMmUserSelected(users){
+			 
+			loadXmMenusLazy(tree, treeNode, resolve) {   
+				
+      			this.maps.set(tree.menuId, { tree, treeNode, resolve }) //储存数据
+					var params={pmenuId:tree.menuId} 
+					params.isTop=""
+					this.load.list = true;
+					var func=listXmMenuWithState 
+					func(params).then(res=>{
+						this.load.list = false
+						var tips = res.data.tips;
+						if(tips.isOk){
+							resolve(res.data.data) 
+						}else{
+							resolve([])
+						}
+					}).catch( err => this.load.list = false );   
 				
-				 if(users && users.length>0){
-					 this.filters.mmUser=users[0]
-				 }else{
-					 this.filters.mmUser=null;
-				 }
-				 this.selectFiltersMmUserVisible=false;
-				 this.searchXmMenus();
 			},
-			setFiltersMmUserAsMySelf(){
-				this.filters.mmUser=this.userInfo;
-				this.searchXmMenus();
-			},								 
-			toSelectProduct(){
-				this.filters.product=null;
-			}
+			//查询时选择责任人
+			showBatchMmUserSelectVisible() {
+				if(!this.sels||this.sels.length==0){
+					this.$notify({showClose:true,message:'请先选中一条或多条数据',type:'error'})
+					return;
+				}else{
+					this.batchMmUserSelectVisible=true;
+				}
+			}, 
+			//查询时选择责任人
+			onBatchMmUserSelectConfirm(users) {
+				var user={};
+				if (users && users.length > 0) { 
+					user=users[0]
+				} 
+				this.batchMmUserSelectVisible=false;
+				this.sels.forEach(i=>{
+					i.mmUserid=user.userid;
+					i.mmUsername=user.username; 
+					this.fieldChange(i,"mmUserid")
+				})
+			},
 		},//end methods
-		components: { 
-		    'xm-menu-add':XmMenuAdd,
-			'xm-menu-edit':XmMenuEdit,
-			XmProductMng,
-			XmMenuTemplateMng,
-			XmMenuRichDetail,
-			XmTaskList,
-			XmTaskMng,
-			XmTaskListForMenu,
-			XmIterationMng,
-			UsersSelect,
-		    
-		    //在下面添加其它组件
+		components: {  
+			UsersSelect, 
 		},
 		mounted() { 
-			this.$nextTick(() => { 
-				this.filters.product=this.product
-				this.getXmMenus(); 
-				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
-				
-				
+			 
+			this.$nextTick(() => {   
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);  
           }); 
-			// 阻止默认行为
-			document.body.ondrop = function (event) {
-				event.preventDefault();
-				event.stopPropagation();
-			};
-			this.rowDrop();
+			 
 		}
 	}
 
diff --git a/src/views/xm/core/xmMenu/XmMenuOverview.vue b/src/views/xm/core/xmMenu/XmMenuOverview.vue
index 7d6d555d..9c96146e 100644
--- a/src/views/xm/core/xmMenu/XmMenuOverview.vue
+++ b/src/views/xm/core/xmMenu/XmMenuOverview.vue
@@ -5,15 +5,8 @@
         <el-card class="box-card" style="padding:0px ;height:100px">
           <div>
             <el-row style="padding:10px">
-              <el-steps :active="this.xmMenu.menuStatus" finish-status="success" align-center>
-                <el-step title="初始"></el-step>
-                <el-step title="设计中"></el-step>
-                <el-step title="开发中"></el-step>
-                <el-step title="测试中"></el-step>
-                <el-step title="uat测试"></el-step>
-                <el-step title="已上线"></el-step>
-                <el-step title="已下线"></el-step>
-                <el-step title="已删除"></el-step>
+              <el-steps :active="calcMenuCurrStep" finish-status="success" align-center>
+                <el-step :title="item.name" v-for="(item,index) in dicts['menuStatus']" :key="index"></el-step> 
               </el-steps>
             </el-row>
           </div>
@@ -237,7 +230,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { mapGetters } from 'vuex'
 
 
@@ -305,6 +298,20 @@
       xmMenuCpd(){
         return this.xmMenu
       },
+      
+			calcMenuCurrStep(){
+				var menuStatus= this.dicts.menuStatus
+				if(!menuStatus){
+					return 1;
+				}else{
+					var status=menuStatus.findIndex(i=>this.xmMenu.status==i.id)
+					if(status>=0){
+						return status+1;
+					}else{
+						return 1;
+					}
+				}
+			}
 
     },
 
@@ -319,6 +326,7 @@
     data() {
       return {
         isActive:true,
+        dicts:{},
       };
     },
 
@@ -533,6 +541,10 @@
     },
 
     mounted() {
+      
+ 			initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{
+				this.dicts=res.data.data;
+			})
       this.$nextTick(() => {
       });
       this.drawAllBar();
diff --git a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
index ac44ac8e..e035d3aa 100644
--- a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
+++ b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
@@ -39,7 +39,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmMenu,listXmMenu } from '@/api/xm/core/xmMenu';
 	import { mapGetters } from 'vuex'
  	import  XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng';//修改界面
@@ -71,7 +71,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					menuId: [
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index baf3875b..71b05294 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -2,54 +2,82 @@
 	<section> 
 		<el-row>   
 			<el-col :span="24"  style="padding-left:12px;" >
-				<el-row  > 
+				<el-row>    
+					<el-popover
+						placement="bottom"
+						width="400"
+						trigger="manual"
+						v-model="productVisible"> 
+						<xm-product-select v-if="!xmProduct" :auto-select="false" :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :xm-iteration="xmIteration" :simple="true" @clear-select="onProductClearSelect" @close="productVisible=false"></xm-product-select>
+							<el-link title="产品，点击选择、清除选择" @click="productVisible=true" type="warning" slot="reference" v-if="!xmProduct" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品'}}</font></el-link> 
+					</el-popover>  
 					
-					<el-popover v-if="!xmProduct||!xmProduct.id"
-						placement="right"
+					<el-popover
+						placement="bottom"
 						width="400"
-						trigger="click"> 
-						<xm-product-select :auto-select="true" :sel-project="selProject" v-if="!xmProduct" :xm-iteration="xmIteration" @row-click="onProductSelected" ref="xmProductMng" :simple="true"></xm-product-select>
-							<el-link type="warning" slot="reference"  icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品'}}</font></el-link> 
+						trigger="manual"
+						v-model="iterationVisible"> 
+						<xm-iteration-select v-if="!xmIteration" :auto-select="false" :sel-project="selProject" @row-click="onIterationSelected" ref="xmProductMng" :xm-product="xmProduct" :simple="true" @clear-select="onIterationClearSelect" @close="iterationVisible=false"></xm-iteration-select>
+							<el-link title="迭代，点击选择、清除选择" @click="iterationVisible=true" type="warning" slot="reference" v-if="!xmIteration" icon="el-icon-search"><font style="font-size:14px;">{{filters.iteration?filters.iteration.iterationName:'选择迭代'}}</font></el-link> 
 					</el-popover>  
- 					<el-select class="hidden-md-and-down" v-if="excludeIterationId" v-model="filters.iterationFilterType" placeholder="是否加入过迭代？" clearable  >
-						<el-option   value="not-join"  label="未加入任何迭代的需求"></el-option>  
-						<el-option   value="join"  label="已加入迭代的需求"></el-option>  
-					</el-select>
-					<el-select class="hidden-md-and-down" v-else v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable  >
-						<el-option   value="not-join"  label="未分配任何任务的需求"></el-option>  
-						<el-option   value="join"  label="已分配任务的需求"></el-option>  
+					<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable style="width: 160px;">
+						<el-option   value="not-join-any-project"  label="未分配任务"></el-option>  
+						<el-option   value="join-any-project"  label="已分配任务"></el-option>  
+						<el-option   value="not-join-curr-project"  label="未分配任务到本项目" v-if="selProject && selProject.id"></el-option>  
+						<el-option   value="join-curr-project"  label="已分配任务到本项目"  v-if="selProject && selProject.id"></el-option>  
+					</el-select>   
+					<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable  style="width: 160px;">
+						<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>  
+						<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>  
+						<el-option   value="not-join-curr-iteration"  label="未加入本迭代"  v-if="filters.iteration && filters.iteration.id"></el-option>  
+						<el-option   value="join-curr-iteration"  label="已加入本迭代" v-if="filters.iteration && filters.iteration.id"></el-option>  
 					</el-select> 
-					<el-input v-model="filters.key" closable style="width: 20%;" placeholder="需求名查询"> 
-					</el-input>  
-					<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
-					<el-popover
+					
+					<el-select v-model="filters.dtype" clearable placeholder="需求类型">
+						<el-option v-for="i in this.dicts.demandType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+					</el-select>    
+					<el-select v-model="filters.source" placeholder="需求来源"  clearable>
+						<el-option v-for="i in this.dicts.demandSource" :label="i.name" :key="i.id" :value="i.id"></el-option>
+					</el-select>     
+					<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable class="hidden-md-and-down">
+						<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+					</el-select>     
+				</el-row>
+				<el-row>     
+					<el-button class="hidden-md-and-down" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签条件</el-button>
+					<el-tag class="hidden-md-and-down" v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
+					<el-select v-model="filters.priority" placeholder="优先级"  clearable>
+							<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+					</el-select>      
+					<el-select  v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
+						<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option> 
+					</el-select> 
+					<el-input v-model="filters.key" style="width: 15%;" placeholder="需求名称查询" clearable> 
+					</el-input> 
+					<el-button   type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search">查询</el-button>
+					 
+ 					<el-popover
 						placement="top-start"
 						title=""
 						width="400"
 						trigger="click" >
-						<el-row> 
-							<el-col  :span="24"  style="padding-top:5px;">
-								<el-select    v-model="filters.iterationFilterType" placeholder="是否加入过迭代？" clearable  >
-									<el-option   value="not-join"  label="未加入任何迭代的需求"></el-option>  
-									<el-option   value="join"  label="已加入迭代的需求"></el-option>  
-								</el-select>
-							</el-col>
-							<el-col  :span="24"  style="padding-top:5px;"> 
-								<el-select   v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable >
-									<el-option   value="not-join"  label="未分配任何任务的需求"></el-option>  
-									<el-option   value="join"  label="已分配任务的需求"></el-option>  
-								</el-select> 
-							</el-col>
+						<el-row>  
+							<el-col  :span="24"  style="padding-top:5px;" >
+								<font class="more-label-font">标签条件:</font>  
+								<el-button type="text" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签</el-button>
+								<el-tag v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
+
+							</el-col> 
 							<el-col :span="24"  style="padding-top:5px;">
-								<font class="more-label-font">创建时间:</font>  
+								<font class="more-label-font">创建日期:</font>  
 								<el-date-picker
 									v-model="dateRanger" 
 									type="daterange"
 									align="right"
 									unlink-panels
 									range-separator="至"
-									start-placeholder="开始日期"
-									end-placeholder="完成日期"
+									start-placeholder="创建日期"
+									end-placeholder="创建日期"
 									value-format="yyyy-MM-dd HH:mm:ss"
 									:default-time="['00:00:00','23:59:59']"
 									:picker-options="pickerOptions"
@@ -60,30 +88,32 @@
 									责任人:
 								</font>  
 								<el-tag v-if="filters.mmUser" closable @close="clearFiltersMmUser()">{{filters.mmUser.username}}</el-tag> 
-								<el-button v-else @click="selectFiltersMmUser()">选责任人</el-button>
-								<el-button   @click="setFiltersMmUserAsMySelf()">我的</el-button>
+								<el-button   v-else @click="selectFiltersMmUser()">选责任人</el-button>
+								<el-button    @click="setFiltersMmUserAsMySelf()">我的</el-button>
 							</el-col>
-							<el-col  :span="24"  style="padding-top:5px;">
+							<el-col  :span="24"  style="padding-top:5px;" class="hidden-log-and-up">
 								<font class="more-label-font">
-									需求名称:
-								</font> 
-								<el-input   v-model="filters.key" style="width:100%;"  placeholder="输入需求名字关键字" clearable>  
-								</el-input> 
+									需求层次:
+								</font>  
+								<el-select v-model="filters.dlvl" placeholder="需求层次"  clearable>
+									<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
+								</el-select>  
 							</el-col>
 							<el-col  :span="24"  style="padding-top:5px;">
-								<el-button type="primary"  @click="searchXmMenus" >查询</el-button>
- 							</el-col> 
+								<el-button type="primary"  @click="searchXmMenus" icon="el-icon-search">查询</el-button>
+							</el-col>  
 						</el-row> 
 						<el-button  slot="reference" icon="el-icon-more"></el-button>
-					</el-popover> 
+					</el-popover>  
+					
 					<el-button   type="primary" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
-				</el-row>
+				</el-row>   
 				<el-row style="padding-top:12px;">
 					<el-table ref="table" class="menu-table"  lazy :load="loadMenusLazy" :height="maxTableHeight" :data="xmMenusTreeData"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column v-if="multi" type="selection" width="50"></el-table-column>  
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
 							<template slot-scope="scope">
-								<span class="vlink"  @click="toMenu(scope.row)">{{scope.row.seqNo}}&nbsp;
+								<span class="vlink" :class="scope.row.ntype==='1'?'el-icon-folder-opened':''"  @click="toMenu(scope.row)">{{scope.row.seqNo}}&nbsp;
 								{{scope.row.menuName}}</span> 
 							</template>
 						</el-table-column> 
@@ -116,12 +146,13 @@
 	import util from '@/common/js/util';//全局公共库
 	import treeTool from '@/common/js/treeTool';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmMenu  } from '@/api/xm/core/xmMenu';
  	import  XmProductSelect from '../xmProduct/XmProductSelect';//新增界面
  	import XmMenuRichDetail from './XmMenuRichDetail';
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
 
+	import  XmIterationSelect from '../xmIteration/XmIterationSelect';//修改界面
 	import {sn} from '@/common/js/sequence'
 
 	import { mapGetters } from 'vuex'
@@ -174,12 +205,12 @@
 					pageSize:50,//每页数据
 					count:false,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+					orderFields:['seq_no'],//排序列 如 ['sex','student_id']，必须为数据库字段
+					orderDirs:['asc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmMenu界面是否显示
 				//新增xmMenu界面初始化数据
@@ -194,6 +225,8 @@
 				},
  				menuDetailVisible:false,
 				 selectFiltersMmUserVisible:false,
+				 productVisible:false,
+				iterationVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 				maxTableHeight:300,
 				dateRanger: [ ],  
@@ -228,12 +261,7 @@
 				 this.pageInfo.count=true; 
 				 this.getXmMenus();
 			},
-			
-			getParams(params){
-
-				if(!params.productId){
-					params.branchId=this.userInfo.branchId
-				}
+			getParams(params){ 
 				
 				if( this.filters.key){
 					params.key="%"+this.filters.key+"%"
@@ -244,53 +272,79 @@
 				}  
 				if(this.filters.iterationFilterType){
 					params.iterationFilterType=this.filters.iterationFilterType
-				} 
-				if(this.xmIteration){
-					params.iterationFilterType='join'
-					params.iterationId=this.xmIteration.id
+					if(params.iterationFilterType==='not-join-any-iteration'){
+
+					}else if(params.iterationFilterType==='join-any-iteration'){
+
+					}else if(params.iterationFilterType==='not-join-curr-iteration'){
+						params.filterIterationId=this.filters.iteration.id
+					}else if(params.iterationFilterType==='join-curr-iteration'){
+						params.filterIterationId=this.filters.iteration.id
+					} 
+					params.ntype="0"
+				}else{
+					if(this.filters.iteration){
+						params.iterationId=this.filters.iteration.id
+					}
+				}
+				if(this.xmIteration && this.xmIteration.id){ 
+					params.linkIterationId=this.xmIteration.id
 				}
 				if(this.filters.taskFilterType){
-					params.taskFilterType=this.filters.taskFilterType
+					params.taskFilterType=this.filters.taskFilterType 
+					params.projectId=this.selProject.id 
+					params.ntype="0"
+				} 
+				if(this.selProject && this.selProject.id){
+					params.linkProjectId=this.selProject.id
 				} 
-				if(this.selProject){
-					params.projectId=this.selProject.id
-				}
-				
 				if(this.filters.product){
 					params.productId=this.filters.product.id
+				}  
+				if(this.filters.status){
+					params.status=this.filters.status
+				}
+				
+				if(this.filters.dlvl){
+					params.dlvl=this.filters.dlvl
 				}
-				if(this.filters.parentMenu){
-					params.pmenuId=this.filters.parentMenu.menuId
+				
+				if(this.filters.dtype){
+					params.dtype=this.filters.dtype
 				}
 				
+				if(this.filters.priority){
+					params.priority=this.filters.priority
+				}
+				
+				if(this.filters.source){
+					params.source=this.filters.source
+				}
 				if( this.dateRanger && this.dateRanger.length==2){
 					params.ctimeStart=this.dateRanger[0] 
 					params.ctimeEnd=this.dateRanger[1] 
 				} 
-				if(!(params.ctimeStart||params.pmenuId||params.projectId||params.iterationId||params.iterationFilterType||params.mmUserid||params.key||params.taskFilterType)){
-					params.isTop="1"
-				}
+				if(this.filters.tags && this.filters.tags.length>0){
+					params.tagIdList=this.filters.tags.map(i=>i.tagId)
+				} 
 				return params;
 			},
 			loadMenusLazy(row, treeNode, resolve) {  
-				if(row.children&&row.children.length>0){
-					resolve(row.children) 
-				}else{
-					var params={pmenuId:row.menuId}
-					params=this.getParams(params);
-					params.isTop=""
-					this.load.list = true;
-					var func=listXmMenu 
-					func(params).then(res=>{
-						this.load.list = false
-						var tips = res.data.tips;
-						if(tips.isOk){
-							resolve(res.data.data) 
-						}else{
-							resolve([])
-						}
-					}).catch( err => this.load.list = false );  
-				}
+				 
+				var params={pmenuId:row.menuId}
+				params=this.getParams(params);
+				params.isTop=""
+				this.load.list = true;
+				var func=listXmMenu 
+				func(params).then(res=>{
+					this.load.list = false
+					var tips = res.data.tips;
+					if(tips.isOk){
+						resolve(res.data.data) 
+					}else{
+						resolve([])
+					}
+				}).catch( err => this.load.list = false );   
 				
 			},
 			//获取列表 XmMenu xm_project_menu
@@ -336,11 +390,7 @@
 			//选择行xmMenu
 			selsChange: function (sels) {
 				this.sels = sels;
-			}, 
-			onProductSelected:function(product){
-				this.filters.product=product
-				this.getXmMenus()
-			},
+			},  
 			 
 			rowClick: function(row, event, column){
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
@@ -378,16 +428,45 @@
 			setFiltersMmUserAsMySelf(){
 				this.filters.mmUser=this.userInfo;
 				this.searchXmMenus();
-			},		
+			},
+			
+			onProductSelected:function(product){
+				this.filters.product=product 
+				this.productVisible=false;
+				this.xmMenus=[]
+				this.getXmMenus()
+			},
+			onProductClearSelect:function(){
+				this.filters.product=null  
+				this.productVisible=false;
+				this.xmMenus=[]
+				this.getXmMenus()
+			},	 
+			onIterationSelected:function(iteration){
+				this.filters.iteration=iteration  
+				this.iterationVisible=false;
+				this.xmMenus=[]
+				this.getXmMenus()
+			},
+			onIterationClearSelect:function(){
+				this.filters.iteration=null  
+				this.iterationVisible=false;
+				this.xmMenus=[]
+				this.getXmMenus()
+			},	
 			/**end 自定义函数请在上面加**/
 			
 		},//end methods
 		components: { 
- 			XmProductSelect,XmMenuRichDetail,UsersSelect
+ 			XmProductSelect,XmMenuRichDetail,UsersSelect,XmIterationSelect
  		    
 		    //在下面添加其它组件
 		},
 		mounted() {  
+			
+  			initSimpleDicts("all",['menuStatus','demandSource','demandLvl','demandType','priority']).then(res=>{
+				this.dicts=res.data.data;
+			})
 			this.$nextTick(() => {
 				
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index eeb78c07..1a80e04a 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -127,7 +127,7 @@
 					<el-table-column prop="planStatus" label="计划状态" min-width="80" > 
 						<template slot-scope="scope"> 
 							<el-select v-model="scope.row.planStatus" @change="fieldChange(scope.row,'planStatus')" :disabled="!scope.row.projectId">
-								<el-option v-for="i in options.xmMenuPlanStatus" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+								<el-option v-for="i in dicts.xmMenuPlanStatus" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>
 						</template>
 					</el-table-column> 
@@ -164,7 +164,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import {  listXmMenuWithPlan } from '@/api/xm/core/xmMenu';
 	import { delXmMenuPlan, batchDelXmMenuPlan,batchAddPlanFromTasks, loadTasksToXmMenuPlan,batchEditXmMenuPlan} from '@/api/xm/core/xmMenuPlan'; 
 	
@@ -207,7 +207,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					xmMenuPlanStatus:[]
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -484,12 +484,12 @@
 				}else{
 					return cellValue
 				}
-				if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0   ){
+				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
 					return cellValue;
 				}
-				var list=this.options[key].filter(i=>i.optionValue==cellValue)
+				var list=this.dicts[key].filter(i=>i.id==cellValue)
 				if(list.length>0){
-					return list[0].optionName
+					return list[0].name
 				}else{
 					return cellValue;
 				}
@@ -578,8 +578,8 @@
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmMenus();
 			}); 
-				listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{
-					this.options=res.data.data;
+				initSimpleDicts('all',['xmMenuPlanStatus'] ).then(res=>{
+					this.dicts=res.data.data;
 				})		
 		}
 	}
diff --git a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
index 85e4f1e2..e162d828 100644
--- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
+++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
@@ -43,7 +43,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmMenuExchange, delXmMenuExchange, batchDelXmMenuExchange,addXmMenuExchange } from '@/api/xm/core/xmMenuExchange'; 
 	import MenuUserEditor from './MenuUserEditor'
 	import { mapGetters } from 'vuex'
@@ -82,7 +82,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -323,9 +323,9 @@
 				this.getXmMenuExchanges();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmMenuExchange/XmMenuExchangeRoute.vue b/src/views/xm/core/xmMenuExchange/XmMenuExchangeRoute.vue
index 8bbf6577..66881a85 100644
--- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeRoute.vue
+++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeRoute.vue
@@ -7,7 +7,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { mapGetters } from 'vuex'
 	import {sn} from '@/common/js/sequence';  
 
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
index 4dedd9f1..a9676940 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
@@ -154,7 +154,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmMenuState } from '@/api/xm/core/xmMenuState';
 	import { mapGetters } from 'vuex'
 	
@@ -177,7 +177,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
index 2397826e..e0748fe3 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
@@ -154,7 +154,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmMenuState } from '@/api/xm/core/xmMenuState';
 	import { mapGetters } from 'vuex'
 	
@@ -177,7 +177,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index a8140be4..fd6eb067 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -121,7 +121,7 @@
 					<el-table-column prop="planStatus" label="计划状态" min-width="80" > 
 						<template slot-scope="scope"> 
 							<el-select v-model="scope.row.planStatus" @change="fieldChange(scope.row,'planStatus')" :disabled="!scope.row.projectId">
-								<el-option v-for="i in options.xmMenuStateStatus" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+								<el-option v-for="i in dicts.xmMenuStateStatus" :label="i.name" :key="i.id" :value="i.id"></el-option>
 							</el-select>
 						</template>
 					</el-table-column> 
@@ -152,7 +152,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmMenuWithState} from '@/api/xm/core/xmMenu'; 
 
  	import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState'; 
@@ -195,7 +195,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					xmMenuStateStatus:[]
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -394,12 +394,12 @@
 				}else{
 					return cellValue
 				}
-				if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0   ){
+				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
 					return cellValue;
 				}
-				var list=this.options[key].filter(i=>i.optionValue==cellValue)
+				var list=this.dicts[key].filter(i=>i.id==cellValue)
 				if(list.length>0){
-					return list[0].optionName
+					return list[0].name
 				}else{
 					return cellValue;
 				}
@@ -484,8 +484,8 @@
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmMenus();
 			}); 
-				listOption([{categoryId:'all',itemCode:'xmMenuStateStatus'} ]).then(res=>{
-					this.options=res.data.data;
+				initSimpleDicts('all',['xmMenuStateStatus'] ).then(res=>{
+					this.dicts=res.data.data;
 				})		
 		}
 	}
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
index 04c8bb55..a111dd28 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
@@ -25,7 +25,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmMenuTemplate } from '@/api/xm/core/xmMenuTemplate';
 	import { mapGetters } from 'vuex'
 	
@@ -48,7 +48,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					menuId: [
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
index 989cbabe..ab7120ef 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
@@ -25,7 +25,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmMenuTemplate } from '@/api/xm/core/xmMenuTemplate';
 	import { mapGetters } from 'vuex'
 	
@@ -48,7 +48,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					menuId: [
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index b0452b6f..fdf8f1e6 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@@ -47,7 +47,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import treeTool from '@/common/js/treeTool';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmMenu, delXmMenuTemplate, batchDelXmMenuTemplate,batchEditXmMenuTemplate } from '@/api/xm/core/xmMenu'; 
 	import  XmProductTplMng from '../xmProduct/XmProductTplMng';//新增界面
 
@@ -86,7 +86,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmMenuTemplate界面是否显示
 				//新增xmMenuTemplate界面初始化数据
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
index 3c65650a..8a42ac00 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
@@ -40,7 +40,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmMyFocus } from '@/api/xm/core/xmMyFocus';
 	import { mapGetters } from 'vuex'
 	
@@ -63,7 +63,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
index f25679f9..54291c5f 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
@@ -40,7 +40,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmMyFocus } from '@/api/xm/core/xmMyFocus';
 	import { mapGetters } from 'vuex'
 	
@@ -63,7 +63,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
index f4cbd9b0..ace9f09e 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
@@ -44,7 +44,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmMyFocus, delXmMyFocus, batchDelXmMyFocus } from '@/api/xm/core/xmMyFocus';
 	import  XmMyFocusAdd from './XmMyFocusAdd';//新增界面
 	import  XmMyFocusEdit from './XmMyFocusEdit';//修改界面
@@ -72,7 +72,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmMyFocus界面是否显示
 				//新增xmMyFocus界面初始化数据
diff --git a/src/views/xm/core/xmPhase/XmPhaseAdd.vue b/src/views/xm/core/xmPhase/XmPhaseAdd.vue
index 1a2fc9fe..b14fbcb2 100644
--- a/src/views/xm/core/xmPhase/XmPhaseAdd.vue
+++ b/src/views/xm/core/xmPhase/XmPhaseAdd.vue
@@ -13,12 +13,12 @@
 					</el-form-item>
 					<el-form-item  label="计划类型" prop="planType">
 						<el-select v-model="addForm.planType">
-							<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+							<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item  label="任务类型" prop="taskType">
 						<el-select v-model="addForm.taskType">
-							<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+							<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="备注" prop="remark">
@@ -102,7 +102,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { addXmPhase } from '@/api/xm/core/xmPhase'; 
 	import { mapGetters } from 'vuex'
 
@@ -194,7 +194,7 @@
 				const endDate = new Date();
 				endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
@@ -378,9 +378,9 @@
 					this.addForm.seqNo=this.parentProjectPhase.seqNo+"."+1
 				}
 
-			}
-			listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
-				this.options=res.data.data;
+			}  
+			initSimpleDicts('all',['planType','taskType']).then(res=>{
+				this.dicts=res.data.data;
 			})
 		}//end mounted
 	}
diff --git a/src/views/xm/core/xmPhase/XmPhaseBatch.vue b/src/views/xm/core/xmPhase/XmPhaseBatch.vue
index bb53b992..fe485a9f 100644
--- a/src/views/xm/core/xmPhase/XmPhaseBatch.vue
+++ b/src/views/xm/core/xmPhase/XmPhaseBatch.vue
@@ -276,7 +276,7 @@
 import util from "@/common/js/util"; //全局公共库
 import treeTool from "@/common/js/treeTool"; //全局公共库
 //import Sticky from '@/components/Sticky' // 粘性header组件
-import { listOption } from "@/api/mdp/meta/itemOption"; //下拉框数据查询
+import { initSimpleDicts } from '@/api/mdp/meta/item'; //下拉框数据查询
 import {
   listXmPhase,
   delXmPhase,
@@ -420,7 +420,7 @@ export default {
       },
       load: { list: false, edit: false, del: false, add: false }, //查询中...
       sels: [], //列表选中数据
-      options: {
+      dicts: {
         xmPhaseStatus: [],
       }, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
@@ -1587,12 +1587,12 @@ export default {
     },
     /**end 自定义函数请在上面加**/
     formateOption: function (itemCode, value) {
-      if (this.options[itemCode]) {
-        var options = this.options[itemCode].filter(
-          (i) => i.optionValue == value
+      if (this.dicts[itemCode]) {
+        var dicts = this.dicts[itemCode].filter(
+          (i) => i.id == value
         );
-        if (options && options.length > 0) {
-          return options[0].optionName;
+        if (dicts && dicts.length > 0) {
+          return dicts[0].name;
         } else {
           return value;
         }
@@ -1739,13 +1739,10 @@ export default {
       this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
       if (this.selProject) {
         this.getXmPhases();
-      }
-
-      listOption([{ categoryId: "all", itemCode: "xmPhaseStatus" }]).then(
-        (res) => {
-          this.options = res.data.data;
-        }
-      );
+      } 
+			initSimpleDicts('all',['xmPhaseStatus']).then(res=>{
+				this.dicts=res.data.data;
+			})
     });
     // 阻止默认行为
     document.body.ondrop = function (event) {
diff --git a/src/views/xm/core/xmPhase/XmPhaseEdit.vue b/src/views/xm/core/xmPhase/XmPhaseEdit.vue
index 6c8f0a97..d5ceb10f 100644
--- a/src/views/xm/core/xmPhase/XmPhaseEdit.vue
+++ b/src/views/xm/core/xmPhase/XmPhaseEdit.vue
@@ -22,12 +22,12 @@
 							</el-form-item>
 							<el-form-item  label="任务类型" prop="taskType">
 								<el-select v-model="editForm.taskType">
-									<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+									<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 								</el-select>
 							</el-form-item>
 							<el-form-item  label="计划类型" prop="planType">
 								<el-select v-model="editForm.planType">
-									<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+									<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 								</el-select>
 							</el-form-item>
 							<el-form-item label="备注" prop="remark">
@@ -116,7 +116,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmPhase } from '@/api/xm/core/xmPhase'; 
 	import { mapGetters } from 'vuex'
 	import  XmPhaseOverview from './XmPhaseOverview';//新增界面
@@ -202,7 +202,7 @@
 				const endDate = new Date();
 				endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				dicts:{},//下拉选择框的所有静态数据  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: {
 					id: [
@@ -385,9 +385,9 @@
 		mounted() {
 			this.editForm=Object.assign(this.editForm, this.xmPhase);
 			/**在下面写其它函数***/
-			this.dateRanger=[this.editForm.beginDate,this.editForm.endDate]
-			listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
-				this.options=res.data.data;
+			this.dateRanger=[this.editForm.beginDate,this.editForm.endDate]  
+			initSimpleDicts('all',['planType','taskType']).then(res=>{
+				this.dicts=res.data.data;
 			})
 		}//end mounted
 	}
diff --git a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue
index b264f8fe..e8e7efad 100644
--- a/src/views/xm/core/xmPhase/XmPhaseForProduct.vue
+++ b/src/views/xm/core/xmPhase/XmPhaseForProduct.vue
@@ -6,7 +6,7 @@
 				<el-checkbox v-model="filters.milestone" true-label="1" false-label=""  >里程碑</el-checkbox>
 				<el-checkbox v-model="filters.isKeyPath" true-label="1" false-label=""  >关键路径</el-checkbox>
 				<el-select v-model="filters.phaseStatus" placeholder="计划状态" clearable style="width:100px;">
-					<el-option :label="item.name" :value="item.id" v-for="(item,index) in options.xmPhaseStatus" :key="index"></el-option>
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in dicts.xmPhaseStatus" :key="index"></el-option>
 				</el-select>
 				<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询"> 
 				</el-input> 
@@ -108,7 +108,7 @@
 				</el-table-column> 
 				<el-table-column  prop="phaseStatus" label="计划状态" width="100" >  
 					<template slot-scope="scope">
-						 <font v-if="options.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{options.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
+						 <font v-if="dicts.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{dicts.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
 					</template>
 				</el-table-column>     
 				<el-table-column    label="操作" width="200" >  
@@ -186,7 +186,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import treeTool from '@/common/js/treeTool';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { batchAddXmPhaseMenu,batchDelXmPhaseMenu  } from '@/api/xm/core/xmPhaseMenu';
 
 	import { listXmPhase,calcKeyPaths, delXmPhase, batchDelXmPhase,batchImportFromTemplate,batchSaveBudget,loadMenusToXmPhase,setPhaseMngUser,selectTotalProductAndPhaseBudgetCost  } from '@/api/xm/core/xmPhase';
@@ -268,7 +268,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{  
+				dicts:{  
 					xmPhaseStatus:[
 						{id:'0',name:'初始'},
 						{id:'1',name:'执行中'},
@@ -1105,10 +1105,10 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
 			}, 
 			/**end 自定义函数请在上面加**/ 
 			formateOption:function(itemCode,value){
-				if(this.options[itemCode]){
-					var options=this.options[itemCode].filter(i=>i.optionValue==value);
-					if(options && options.length > 0){
-						return options[0].optionName
+				if(this.dicts[itemCode]){
+					var dicts=this.dicts[itemCode].filter(i=>i.id==value);
+					if(dicts && dicts.length > 0){
+						return dicts[0].name
 					}else{
 						return value;
 					}
diff --git a/src/views/xm/core/xmPhase/XmPhaseMng.vue b/src/views/xm/core/xmPhase/XmPhaseMng.vue
index 37eec37a..b1a6800b 100644
--- a/src/views/xm/core/xmPhase/XmPhaseMng.vue
+++ b/src/views/xm/core/xmPhase/XmPhaseMng.vue
@@ -6,7 +6,7 @@
 				<el-checkbox v-model="filters.milestone" true-label="1" false-label=""  >里程碑</el-checkbox>
 				<el-checkbox v-model="filters.isKeyPath" true-label="1" false-label=""  >关键路径</el-checkbox>
 				<el-select v-model="filters.phaseStatus" placeholder="计划状态" clearable style="width:100px;">
-					<el-option :label="item.name" :value="item.id" v-for="(item,index) in options.xmPhaseStatus" :key="index"></el-option>
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in dicts.xmPhaseStatus" :key="index"></el-option>
 				</el-select>
 				<el-input   v-model="filters.key" style="width:200px;" placeholder="模糊查询"> 
 				</el-input> 
@@ -121,7 +121,7 @@
 				</el-table-column> 
 				<el-table-column  prop="phaseStatus" label="计划状态" width="100" >  
 					<template slot-scope="scope">
-						 <font v-if="options.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{options.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
+						 <font v-if="dicts.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{dicts.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
 					</template>
 				</el-table-column>     
 				<el-table-column    label="操作" width="200" >  
@@ -207,7 +207,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import treeTool from '@/common/js/treeTool';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { batchRelTasksWithPhase  } from '@/api/xm/core/xmTask';
 
 	import { listXmPhase,calcKeyPaths, delXmPhase, batchDelXmPhase,batchImportFromTemplate,batchSaveBudget,loadTasksToXmPhase,setPhaseMngUser,selectTotalProjectAndPhaseBudgetCost  } from '@/api/xm/core/xmPhase';
@@ -300,7 +300,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{  
+				dicts:{  
 					xmPhaseStatus:[
 						{id:'0',name:'初始'},
 						{id:'1',name:'执行中'},
@@ -1140,10 +1140,10 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
 			}, 
 			/**end 自定义函数请在上面加**/ 
 			formateOption:function(itemCode,value){
-				if(this.options[itemCode]){
-					var options=this.options[itemCode].filter(i=>i.optionValue==value);
-					if(options && options.length > 0){
-						return options[0].optionName
+				if(this.dicts[itemCode]){
+					var dicts=this.dicts[itemCode].filter(i=>i.id==value);
+					if(dicts && dicts.length > 0){
+						return dicts[0].name
 					}else{
 						return value;
 					}
diff --git a/src/views/xm/core/xmPhase/XmPhaseOverview.vue b/src/views/xm/core/xmPhase/XmPhaseOverview.vue
index fedca95d..333bfcce 100644
--- a/src/views/xm/core/xmPhase/XmPhaseOverview.vue
+++ b/src/views/xm/core/xmPhase/XmPhaseOverview.vue
@@ -224,7 +224,7 @@
 
 <script>
 import util from '@/common/js/util';//全局公共库
-//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 import { mapGetters } from 'vuex'
 
 
diff --git a/src/views/xm/core/xmPhase/XmPhaseSelect.vue b/src/views/xm/core/xmPhase/XmPhaseSelect.vue
index d56b951d..16424855 100644
--- a/src/views/xm/core/xmPhase/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmPhase/XmPhaseSelect.vue
@@ -21,7 +21,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmPhase  } from '@/api/xm/core/xmPhase'; 
 
 	import {sn} from '@/common/js/sequence'
@@ -75,7 +75,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					xmPhaseStatus:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -440,10 +440,10 @@
 			}, 
 			/**end 自定义函数请在上面加**/ 
 			formateOption:function(itemCode,value){
-				if(this.options[itemCode]){
-					var options=this.options[itemCode].filter(i=>i.optionValue==value);
-					if(options && options.length > 0){
-						return options[0].optionName
+				if(this.dicts[itemCode]){
+					var dicts=this.dicts[itemCode].filter(i=>i.id==value);
+					if(dicts && dicts.length > 0){
+						return dicts[0].name
 					}else{
 						return value;
 					}
@@ -467,10 +467,8 @@
 					this.getXmPhases();
 				}
 				
-				listOption([
-					{categoryId:'all',itemCode:'xmPhaseStatus'} 
-				]).then(res=>{
-					this.options=res.data.data;
+				initSimpleDicts('all',['xmPhaseStatus']).then(res=>{
+					this.dicts=res.data.data;
 				})
       		}); 
 		}
diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue
index 954f3307..a18ab092 100644
--- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue
+++ b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateAdd.vue
@@ -11,12 +11,12 @@
 				</el-form-item> 
 				<el-form-item  label="计划类型" prop="planType"> 
 					<el-select v-model="addForm.planType">
-						<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+						<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item  label="任务类型" prop="taskType"> 
 					<el-select v-model="addForm.taskType">
-						<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+						<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="备注" prop="remark">
@@ -53,7 +53,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmPhaseTemplate } from '@/api/xm/core/xmPhaseTemplate';
 	import { mapGetters } from 'vuex'
 	
@@ -105,7 +105,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
@@ -208,12 +208,11 @@
 			if(this.selProjectTemplate){
 				this.addForm.projectId=this.selProjectTemplate.id
 				this.addForm.projectName=this.selProjectTemplate.projectName
-			}
-			/**在下面写其它函数***/
-			listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
-				this.options=res.data.data;
+			} 
+			
+			initSimpleDicts('all',['planType','taskType']).then(res=>{
+				this.dicts=res.data.data;
 			})
-
 			
 		}//end mounted
 	}
diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue
index 5216af4b..0ebc4cc9 100644
--- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue
+++ b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateEdit.vue
@@ -11,12 +11,12 @@
 				</el-form-item> 
 				<el-form-item  label="计划类型" prop="planType"> 
 					<el-select v-model="editForm.planType">
-						<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+						<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item  label="任务类型" prop="taskType"> 
 					<el-select v-model="editForm.taskType">
-						<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+						<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="备注" prop="remark">
@@ -53,7 +53,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import {  editXmPhaseTemplate } from '@/api/xm/core/xmPhaseTemplate';
 	import { mapGetters } from 'vuex'
 	
@@ -101,7 +101,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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: {
 					id: [
@@ -196,9 +196,10 @@
 		},
 		mounted() {
 			this.editForm=Object.assign(this.editForm, this.xmPhaseTemplate);  
-			/**在下面写其它函数***/
-			listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
-				this.options=res.data.data;
+			
+			
+			initSimpleDicts('all',['planType','taskType']).then(res=>{
+				this.dicts=res.data.data;
 			})
 
 			
diff --git a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue
index e254515c..a9a9e797 100644
--- a/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue
+++ b/src/views/xm/core/xmPhaseTemplate/XmPhaseTemplateMng.vue
@@ -83,7 +83,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import treeTool from '@/common/js/treeTool';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmPhase } from '@/api/xm/core/xmPhase'; 
 	import  XmProjectTemplateList from '../xmProjectTemplate/XmProjectTemplateList';//修改界面
 	import { mapGetters } from 'vuex'
@@ -129,7 +129,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{projectType:[]},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{projectType:[]},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmPhaseTemplate界面是否显示
 				//新增xmPhaseTemplate界面初始化数据
diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue
index ad5f3946..801646e6 100644
--- a/src/views/xm/core/xmProduct/XmProductAdd.vue
+++ b/src/views/xm/core/xmProduct/XmProductAdd.vue
@@ -54,7 +54,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProduct,createProductCode } from '@/api/xm/core/xmProduct';
 	import { mapGetters } from 'vuex'	
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
@@ -82,7 +82,7 @@
 	    },
 		data() {
 			return {
-				options:{xmProductPstatus:[]},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{xmProductPstatus:[]},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {  
 					productName: [
diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index 90251dbd..e65ada61 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -3,9 +3,9 @@
 		
 		<el-row class="padding-header">
 			<el-steps :active="calcXmProductPstatusStep" simple finish-status="success">
- 				<el-step  v-for="(i,index) in options['xmProductPstatus']" :title="i.optionName" :key="index" @click.native.stop="editForm.pstatus=i.optionValue">
+ 				<el-step  v-for="(i,index) in dicts['xmProductPstatus']" :title="i.name" :key="index" @click.native.stop="editForm.pstatus=i.id">
 					 <el-link slot="title" >
-						 {{i.optionName}} 
+						 {{i.name}} 
 					 </el-link>
 				</el-step> 
 			</el-steps>
@@ -22,7 +22,7 @@
 				
 				<el-form-item label="状态" prop="pstatus">
 					<el-select v-model="editForm.pstatus" placeholder="状态" >
-						<el-option v-for="(item,index) in options['xmProductPstatus']" :label="item.optionName" :value="item.optionValue" :key="index"></el-option>
+						<el-option v-for="(item,index) in dicts['xmProductPstatus']" :label="item.name" :value="item.id" :key="index"></el-option>
 					</el-select>
 				</el-form-item>  
 				<el-row>
@@ -64,7 +64,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { editXmProduct } from '@/api/xm/core/xmProduct';
 	import { mapGetters } from 'vuex'	
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
@@ -76,9 +76,9 @@
 		      'userInfo','roles'
 		    ]), 
 			calcXmProductPstatusStep(){
-				if(this.options['xmProductPstatus']){
-					var index=this.options['xmProductPstatus'].findIndex(i=>{
-						if(i.optionValue==this.editForm.pstatus){
+				if(this.dicts['xmProductPstatus']){
+					var index=this.dicts['xmProductPstatus'].findIndex(i=>{
+						if(i.id==this.editForm.pstatus){
 							return true;
 						}else{
 							return false;
@@ -103,7 +103,7 @@
 	    },
 		data() {
 			return {
-				options:{xmProductPstatus:[]},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{xmProductPstatus:[]},//下拉选择框的所有静态数据  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: {
 					id: [
@@ -199,9 +199,9 @@
 		mounted() {
 			
 			
-			listOption([{categoryId:'all',itemCode:'xmProductPstatus'}] ).then(res=>{
+			initSimpleDicts('all',['xmProductPstatus'] ).then(res=>{
 				if(res.data.tips.isOk){ 
-					this.options['xmProductPstatus']=res.data.data.xmProductPstatus   
+					this.dicts['xmProductPstatus']=res.data.data.xmProductPstatus   
 				}
 			});
 			this.editForm= this.xmProduct;   
diff --git a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
index 1ab7995b..e1887bc1 100644
--- a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
@@ -37,7 +37,7 @@
 						<xm-product-project-for-link v-if="xmProduct && showPanel=='projects'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-project-for-link>
 					</el-tab-pane>
 					<el-tab-pane label="需求" lazy name="menus" v-if="xmProduct && xmProduct.id">
-						<xm-menu-mng v-if="xmProduct && showPanel=='menus'"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"  :disabled-mng="false"></xm-menu-mng>
+						<xm-menu-mng v-if="xmProduct && showPanel=='menus'"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"  :disabled-mng="true"></xm-menu-mng>
 					</el-tab-pane>
 					<el-tab-pane label="任务" lazy name="tasks"  v-if="xmProduct && xmProduct.id">
 						<xm-task-mng v-if="xmProduct && showPanel=='tasks'" queryScope="task" ptype="0" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
@@ -59,7 +59,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import XmIterationMng from '../xmIteration/XmIterationMng.vue'
 	import XmMenuMng from '../xmMenu/XmMenuMng.vue'
 	import XmIterationStateShow from '../xmIterationState/XmIterationStateShow.vue'
diff --git a/src/views/xm/core/xmProduct/XmProductInfo.vue b/src/views/xm/core/xmProduct/XmProductInfo.vue
index e4e6f08a..95aa2134 100644
--- a/src/views/xm/core/xmProduct/XmProductInfo.vue
+++ b/src/views/xm/core/xmProduct/XmProductInfo.vue
@@ -25,18 +25,36 @@
 				<el-menu-item label="需求" index="需求">
 					 <span slot="title"><i class="el-icon-document"  ></i>需求</span>
 				</el-menu-item>
-				<el-menu-item   index="任务">
-					 <span slot="title"><i class="el-icon-s-operation"></i>任务</span>
-				</el-menu-item>
+				<el-submenu index="任务">
+					<template slot="title">任务</template>
+						<el-menu-item   index="产品任务">
+							<span slot="title"><i class="el-icon-view"></i>产品任务</span> 
+						</el-menu-item>
+						<el-menu-item index="项目任务">
+							<span slot="title"><i class="el-icon-video-camera"></i>项目任务</span>
+						</el-menu-item> 
+				</el-submenu > 
 				<el-menu-item  index="缺陷">
 					 <span slot="title"><i class="el-icon-question"  ></i>缺陷</span>
-				</el-menu-item>
-				<el-menu-item  index="团队">
-					 <span slot="title"><i class="el-icon-user-solid"  ></i>团队</span>
 				</el-menu-item> 
-				<el-menu-item index="计划">
-					<span slot="title"><i class="el-icon-odometer"></i>计划</span>
-				</el-menu-item>  
+				<el-submenu index="团队">
+					<template slot="title">团队</template>
+						<el-menu-item   index="产品团队">
+							<span slot="title"><i class="el-icon-solid"></i>产品团队</span> 
+						</el-menu-item>
+						<el-menu-item index="项目团队">
+							<span slot="title"><i class="el-icon-solid"></i>项目团队</span>
+						</el-menu-item> 
+				</el-submenu >
+				<el-submenu index="计划">
+					<template slot="title">计划</template>
+						<el-menu-item   index="产品计划">
+							<span slot="title"><i class="el-icon-view"></i>产品计划</span> 
+						</el-menu-item>
+						<el-menu-item index="项目计划">
+							<span slot="title"><i class="el-icon-video-camera"></i>项目计划</span>
+						</el-menu-item> 
+				</el-submenu >
 				<el-submenu index="财务" class="hidden-sm-and-down">
 					<template slot="title">财务</template> 
 						<el-menu-item   index="合同管理">
@@ -136,11 +154,15 @@
 			 <xm-iteration-for-project-complex  v-if="infotype=='迭代'" ref="xmIterationMng" :xm-product="xmProduct"></xm-iteration-for-project-complex>
  			 <xm-project-complex v-if="infotype=='项目'" ref="xmProjectForLink" :xm-product="xmProduct"></xm-project-complex> 
 			  <xm-menu-mng v-if="infotype=='需求'" :xm-product="xmProduct"></xm-menu-mng>
-			 <xm-task-mng v-if="infotype=='任务'" ptype="1" queryScope="task"  ref="xmTaskMng" :xm-product="xmProduct" key="task"></xm-task-mng>
+			  <xm-task-mng v-if="infotype=='产品任务'" ptype="1" queryScope="task"  ref="productXmTaskMng" :xm-product="xmProduct" key="productXmTaskMng"></xm-task-mng>
+			 <xm-task-mng v-if="infotype=='项目任务'" ptype="0" queryScope="task"  ref="projectXmTaskMng" :xm-product="xmProduct" key="projectXmTaskMng"></xm-task-mng>
 			  <xm-question v-if="infotype=='缺陷'" :qtype="'bug'" :xm-product='xmProduct' ref="xmQuestion"></xm-question>
-			  <xm-group-mng v-if="infotype=='团队'" :xm-product="xmProduct"></xm-group-mng>
+			  <xm-group-mng v-if="infotype=='项目团队'" pgClass="0" :xm-product="xmProduct" key="projectGroup"></xm-group-mng>
+			  <xm-group-mng v-if="infotype=='产品团队'" pgClass="1" :xm-product="xmProduct" key="productGroup"></xm-group-mng>
 			  <xm-file-mng v-if="infotype=='文档'" :xm-product="xmProduct"></xm-file-mng>
-			  <xm-task-mng v-if="infotype=='计划'" ref="productPlan" ptype="1" queryScope="planTask"  :xm-product="xmProduct" key="productPlan"></xm-task-mng> 
+			  <xm-task-mng v-if="infotype=='产品计划'" ref="productPlan" ptype="1" queryScope="planTask"  :xm-product="xmProduct" key="productPlan"></xm-task-mng> 
+
+			  <xm-task-mng v-if="infotype=='项目计划'" ref="projectPlan" ptype="0" queryScope="planTask"  :xm-product="xmProduct" key="projectPlan"></xm-task-mng> 
 			  <!--<xm-phase-for-product v-if="infotype=='计划'" ref="xmPhaseMng" :xm-product="xmProduct" ></xm-phase-for-product> -->
 			  <xm-test-case-exec-mng v-if="infotype=='测试计划'" :visible="infotype=='测试计划'"  :xm-product='xmProduct' ref="xmQuestion"></xm-test-case-exec-mng>
 			<xm-menu-with-plan v-if="infotype=='需求监控'" ref="xmMenuWithPlan" :xm-product="xmProduct"></xm-menu-with-plan>
@@ -162,7 +184,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject,editStatus , delXmProject, batchDelXmProject } from '@/api/xm/core/xmProject';
 	import  XmProjectAdd from '../xmProject/XmProjectAdd';//新增界面
 	import  XmProjectEdit from '../xmProject/XmProjectEdit';//修改界面
@@ -365,13 +387,13 @@ import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
               } else {
                 return v[j];
               }
-              const options = this.$refs.xmMenuWithPlan.options;
-              if(options[key]==undefined || options[key]==null || options[key].length==0   ){
+              const dicts = this.$refs.xmMenuWithPlan.dicts;
+              if(dicts[key]==undefined || dicts[key]==null || dicts[key].length==0   ){
                 return v[j];
               }
-              var rowData=options[key].filter(i=>i.optionValue==v[j])
+              var rowData=dicts[key].filter(i=>i.id==v[j])
               if(rowData.length>0){
-                return rowData[0].optionName
+                return rowData[0].name
               }else{
                 return v[j];
               }
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 9dc1ebb2..137daeae 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -12,6 +12,10 @@
 						<el-option label="我相关的产品" value="compete"></el-option>
 						<el-option label="按产品编号精确查找" value="productId"></el-option>
 					</el-select>
+					
+					<el-select  v-model="filters.pstatus" clearable placeholder="状态">
+						<el-option v-for="(item,index) in dicts['xmProductPstatus']" :value="item.id" :label="item.name" :key="index"></el-option> 
+					</el-select>  
 					<el-input v-if="filters.queryScope=='productId'" style="width:20%;"  v-model="filters.id"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
 					</el-input>
 					<el-input v-model="filters.key" style="width: 20%;" placeholder="名称查询" clearable>   
@@ -155,6 +159,8 @@
 						
 						<el-table-column type="index" width="60"> 
 						</el-table-column>
+						<el-table-column prop="code" label="产品代号" min-width="100" sortable > 
+						</el-table-column>
 						<el-table-column prop="productName" label="产品名称" min-width="200" sortable >
 							<template slot-scope="scope" >
 								<el-link id="guider-three" type="primary" @click="intoInfo(scope.row)">{{scope.row.productName}}</el-link>
@@ -177,6 +183,33 @@
 							</template>
 						</el-table-column>
 						
+						<el-table-column prop="menuCnt" label="需求数" width="120" sortable show-overflow-tooltip>
+							<template slot-scope="scope"> 						
+								<span title=" 已完成 / 总需求数">{{scope.row.menuCnt>0?scope.row.menuFinishCnt+'&nbsp;/&nbsp;'+scope.row.menuCnt:''}}</span>
+							</template>
+						</el-table-column>
+						
+						<el-table-column prop="projectCnt" label="项目数" width="120" sortable show-overflow-tooltip>
+							<template slot-scope="scope"> 						
+								<span title="实际发生的关联项目数">{{scope.row.projectCnt>0? scope.row.projectCnt:''}}</span>
+							</template>
+						</el-table-column> 
+						<el-table-column prop="iterationCnt" label="迭代数" width="120" sortable show-overflow-tooltip>
+							<template slot-scope="scope"> 						
+								<span title="实际发生的关联迭代数">{{scope.row.iterationCnt>0? scope.row.iterationCnt:''}}</span>
+							</template>
+						</el-table-column>
+						<el-table-column prop="taskCnt" label="任务数" width="120" sortable show-overflow-tooltip>
+							<template slot-scope="scope"> 						
+								<span title=" 已完成 / 总任务数">{{scope.row.taskCnt>0?scope.row.finishTaskCnt+'&nbsp;/&nbsp;'+scope.row.taskCnt:''}}</span>
+							</template>
+						</el-table-column>
+						
+						<el-table-column prop="bugCnt" label="缺陷数" width="120" sortable show-overflow-tooltip>
+							<template slot-scope="scope"> 						
+								<span title=" 已关闭 / 总缺陷数 ">{{scope.row.bugCnt>0?scope.row.closedBugs+'&nbsp;/&nbsp;'+scope.row.bugCnt:''}}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="工作量(人时)" width="200">
 							<el-table-column prop="planWorkload" label="预计" width="100"  show-overflow-tooltip sortable></el-table-column>
 							<el-table-column prop="actWorkload" label="实际" width="100"  show-overflow-tooltip sortable></el-table-column>
@@ -185,7 +218,7 @@
 						<el-table-column  label="操作" width="200" fixed="right">
 							<template slot-scope="scope">
 											<el-button id="guider-five" type="text"  title="通过复制创建新的产品" @click="onCopyToBtnClick(scope.row)" :disabled="load.add" v-loading="load.add">复制</el-button>
-											<el-button  type="text" @click="showProductState(scope.row)" icon="el-icon-s-data">报告</el-button>  
+											<el-button  type="text" @click="intoInfo(scope.row)" icon="el-icon-s-data">视图</el-button>  
 											<el-button  type="text" v-loading="load.del" @click="handleDel(scope.row)" :disabled="load.del==true" icon="el-icon-delete">删除</el-button> 
 							</template>
 						</el-table-column>
@@ -265,7 +298,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct,copyTo,createProductCode } from '@/api/xm/core/xmProduct';
 	import { addXmIterationLink,delXmIterationLink } from '@/api/xm/core/xmIterationLink';
 	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState';
@@ -308,6 +341,7 @@
 					queryScope:'compete',//compete/branchId/''/productId
 					id:'',//产品编号
 					pmUser:null,//产品经理
+					pstatus:'',
 				},
 				xmProducts: [],//查询结果
 				pageInfo:{//分页数据
@@ -320,7 +354,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					xmProductPstatus:[]
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
@@ -443,6 +477,9 @@
 				if(this.filters.pmUser){
 					params.pmUserid=this.filters.pmUser.userid
 				}
+				if(this.filters.pstatus){
+					params.pstatus=this.filters.pstatus
+				}
 				this.load.list = true;
 				listXmProductWithState(params).then((res) => {
 					var tips=res.data.tips;
@@ -656,9 +693,9 @@
 				})
 			},
 			formatPstatus(row, column, cellValue, index){
-				var item=this.options.xmProductPstatus.find(i=>i.optionValue==cellValue)
+				var item=this.dicts.xmProductPstatus.find(i=>i.id==cellValue)
 				if(item){
-					return item.optionName
+					return item.name
 				}else{
 					return cellValue;
 				}
@@ -691,9 +728,9 @@
 		},
 		mounted() {
 			
-			listOption([{categoryId:'all',itemCode:'xmProductPstatus'}] ).then(res=>{
+			initSimpleDicts('all',['xmProductPstatus'] ).then(res=>{
 				if(res.data.tips.isOk){ 
-					this.options['xmProductPstatus']=res.data.data.xmProductPstatus   
+					this.dicts['xmProductPstatus']=res.data.data.xmProductPstatus   
 				}
 			});
 			this.$nextTick(() => { 
diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue
index 19414cde..387cdfab 100644
--- a/src/views/xm/core/xmProduct/XmProductOverview.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverview.vue
@@ -6,7 +6,7 @@
           <div>
             <el-row style="padding:10px"> 
               <el-steps :active="calcXmProductPstatusStep" align-center finish-status="success">
-                <el-step  v-for="(i,index) in options['xmProductPstatus']" :title="i.optionName" :key="index" >
+                <el-step  v-for="(i,index) in dicts['xmProductPstatus']" :title="i.name" :key="index" >
                    
                 </el-step> 
               </el-steps>
@@ -242,7 +242,7 @@
 import util from "@/common/js/util"; // 全局公共库
 import { mapGetters } from "vuex";
 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 
 export default {
   computed: {
@@ -309,9 +309,9 @@ export default {
       return this.xmProduct;
     },
     calcXmProductPstatusStep(){
-				if(this.options['xmProductPstatus']){
-					var index=this.options['xmProductPstatus'].findIndex(i=>{
-						if(i.optionValue==this.xmProductCpd.pstatus){
+				if(this.dicts['xmProductPstatus']){
+					var index=this.dicts['xmProductPstatus'].findIndex(i=>{
+						if(i.id==this.xmProductCpd.pstatus){
 							return true;
 						}else{
 							return false;
@@ -337,7 +337,7 @@ export default {
   data() {
     return {
       isActive: true,
-      options:{
+      dicts:{
         xmProductPstatus:[]
       },
       maxTableHeight:300,
@@ -598,9 +598,9 @@ export default {
 
   mounted() {
 			
-			listOption([{categoryId:'all',itemCode:'xmProductPstatus'}] ).then(res=>{
+			initSimpleDicts('all',['xmProductPstatus'] ).then(res=>{
 				if(res.data.tips.isOk){ 
-					this.options['xmProductPstatus']=res.data.data.xmProductPstatus   
+					this.dicts['xmProductPstatus']=res.data.data.xmProductPstatus   
 				}
 			});
     this.$nextTick(() => {
diff --git a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
index 17ca3e22..a9175f86 100644
--- a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
@@ -13,11 +13,26 @@
         <el-menu-item index="productProjectLink"> 
           <span slot="title">配置可见项目</span>
         </el-menu-item> 
+        <el-menu-item index="productCalc"> 
+          <span slot="title">执行数据汇总计划</span>
+        </el-menu-item> 
       </el-menu>
        <xm-product-overview  v-if="showPanelName=='overview'" :xm-product="xmProduct"></xm-product-overview>
         <xm-product-edit  v-if="showPanelName=='detail'" :xm-product="xmProduct"></xm-product-edit>
         <xm-iteration-link-for-product v-if="showPanelName=='iterationProductLink'" :xm-product="xmProduct"></xm-iteration-link-for-product>
         <xm-product-project-link-mng  v-if="showPanelName=='productProjectLink'" :xm-product="xmProduct"></xm-product-project-link-mng>
+        <div v-if="showPanelName=='productCalc'" class="padding">
+          <el-row>
+            <el-button type="primary" @click="loadTasksToXmProductState" v-loading="load.calcProduct">计算产品汇总数据</el-button>
+            <br>
+              <font color="red" style="font-size:10px;">将从项目任务及产品任务中汇总进度、预算工作量、实际工作量、预算金额、实际金额、缺陷数、需求数等数据到产品统计表</font>
+          </el-row>
+          <el-row>
+            <el-button  type="primary" @click="loadTasksToXmMenuState"  v-loading="load.calcMenu">计算所有需求数据</el-button>
+            <br>
+              <font color="red"  style="font-size:10px;">将从项目任务汇总进度、预算工作量、实际工作量、预算金额、实际金额等数据到需求统计表</font>
+          </el-row>
+        </div>
    </section>
 </template>
 
@@ -28,8 +43,9 @@ import { mapGetters } from "vuex";
 import XmProductOverview from './XmProductOverview.vue';
 import XmProductEdit from './XmProductEdit.vue';
 import XmIterationLinkForProduct from '../xmIterationLink/XmIterationLinkForProduct.vue';
-import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue';
-
+import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue'; 
+	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState';
+	import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState';
 
 export default {
   components: { XmProductOverview, XmProductEdit, XmIterationLinkForProduct, XmProductProjectLinkMng },
@@ -42,12 +58,33 @@ export default {
   },
   data() {
     return {
-      showPanelName:'overview'
+      showPanelName:'overview',
+      load:{calcProduct:false,calcMenu:false}
     };
   },
 
-  methods:{
+  methods:{ 
+			loadTasksToXmProductState: function () {
+				this.load.calcProduct=true;
 
+				let params = { productId: this.xmProduct.id };
+				loadTasksToXmProductState(params).then((res) => {
+					this.load.calcProduct=false;
+					var tips=res.data.tips; 
+					this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
+				}).catch( err  => this.load.calcProduct=false );
+			},
+      
+			 
+			loadTasksToXmMenuState: function () {  
+				this.load.calcMenu=true; 
+				let params = { productId: this.xmProduct.id };
+				loadTasksToXmMenuState(params).then((res) => {
+					this.load.calcMenu=false;
+					var tips=res.data.tips; 
+					this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
+				}).catch( err  => this.load.calcMenu=false ); 
+			},
     onMenuToolBarSelect(menuIndex){
       this.showPanelName=menuIndex;
     }
diff --git a/src/views/xm/core/xmProduct/XmProductProjectForLink.vue b/src/views/xm/core/xmProduct/XmProductProjectForLink.vue
index 0fdac62e..6863c3f3 100644
--- a/src/views/xm/core/xmProduct/XmProductProjectForLink.vue
+++ b/src/views/xm/core/xmProduct/XmProductProjectForLink.vue
@@ -17,7 +17,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import config from "@/common/config"; //全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject,  } from '@/api/xm/core/xmProject';  
 	import { mapGetters } from 'vuex'  
 	import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
diff --git a/src/views/xm/core/xmProduct/XmProductRecycle.vue b/src/views/xm/core/xmProduct/XmProductRecycle.vue
index 25ccc2dd..c7c73cdd 100644
--- a/src/views/xm/core/xmProduct/XmProductRecycle.vue
+++ b/src/views/xm/core/xmProduct/XmProductRecycle.vue
@@ -130,7 +130,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProductWithState,unDelXmProduct } from '@/api/xm/core/xmProduct';  
 	import { mapGetters } from 'vuex' 
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
@@ -175,7 +175,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProduct界面是否显示
 				//新增xmProduct界面初始化数据
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 22f1277d..a8b06604 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -8,12 +8,12 @@
 				<el-table-column  v-if="isSelectProduct==true"  label="产品代号" prop="code" min-width="100" show-overflow-tooltip >  </el-table-column>
 				  <el-table-column prop="productName"  label="产品名称"    show-overflow-tooltip> 
 					 <template slot="header" slot-scope="scope"> 
-						 产品名称 <el-button type="text" @click="clearSelect">清空所选</el-button>
+						 产品名称 <el-button type="text" @click="clearSelect">清空所选</el-button>&nbsp;<el-button type="text" @click="close">关闭</el-button>
 						 <el-popover
 							placement="top-start"
 							title=""
 							width="400"
-							trigger="click" >
+							trigger="hover" >
 							<el-row>
 								<el-col :span="24" style="padding-top:5px;">
 									<font class="more-label-font">
@@ -91,7 +91,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProductWithState } from '@/api/xm/core/xmProduct';  
 	import { mapGetters } from 'vuex' 
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
@@ -136,7 +136,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProduct界面是否显示
 				//新增xmProduct界面初始化数据
@@ -315,6 +315,9 @@
 			clearSelect(){
 				this.$refs.table.setCurrentRow();
 				this.$emit("clear-select");
+			},
+			close(){
+				this.$emit("close");
 			}
 		},//end methods
 		components: {  
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index dadeca7a..2a44fa23 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -121,7 +121,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProduct,listXmProductWithState, delXmProduct, batchDelXmProduct,copyTo,createProductCode } from '@/api/xm/core/xmProduct';
 	import { addXmIterationLink,delXmIterationLink } from '@/api/xm/core/xmIterationLink';
 	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState';
@@ -162,7 +162,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
 				addFormVisible: false,//新增xmProduct界面是否显示
 				//新增xmProduct界面初始化数据
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue
index 5e33648c..eb9b440f 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkAdd.vue
@@ -34,7 +34,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProductProjectLink } from '@/api/xm/core/xmProductProjectLink';
 	import { mapGetters } from 'vuex'
 	
@@ -57,7 +57,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					projectId: [
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue
index b62897d6..80812703 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkEdit.vue
@@ -34,7 +34,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProductProjectLink } from '@/api/xm/core/xmProductProjectLink';
 	import { mapGetters } from 'vuex'
 	
@@ -57,7 +57,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					projectId: [
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
index 43f8c592..0eed9da6 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
@@ -35,7 +35,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProductProjectLink,addXmProductProjectLink, delXmProductProjectLink, batchDelXmProductProjectLink } from '@/api/xm/core/xmProductProjectLink';
 	import  XmProductProjectLinkAdd from './XmProductProjectLinkAdd';//新增界面
 	import  XmProductProjectLinkEdit from './XmProductProjectLinkEdit';//修改界面
@@ -74,7 +74,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -279,9 +279,9 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
                 this.maxTableHeight =  util.calcTableMaxHeight(".el-table")
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmProductState/XmProductStateAdd.vue b/src/views/xm/core/xmProductState/XmProductStateAdd.vue
index 176c5e8c..1dc26abf 100644
--- a/src/views/xm/core/xmProductState/XmProductStateAdd.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateAdd.vue
@@ -124,7 +124,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProductState } from '@/api/xm/core/xmProductState';
 	import { mapGetters } from 'vuex'
 	
@@ -147,7 +147,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProductState/XmProductStateEdit.vue b/src/views/xm/core/xmProductState/XmProductStateEdit.vue
index 896f2776..26a22e52 100644
--- a/src/views/xm/core/xmProductState/XmProductStateEdit.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateEdit.vue
@@ -124,7 +124,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProductState } from '@/api/xm/core/xmProductState';
 	import { mapGetters } from 'vuex'
 	
@@ -147,7 +147,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue
index 10b6b370..486a0396 100644
--- a/src/views/xm/core/xmProductState/XmProductStateMng.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue
@@ -41,7 +41,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProductState, delXmProductState, batchDelXmProductState } from '@/api/xm/core/xmProductState'; 
 	import { mapGetters } from 'vuex'
 	
@@ -68,7 +68,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -231,9 +231,9 @@
 				this.getXmProductStates();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
index f8b21c0e..dfd2986a 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
@@ -25,7 +25,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProductTemplate } from '@/api/xm/core/xmProductTemplate';
 	import { mapGetters } from 'vuex'
 	
@@ -48,7 +48,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
index 0f5135a9..97f3d8d1 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
@@ -25,7 +25,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProductTemplate } from '@/api/xm/core/xmProductTemplate';
 	import { mapGetters } from 'vuex'
 	
@@ -48,7 +48,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
index 7cccb37a..0b7c457a 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
@@ -49,7 +49,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProduct } from '@/api/xm/core/xmProduct';
 	import  XmProductTemplateAdd from './XmProductTemplateAdd';//新增界面
 	import  XmProductTemplateEdit from './XmProductTemplateEdit';//修改界面
@@ -78,7 +78,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProductTemplate界面是否显示
 				//新增xmProductTemplate界面初始化数据
diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue
index 098b54a2..8efac035 100644
--- a/src/views/xm/core/xmProject/XmProjectAdd.vue
+++ b/src/views/xm/core/xmProject/XmProjectAdd.vue
@@ -16,13 +16,13 @@
 					</el-form-item>    
 					<el-form-item label="项目属性" prop="xmType"> 
 						<el-select v-model="addForm.xmType">
-							<el-option v-for="(i,index) in options['projectType']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option> 
+							<el-option v-for="(i,index) in dicts['projectType']" :label="i.name" :value="i.id" :key="index"></el-option> 
 						</el-select>   
 						<el-select v-model="addForm.urgent">
-							<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option> 
+							<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="index"></el-option> 
 						</el-select>    
 						<el-select v-model="addForm.priority">
-							<el-option v-for="(i,index) in options['priority']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option> 
+							<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index"></el-option> 
 						</el-select> 
 					</el-form-item>   
 					<el-form-item label="预算控制"> 
@@ -167,7 +167,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import {sn} from '@/common/js/sequence';//全局公共库
 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { addXmProject,createProjectCode } from '@/api/xm/core/xmProject'; 
 	import { mapGetters } from 'vuex';  
 	
@@ -304,7 +304,7 @@
 				filters: {
 					ids: [],
 				},
-				options:{ 
+				dicts:{ 
 					projectType:[],
 					urgencyLevel:[],
 					priority:[],
@@ -504,20 +504,11 @@
 		},
 		mounted() {  
 			
-			this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el);
-				listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
-					if(res.data.tips.isOk){ 
-						this.options['projectType']=res.data.data.projectType
-						this.options['urgencyLevel']=res.data.data.urgencyLevel
-						this.options['priority']=res.data.data.priority
-						this.options['projectStatus']=res.data.data.projectStatus
-
-						this.addForm.xmType=this.options['projectType'][0].optionValue
-						this.addForm.urgent=this.options['urgencyLevel'][0].optionValue
-						this.addForm.priority=this.options['priority'][0].optionValue
-						//this.addForm.projectStatus=this.options['projectStatus'][0].optionValue
-					}
-				});
+			this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el); 
+			
+			initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+				this.dicts=res.data.data;
+			})
 			
 		}
 	}
diff --git a/src/views/xm/core/xmProject/XmProjectAssess.vue b/src/views/xm/core/xmProject/XmProjectAssess.vue
index a52c15a0..c3217175 100644
--- a/src/views/xm/core/xmProject/XmProjectAssess.vue
+++ b/src/views/xm/core/xmProject/XmProjectAssess.vue
@@ -47,7 +47,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { mapGetters } from 'vuex';
 	import VueEditor from '@/components/Tinymce/index';
 	import { editAssess, listXmProject, delXmProject, batchDelXmProject } from '@/api/xm/core/xmProject';
diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
index 76c4f22d..d97cdc54 100644
--- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
@@ -103,7 +103,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { mapGetters } from 'vuex';
 	import { editBudget } from '@/api/xm/core/xmProject';
 	import { listSumXmProjectMBudgetCostUser } from '@/api/xm/core/xmProjectMBudgetCostUser';
diff --git a/src/views/xm/core/xmProject/XmProjectComplex.vue b/src/views/xm/core/xmProject/XmProjectComplex.vue
index bbd06ec8..941c8b2f 100644
--- a/src/views/xm/core/xmProject/XmProjectComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectComplex.vue
@@ -64,7 +64,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import XmIterationMng from '../xmIteration/XmIterationMng.vue'
 	import XmMenuMng from '../xmMenu/XmMenuMng.vue'
 	import XmIterationStateShow from '../xmIterationState/XmIterationStateShow.vue'
diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue
index cfe58c78..3fdb17fc 100644
--- a/src/views/xm/core/xmProject/XmProjectCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectCost.vue
@@ -101,7 +101,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { mapGetters } from 'vuex';
 	import { editBudget } from '@/api/xm/core/xmProject';
 	import { listSumXmProjectMCostUser } from '@/api/xm/core/xmProjectMCostUser';
diff --git a/src/views/xm/core/xmProject/XmProjectDetail.vue b/src/views/xm/core/xmProject/XmProjectDetail.vue
index 3f23f294..b076c94d 100644
--- a/src/views/xm/core/xmProject/XmProjectDetail.vue
+++ b/src/views/xm/core/xmProject/XmProjectDetail.vue
@@ -9,7 +9,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { mapGetters } from 'vuex'
 	import { listXmProject } from '@/api/xm/core/xmProject';
 	import  XmProjectEdit from './XmProjectEdit';//修改界面
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 5bf2bb27..d1fdcc29 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -2,65 +2,73 @@
 	<section class="page-container padding border">
 		<el-row class="padding-bottom">
 			<el-steps :active="calcProjectStatusStep" simple finish-status="success">
- 				<el-step  v-for="(i,index) in options['projectStatus']" :title="i.optionName" :key="index" @click.native.stop="editForm.status=i.optionValue">
-					 <el-link slot="title" @click.native.stop="editForm.status=i.optionValue">
-						 {{i.optionName}} 
+ 				<el-step  v-for="(i,index) in dicts['projectStatus']" :title="i.name" :key="index" @click.native.stop="editForm.status=i.id">
+					 <el-link slot="title" @click.native.stop="editForm.status=i.id">
+						 {{i.name}} 
 					 </el-link>
 				</el-step> 
 			</el-steps>
 		</el-row>
 		<el-row class="page-main" ref="table" :style="{overflowX:'auto',height:maxTableHeight+'px'}">  
-				<el-form :model="editForm"  label-width="150px" :rules="editFormRules" ref="editForm" class="editForm">   
-						<el-form-item label="项目编号|名称" prop="name">
-							<el-input v-model="editForm.code" placeholder="项目编号，不可为空" style="width:20%;" ></el-input><el-input style="width:80%;" v-model="editForm.name" placeholder="项目名称" ></el-input>
-						</el-form-item>  
-						<el-form-item label="项目属性" prop="xmType"> 
-							<el-select v-model="editForm.xmType">
-								<el-option v-for="(i,index) in options['projectType']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option> 
-							</el-select>   
-							<el-select v-model="editForm.urgent">
-								<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option> 
-							</el-select>    
-							<el-select v-model="editForm.priority">
-								<el-option v-for="(i,index) in options['priority']" :label="i.optionName" :value="i.optionValue" :key="index"></el-option> 
-							</el-select> 
-						</el-form-item>   
-						<el-form-item label="预算控制"> 
-							<el-form-item prop="budgetCtrl">
-								<el-checkbox  v-model="editForm.budgetCtrl"  true-label="1" false-label="0" >总预算控制</el-checkbox>  
-								<font style="font-size:12px;" color="red">项目计划总预算不能大于项目总预算</font> 
+				<el-form :model="editForm"  label-width="150px" :rules="editFormRules" ref="editForm" class="editForm">
+
+					<el-collapse value="1" accordion>
+						<el-collapse-item title="基本信息" name="1">
+							<el-form-item label="项目编号|名称" prop="name">
+								<el-input v-model="editForm.code" placeholder="项目编号，不可为空" style="width:20%;" ></el-input><el-input style="width:80%;" v-model="editForm.name" placeholder="项目名称" ></el-input>
 							</el-form-item>  
-							<el-form-item label="" prop="phaseBudgetCtrl">
-								<el-checkbox  v-model="editForm.phaseBudgetCtrl"  true-label="1" false-label="0" >项目计划预算控制</el-checkbox> 
-								<font style="font-size:12px;" color="red">下级计划总预算不能大于上级计划总预算；每条计划的预算金额必须大于其关联任务的预算合计。</font> 
-							</el-form-item> 
-							<el-form-item label="" prop="phaseActCtrl">
-								<el-checkbox  v-model="editForm.phaseActCtrl"  true-label="1" false-label="0" >实际金额控制</el-checkbox>  
-								<font style="font-size:12px;" color="red">每条计划实际金额不能大于预算金额;每条计划的预算金额必须大于其关联的任务的实际金额合计。</font> 
+							<el-form-item label="项目属性" prop="xmType"> 
+								<el-select v-model="editForm.xmType">
+									<el-option v-for="(i,index) in dicts['projectType']" :label="i.name" :value="i.id" :key="index"></el-option> 
+								</el-select>   
+								<el-select v-model="editForm.urgent">
+									<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="index"></el-option> 
+								</el-select>    
+								<el-select v-model="editForm.priority">
+									<el-option v-for="(i,index) in dicts['priority']" :label="i.name" :value="i.id" :key="index"></el-option> 
+								</el-select> 
+							</el-form-item>   
+							<el-form-item label="预算控制"> 
+								<el-form-item prop="budgetCtrl">
+									<el-checkbox  v-model="editForm.budgetCtrl"  true-label="1" false-label="0" >总预算控制</el-checkbox>  
+									<font style="font-size:12px;" color="red">项目计划总预算不能大于项目总预算</font> 
+								</el-form-item>  
+								<el-form-item label="" prop="phaseBudgetCtrl">
+									<el-checkbox  v-model="editForm.phaseBudgetCtrl"  true-label="1" false-label="0" >项目计划预算控制</el-checkbox> 
+									<font style="font-size:12px;" color="red">下级计划总预算不能大于上级计划总预算；每条计划的预算金额必须大于其关联任务的预算合计。</font> 
+								</el-form-item> 
+								<el-form-item label="" prop="phaseActCtrl">
+									<el-checkbox  v-model="editForm.phaseActCtrl"  true-label="1" false-label="0" >实际金额控制</el-checkbox>  
+									<font style="font-size:12px;" color="red">每条计划实际金额不能大于预算金额;每条计划的预算金额必须大于其关联的任务的实际金额合计。</font> 
+								</el-form-item> 
+							
+							</el-form-item>	  
+							<el-row>
+								<el-col :span="8">
+							<el-form-item label="总控"  prop="admUserid">
+								<el-input readonly v-model="editForm.admUsername" @click.native="showUserVisible('admUserid')"></el-input>
+								<font style="font-size:12px;" color="red"></font> 
+							</el-form-item>  
+								</el-col>
+								<el-col :span="8">
+							<el-form-item label="项目经理" prop="pmUserid"> 
+								<el-input readonly v-model="editForm.pmUsername" @click.native="showUserVisible('pmUserid')"></el-input>
+								<font style="font-size:12px;" color="red"></font> 
 							</el-form-item> 
-						
-						</el-form-item>	  
-						<el-row>
-							<el-col :span="8">
-						<el-form-item label="总控"  prop="admUserid">
-							<el-input readonly v-model="editForm.admUsername" @click.native="showUserVisible('admUserid')"></el-input>
-							<font style="font-size:12px;" color="red"></font> 
-						</el-form-item>  
-							</el-col>
-							<el-col :span="8">
-						<el-form-item label="项目经理" prop="pmUserid"> 
-							<el-input readonly v-model="editForm.pmUsername" @click.native="showUserVisible('pmUserid')"></el-input>
-							<font style="font-size:12px;" color="red"></font> 
-						</el-form-item> 
-							</el-col>
-							<el-col :span="8">
-						<el-form-item label="副经理、助理" prop="assUserid"> 
-							<el-input readonly v-model="editForm.assUsername" @click.native="showUserVisible('assUserid')"></el-input>
-							<font style="font-size:12px;" color="red"></font> 
-						</el-form-item>  
-							</el-col>
-						</el-row>
-						<el-form-item label="工期及成本预估" >  
+								</el-col>
+								<el-col :span="8">
+							<el-form-item label="副经理、助理" prop="assUserid"> 
+								<el-input readonly v-model="editForm.assUsername" @click.native="showUserVisible('assUserid')"></el-input>
+								<font style="font-size:12px;" color="red"></font> 
+							</el-form-item>  
+								</el-col>
+							</el-row> 
+							<el-form-item label="项目描述" prop="description">
+								<el-input type="textarea" :rows="6" v-model="editForm.description" placeholder="项目描述" ></el-input>
+							</el-form-item>    
+						</el-collapse-item>
+						<el-collapse-item title="工期及成本预估" name="2">
+							<el-form-item label="工期及成本预估" >  
 							<el-row>
 								<el-date-picker
 									v-model="dateRanger"
@@ -75,7 +83,7 @@
 									:default-time="['00:00:00','23:59:59']"
 									:picker-options="pickerOptions"
 								></el-date-picker>    
-								<el-input  style="width:150px;" type="number" v-model="editForm.planWorkingHours" :precision="2" :step="8" :min="0" placeholder="预计工时"></el-input><el-tag>参考工时{{autoParams.weekday*8}}小时,工作日{{autoParams.weekday}}天</el-tag>  
+								<el-input  style="width:150px;" type="number" v-model="editForm.planWorkingHours" :precision="2" :step="8" :min="0" placeholder="预计工时"></el-input>小时 &nbsp;&nbsp;<el-tag>参考工时{{autoParams.weekday*8}}小时,工作日{{autoParams.weekday}}天</el-tag>  
 								
 							</el-row>
 							<el-divider></el-divider>
@@ -137,10 +145,9 @@
 								考核标准毛利率：<el-input style="width:150px;" type="number" v-model="editForm.budgetMarginRate" :precision="2" :step="0.01" :min="0" :max="0.99" placeholder="毛利率"></el-input> 
 								当前毛利率为：<el-tag>{{toFixed(parseFloat2(autoParams.currentBudgetMarginRate)*100,2)}}%</el-tag>
  							</el-row>  
-						</el-form-item>  
-						<el-form-item label="项目描述" prop="description">
-							<el-input type="textarea" :rows="6" v-model="editForm.description" placeholder="项目描述" ></el-input>
-						</el-form-item>     
+						</el-form-item>   
+						</el-collapse-item> 
+					</el-collapse>    
 				</el-form>    
 		</el-row>
 		<el-row>  
@@ -167,7 +174,7 @@
 	import {sn} from '@/common/js/sequence';//全局公共库
 
 	import config from "@/common/config"; //全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProject,getDefOptions } from '@/api/xm/core/xmProject'; 
 	import { uploadBase64 } from '@/api/mdp/arc/image'; 
 	
@@ -276,9 +283,9 @@
 				 return this.editForm.totalReceivables
 			},
 			calcProjectStatusStep(){ 
-				if(this.options['projectStatus'] && this.editForm){
-					var index=this.options['projectStatus'].findIndex(i=>{
-						if(i.optionValue==this.editForm.status){
+				if(this.dicts['projectStatus'] && this.editForm){
+					var index=this.dicts['projectStatus'].findIndex(i=>{
+						if(i.id==this.editForm.status){
 							return true;
 						}else{
 							return false;
@@ -366,7 +373,7 @@
 				filters: {
 					ids: [],
 				},
-				options: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts: getDefOptions(),//下拉选择框的所有静态数据 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: [{
@@ -738,16 +745,11 @@
 			this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el);
 				 this.editForm=Object.assign({},this.selProject);
 				 this.dateRanger=[this.editForm.startTime,this.editForm.endTime]
-				listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
-					if(res.data.tips.isOk){ 
-						
-						this.options['projectType']=res.data.data.projectType
-						this.options['urgencyLevel']=res.data.data.urgencyLevel
-						this.options['priority']=res.data.data.priority
-						this.options['projectStatus']=res.data.data.projectStatus 
-						//this.editForm.projectStatus=this.options['projectStatus'][0].optionValue
-					}
-				});
+				
+			
+				initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+					this.dicts=res.data.data;
+				})
 			
 		}
 	}
diff --git a/src/views/xm/core/xmProject/XmProjectForLink.vue b/src/views/xm/core/xmProject/XmProjectForLink.vue
index fed49190..da814bbd 100644
--- a/src/views/xm/core/xmProject/XmProjectForLink.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLink.vue
@@ -39,7 +39,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import config from "@/common/config"; //全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject,  } from '@/api/xm/core/xmProject';  
 	import { mapGetters } from 'vuex' 
  	import { delXmProductProjectLink, addXmProductProjectLink,batchDelXmProductProjectLink } from '@/api/xm/core/xmProductProjectLink';
@@ -78,7 +78,7 @@ import XmProjectList from './XmProjectList.vue';
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index c9ab6224..73dfeadf 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -134,7 +134,7 @@
 		  	<xm-project-overview-complex v-if="infotype=='项目概览'" :sel-project="selProject" @submit="afterEditSubmit"></xm-project-overview-complex>  
 			 <xm-iteration-for-project-complex  v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject"></xm-iteration-for-project-complex>
  			 <xm-product-for-project-complex  v-if="infotype=='产品'" ref="xmProductComplex" :sel-project="selProject"></xm-product-for-project-complex>
-			 <xm-menu-mng v-if="infotype=='需求'" :sel-project="selProject" :disabled-mng="false"></xm-menu-mng>
+			 <xm-menu-mng v-if="infotype=='需求'" :sel-project="selProject"></xm-menu-mng>
 			 <xm-task-mng v-if="infotype=='任务'" ref="xmTaskMng" :sel-project="selProject" ptype="0" queryScope="task" key="task"></xm-task-mng>
 			  <xm-question v-if="infotype=='缺陷'" :qtype="'bug'" :sel-project='selProject' ref="xmQuestion"></xm-question>
 			  <xm-group-mng v-if="infotype=='团队'" :sel-project="selProject"></xm-group-mng>
@@ -161,7 +161,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject,editStatus , delXmProject, batchDelXmProject } from '@/api/xm/core/xmProject';
 	import  XmProjectAdd from './XmProjectAdd';//新增界面
 	import  XmProjectEdit from './XmProjectEdit';//修改界面
@@ -362,13 +362,13 @@
               } else {
                 return v[j];
               }
-              const options = this.$refs.xmMenuWithPlan.options;
-              if(options[key]==undefined || options[key]==null || options[key].length==0   ){
+              const dicts = this.$refs.xmMenuWithPlan.dicts;
+              if(dicts[key]==undefined || dicts[key]==null || dicts[key].length==0   ){
                 return v[j];
               }
-              var rowData=options[key].filter(i=>i.optionValue==v[j])
+              var rowData=dicts[key].filter(i=>i.id==v[j])
               if(rowData.length>0){
-                return rowData[0].optionName
+                return rowData[0].name
               }else{
                 return v[j];
               }
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index f19295ac..5d495450 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -32,7 +32,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import config from "@/common/config"; //全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject,  } from '@/api/xm/core/xmProject';  
 	import { mapGetters } from 'vuex' 
 	
@@ -60,7 +60,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 127dd53e..299aef24 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -26,7 +26,7 @@
 						<el-option  value="myExecuserStatus7"  label="我放弃"></el-option> 
 					</el-select> 
 					<el-select  v-model="filters.status" clearable placeholder="项目状态">
-						<el-option v-for="(item,index) in options['projectStatus']" :value="item.optionValue" :label="item.optionName" :key="index"></el-option> 
+						<el-option v-for="(item,index) in dicts['projectStatus']" :value="item.id" :label="item.name" :key="index"></el-option> 
 					</el-select>  
 					<el-input class="hidden-md-and-down" placeholder="选择产品" v-model="filters.productName" @click.native="productSelectVisible=true" clearable @clear="onProductClose"  style="width:15%;"></el-input>
  					<el-input v-model="filters.key" style="width:15%;" placeholder="项目名称模糊查询" clearable>
@@ -154,34 +154,45 @@
 						</el-col>
 					</el-row>
 
-					<el-table  ref="table" :height="maxTableHeight" v-cloak v-show="!showType" stripe :data="ScreenData" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-						<el-table-column  type="index" label="序号" width="80" ></el-table-column>
-						<el-table-column prop="code" label="项目编号" min-width="120" ></el-table-column>
-						<el-table-column prop="name" label="标题" min-width="200" >
+					<el-table  ref="table" :height="maxTableHeight" v-cloak v-show="!showType" fit stripe :data="ScreenData" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+						<el-table-column  type="index" label="序号" width="60" ></el-table-column>
+						<el-table-column prop="code" label="项目代号" width="120" sortable show-overflow-tooltip></el-table-column>
+						<el-table-column prop="name" label="标题" sortable min-width="200" >
 							<template slot-scope="scope">
-								<el-link @click.stop="intoInfo(scope.row)">{{scope.row.name}}</el-link>
+								<el-link type="primary" @click.stop="intoInfo(scope.row)">{{scope.row.name}}</el-link>
 							</template>
 						</el-table-column> 
-						<el-table-column prop="menuCnt" label="需求数" min-width="80" >
-							<el-table-column prop="finishMenuCnt" label="已完成" min-width="80" ></el-table-column>
-							<el-table-column prop="menuCnt" label="总数" min-width="80" ></el-table-column>
-						</el-table-column> 
-						<el-table-column prop="totalTaskCnt" label="任务数" min-width="80" >
-							<el-table-column prop="totalCompleteTaskCnt" label="已完成" min-width="80" ></el-table-column>
-							<el-table-column prop="totalTaskCnt" label="总数" min-width="80" ></el-table-column>
+						<el-table-column prop="status" label="状态" width="80 sortable" :formatter="formatterByDicts"> 
 						</el-table-column>  
- 						<el-table-column prop="totalBugCnt" label="缺陷" min-width="80" >
-							 <el-table-column prop="totalClosedBugCnt" label="已关闭" min-width="80" > 
-							</el-table-column>
-							<el-table-column prop="totalBugCnt" label="总数" min-width="80" > 
-							</el-table-column>
-						 </el-table-column>
-						<el-table-column label="进度" min-width="80" >
+						<el-table-column prop="totalProgress" label="进度" width="100" sortable>
+							<template slot-scope="scope"> 
+								<font  ><el-tag :type="scope.row.totalProgress>=100?'success':'warning'">{{scope.row.totalProgress}}%</el-tag>
+
+								 <el-button  id="guider-four" type="text" icon="el-icon-video-play"  title="统计项目的工作量、进度、需求、bugs等数据"  @click.stop="loadTasksToXmProjectState( scope.row)"></el-button> 
+
+								</font>
+							</template>
+						</el-table-column> 
+						<el-table-column prop="productCnt" label="产品数" sortable min-width="80" >  
+						</el-table-column> 
+						<el-table-column prop="iterationCnt" label="迭代数" sortable min-width="80" >  
+						</el-table-column> 
+						<el-table-column prop="menuCnt" label="需求数" sortable min-width="80" > 
 							<template slot-scope="scope">
-								{{scope.row.totalProgress}}%
+								<span title="完成的需求数 / 需求总数 ">{{scope.row.menuCnt>0?scope.row.finishMenuCnt+'&nbsp;/&nbsp;'+scope.row.menuCnt:''}}</span>
 							</template>
-						</el-table-column>
-						<el-table-column prop="startTime" label="起止时间" min-width="150" >
+						</el-table-column> 
+						<el-table-column prop="totalTaskCnt" label="任务数" sortable min-width="80" > 
+							<template slot-scope="scope">
+								<span title="完成的任务数 / 任务总数 ">{{scope.row.totalTaskCnt>0?scope.row.totalCompleteTaskCnt+'&nbsp;/&nbsp;'+scope.row.totalTaskCnt:''}}</span>
+							</template>
+						</el-table-column>  
+ 						<el-table-column prop="totalBugCnt" label="缺陷" sortable min-width="80" >
+							<template slot-scope="scope">
+								<span title="关闭的缺陷数 / 缺陷总数 ">{{scope.row.totalBugCnt>0?scope.row.totalClosedBugCnt+'&nbsp;/&nbsp;'+scope.row.totalBugCnt:''}}</span>
+							</template> 
+						 </el-table-column>
+						<el-table-column prop="startTime" label="起止时间" sortable min-width="150" >
 							<template slot-scope="scope">
 								{{scope.row.startTime? scope.row.startTime.substr(0,10) : ""}}~{{scope.row.endTime? scope.row.endTime.substr(0,10) : ""}}
 							</template>
@@ -197,7 +208,7 @@
 								</el-tooltip> 
 							</template>
 						</el-table-column>
-						<el-table-column label="操作" width="245" fixed="right">
+						<el-table-column label="操作" width="200" fixed="right">
 							<template slot-scope="scope">
 								<!-- <el-popover
 									placement="left"
@@ -205,10 +216,10 @@
 									 
 										<el-button v-if="menukey=='myFocus'"  type="primary" @click.stop="focusOrUnfocus(scope.row)" >取消关注</el-button> 
 										<el-button v-else  type="text" @click.stop="focusOrUnfocus(scope.row)" >关注</el-button>  
-										<el-button    type="text" @click.stop="xmRecordVisible=true" >日志</el-button> 
+										<el-button    type="text" @click.stop="intoInfo(scope.row)" >视图</el-button> 
 										<el-button   type="text" title="通过复制快速创建新项目" @click.stop="onCopyToBtnClick(scope.row)" v-loading="load.add">复制</el-button>
 										<el-button   type="text" title="删除项目" @click.stop="handleDel(scope.row)" v-loading="load.del">删除</el-button>
-										handleDel
+										 
 										<!-- 
 										<el-button  type="primary" @click.stop="statusChange(scope,'1')" v-if="scope.row.status==0 || scope.row.status == 2">提交审核</el-button>
 										<el-button  type="primary" @click.stop="statusChange(scope,'3')" v-if="scope.row.status==1">批准</el-button>
@@ -216,7 +227,7 @@
 										<el-button  type="primary" @click.stop="statusChange(scope,'4')" v-if="scope.row.status==3">结束</el-button>
 										<el-button  type="primary" @click.stop="statusChange(scope,'3')" v-if="scope.row.status==4">重新启动</el-button>
 										<el-button  type="primary" @click.stop="handleDel(scope.row,scope.$index)" v-if="isLeader(scope.row.leader)">删除</el-button>
-										--> 
+										
 									
 									<el-dropdown @command="handleCommand" :hide-on-click="false">
 										<span class="el-dropdown-link">
@@ -232,6 +243,7 @@
 											<el-dropdown-item icon="el-icon-success"   :command="{type:'sendToProcessApprova',row:scope.row,bizKey:'xm_project_restart_approva'}">项目重新启动发审(审核通过后生效)</el-dropdown-item>
 										</el-dropdown-menu>
 									</el-dropdown> 
+									--> 
 									<!-- <el-button style="width:100%;" slot="reference" class="see-more" type="text" icon="el-icon-more"></el-button>
 								</el-popover> -->
 							</template>
@@ -303,7 +315,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import config from "@/common/config"; //全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo,createProjectCode ,getDefOptions} from '@/api/xm/core/xmProject'; 
 	import {  loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState';
 
@@ -370,7 +382,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
@@ -385,7 +397,7 @@
 				},
 				/**begin 自定义属性请在下面加 请加备注**/
 				menukey: "all",
-				showType: true,
+				showType: false,
 				showInfo: false,
 				selectProject: null,
 				finishFlag: false,
@@ -462,6 +474,9 @@
 				if(this.filters.productId){
 					params.productId  = this.filters.productId
 				} 
+				if(this.filters.status){
+					params.status  = this.filters.status
+				} 
 				params.createTimeStart=this.dateRanger[0]
 				params.createTimeEnd=this.dateRanger[1]
 				listXmProject(params).then((res) => {
@@ -808,10 +823,10 @@
 				})
 			},
 			formatProjectStatus(status){
-				if(this.options['projectStatus'] && this.options['projectStatus'].length>0 ){
-					var sts=this.options['projectStatus'].find(i=>i.optionValue==status)
+				if(this.dicts['projectStatus'] && this.dicts['projectStatus'].length>0 ){
+					var sts=this.dicts['projectStatus'].find(i=>i.id==status)
 					if(sts){
-						return sts.optionName
+						return sts.name
 					}else{
 						return status;
 					}
@@ -819,6 +834,11 @@
 					return status;
 				}
 			},
+			formatterByDicts(row,column,cellValue){ 
+				if(column.property=='status'){
+					return this.formatProjectStatus(cellValue);
+				} 
+			},
 			loadTasksToXmProjectState(row){
 				
 					var params={projectId:row.id}
@@ -853,17 +873,11 @@
 				this.filters.productId=this.$route.params.productId;
 				this.filters.productName=this.$route.params.productName;
 			}
-			this.$nextTick(() => {  
-				listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
-					if(res.data.tips.isOk){ 
-						
-						this.options['projectType']=res.data.data.projectType
-						this.options['urgencyLevel']=res.data.data.urgencyLevel
-						this.options['priority']=res.data.data.priority
-						this.options['projectStatus']=res.data.data.projectStatus  
-					}
-				});
-                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table1.$el);
+			this.$nextTick(() => {    
+				initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+					this.dicts=res.data.data;
+				})
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				this.showInfo = false;
 				this.getXmProjects(this.guiderStart);
 			}); 
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index 140c5f37..a434e179 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -6,9 +6,9 @@
           <div>
             <el-row style="padding:10px">
               <el-steps :active="calcProjectStatusStep" finish-status="success">
-                <el-step  v-for="(i,index) in options['projectStatus']" :title="i.optionName" :key="index">
+                <el-step  v-for="(i,index) in dicts['projectStatus']" :title="i.name" :key="index">
                   <el-row slot="title">
-                    {{i.optionName}}
+                    {{i.name}}
                   </el-row>
                 </el-step>
               </el-steps>
@@ -266,7 +266,7 @@
 <script>
 import util from "@/common/js/util"; // 全局公共库
 import { mapGetters } from "vuex";
-import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import {  getDefOptions} from '@/api/xm/core/xmProject'; 
 
 export default {
@@ -335,9 +335,9 @@ export default {
       return this.selProject
     },
     calcProjectStatusStep(){
-      if(this.options['projectStatus'] && this.selProject){
-        var index=this.options['projectStatus'].findIndex(i=>{
-          if(i.optionValue==this.selProject.status){
+      if(this.dicts['projectStatus'] && this.selProject){
+        var index=this.dicts['projectStatus'].findIndex(i=>{
+          if(i.id==this.selProject.status){
             return true;
           }else{
             return false;
@@ -366,7 +366,7 @@ export default {
     return {
       isActive: true,
       maxTableHeight:300,
-      options: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+      dicts: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
     };
   },
 
@@ -754,14 +754,10 @@ export default {
     this.$nextTick(() => {
       this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
     });
-    listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
-      if(res.data.tips.isOk){
-        this.options['projectType']=res.data.data.projectType
-        this.options['urgencyLevel']=res.data.data.urgencyLevel
-        this.options['priority']=res.data.data.priority
-        this.options['projectStatus']=res.data.data.projectStatus
-      }
-    });
+			
+			initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+				this.dicts=res.data.data;
+			})
     this.drawAllBar();
     this.drawTaskByDate();
     this.drawPieBug();
diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
index dfa2e171..a0a3ee95 100644
--- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
@@ -12,12 +12,28 @@
         </el-menu-item>    
         <el-menu-item index="iterationProjectLink"> 
           <span slot="title">关联迭代</span>
-        </el-menu-item>   
+        </el-menu-item>  
+        <el-menu-item index="projectCalc"> 
+          <span slot="title">执行项目数据统计计划</span>
+        </el-menu-item>    
       </el-menu>
        <xm-project-overview  v-if="showPanelName=='overview'" :sel-project="selProject"></xm-project-overview>
         <xm-project-detail  v-if="showPanelName=='detail'" :sel-project="selProject" @submit="afterEditSubmit"></xm-project-detail> 
         <xm-product-project-link-mng v-if="showPanelName=='productProjectLink'" :sel-project="selProject"></xm-product-project-link-mng>
         <xm-iteration-link-for-project v-if="showPanelName=='iterationProjectLink'" :sel-project="selProject"></xm-iteration-link-for-project>
+        
+        <div v-if="showPanelName=='projectCalc'" class="padding">
+          <el-row>
+            <el-button type="primary" @click="loadTasksToXmProjectState" v-loading="load.calcProject">计算项目预算数据</el-button>
+            <br>
+              <font color="red" style="font-size:10px;">将从项目任务中汇总进度、预算工作量、实际工作量、预算金额、实际金额、缺陷数、需求数等数据到项目统计表</font>
+          </el-row>
+          <el-row>
+            <el-button  type="primary" @click="loadTasksSettleToXmProjectState"  v-loading="load.calcSettle">计算项目结算数据</el-button>
+            <br>
+              <font color="red"  style="font-size:10px;">将从项目任务汇总结算数据项目统计表</font>
+          </el-row>
+        </div>
   </section>
 </template>
 
@@ -31,6 +47,7 @@ import XmProjectDetail from './XmProjectDetail.vue';
 import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue';
 import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProject.vue';
 
+	import {  loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState';
 
 export default {
   components: { XmProjectOverview, XmProjectDetail, XmProductProjectLinkMng ,XmIterationLinkForProject},
@@ -43,7 +60,9 @@ export default {
   },
   data() {
     return {
-      showPanelName:'overview'
+      showPanelName:'overview',
+      
+      load:{calcProject:false,calcSettle:false}
     };
   },
 
@@ -53,7 +72,17 @@ export default {
     },
     onMenuToolBarSelect(menuIndex){
       this.showPanelName=menuIndex;
-    }
+    },
+    
+    loadTasksToXmProjectState(){
+        var row=this.selProject;
+        var params={projectId:row.id}
+      loadTasksToXmProjectState(params).then((res) => {
+          this.load.calcProject=false;
+          var tips=res.data.tips; 
+          this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
+        }).catch( err  => this.load.calcProject=false ); 
+    },
   },
 
   mounted() {
diff --git a/src/views/xm/core/xmProject/XmProjectRecycle.vue b/src/views/xm/core/xmProject/XmProjectRecycle.vue
index 67320fe8..51903039 100644
--- a/src/views/xm/core/xmProject/XmProjectRecycle.vue
+++ b/src/views/xm/core/xmProject/XmProjectRecycle.vue
@@ -45,7 +45,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import config from "@/common/config"; //全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject,unDelXmProject  } from '@/api/xm/core/xmProject';  
 	import { mapGetters } from 'vuex' 
 	
@@ -73,7 +73,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue
index b35e4a6f..a6d23ae6 100644
--- a/src/views/xm/core/xmProject/XmProjectSelect.vue
+++ b/src/views/xm/core/xmProject/XmProjectSelect.vue
@@ -6,7 +6,7 @@
 				 </el-table-column>
 				 <el-table-column prop="name" label="项目名称" >
 					 <template slot="header">
-						 项目名称 <el-button type="text" @click="clearSelect">清空所选</el-button>
+						 项目名称 <el-button type="text" @click="clearSelect">清空所选</el-button><el-button type="text" @click="close">关闭</el-button>
 					 </template>
 					 <template slot-scope="scope">
 						 {{scope.row.name}}&nbsp;&nbsp;
@@ -25,7 +25,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import config from "@/common/config"; //全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject,  } from '@/api/xm/core/xmProject';  
 	import { mapGetters } from 'vuex' 
 	
@@ -62,7 +62,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
@@ -170,6 +170,9 @@
 			clearSelect(){
 				this.$refs.table.setCurrentRow();
 				this.$emit("clear-select");
+			},
+			close(){ 
+				this.$emit("close");
 			}
 		},//end methods
 		components: {  
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index c3cccf37..b11b6eb6 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -83,7 +83,7 @@
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import config from "@/common/config"; //全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo,createProjectCode} from '@/api/xm/core/xmProject'; 
 	import { addXmMyFocus , delXmMyFocus } from '@/api/xm/core/xmMyFocus'; 
  	import { mapGetters } from 'vuex'  
@@ -132,7 +132,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProject界面是否显示
 				//新增xmProject界面初始化数据
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
index a8c89bde..608e843a 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
@@ -22,7 +22,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectContract } from '@/api/xm/core/xmProjectContract';
 	import { mapGetters } from 'vuex'
 	
@@ -45,7 +45,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					htId: [
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
index 39f2cad5..8506acb3 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
@@ -22,7 +22,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectContract } from '@/api/xm/core/xmProjectContract';
 	import { mapGetters } from 'vuex'
 	
@@ -45,7 +45,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					htId: [
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index 32b91aaa..6bb08705 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -44,7 +44,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectContract, delXmProjectContract, batchDelXmProjectContract } from '@/api/xm/core/xmProjectContract';
 	import  XmProjectContractAdd from './XmProjectContractAdd';//新增界面
 	import  XmProjectContractEdit from './XmProjectContractEdit';//修改界面
@@ -73,7 +73,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProjectContract界面是否显示
 				//新增xmProjectContract界面初始化数据
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
index bf34f2cc..9129e668 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
@@ -52,7 +52,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectEnvList } from '@/api/xm/core/xmProjectEnvList';
 	import { mapGetters } from 'vuex'
 	
@@ -78,7 +78,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
index 3f21d8b9..ee1c8ad9 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
@@ -55,7 +55,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectEnvList } from '@/api/xm/core/xmProjectEnvList';
 	import { mapGetters } from 'vuex'
 	
@@ -78,7 +78,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
index 96a826ab..ee310dcc 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
@@ -81,7 +81,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectEnvList, addXmProjectEnvList, delXmProjectEnvList, batchDelXmProjectEnvList } from '@/api/xm/core/xmProjectEnvList';
 	import { listXmEnvList } from '@/api/xm/core/xmEnvList';
 	import  XmProjectEnvListAdd from './XmProjectEnvListAdd';//新增界面
@@ -111,7 +111,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProjectEnvList界面是否显示
 				//新增xmProjectEnvList界面初始化数据
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
index 8cf803b8..b4059aa2 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
@@ -61,7 +61,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectKpi } from '@/api/xm/core/xmProjectKpi';
 	import { mapGetters } from 'vuex'
 	
@@ -84,7 +84,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
index 8da51500..c0cda8cd 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
@@ -61,7 +61,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectKpi } from '@/api/xm/core/xmProjectKpi';
 	import { mapGetters } from 'vuex'
 	
@@ -84,7 +84,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
index beec4163..0b7d8c78 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
@@ -61,7 +61,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectKpi, delXmProjectKpi, batchDelXmProjectKpi } from '@/api/xm/core/xmProjectKpi';
 	import  XmProjectKpiAdd from './XmProjectKpiAdd';//新增界面
 	import  XmProjectKpiEdit from './XmProjectKpiEdit';//修改界面
@@ -90,7 +90,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProjectKpi界面是否显示
 				//新增xmProjectKpi界面初始化数据
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
index e515654e..16099819 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
@@ -67,7 +67,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectKpiHis } from '@/api/xm/core/xmProjectKpiHis';
 	import { mapGetters } from 'vuex'
 	
@@ -90,7 +90,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					kpiId: [
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
index 1d2e47ac..fa4a588a 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
@@ -67,7 +67,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectKpiHis } from '@/api/xm/core/xmProjectKpiHis';
 	import { mapGetters } from 'vuex'
 	
@@ -90,7 +90,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					kpiId: [
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
index ca18e01d..e31b1e9a 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
@@ -53,7 +53,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectKpiHis, delXmProjectKpiHis, batchDelXmProjectKpiHis } from '@/api/xm/core/xmProjectKpiHis';
 	import  XmProjectKpiHisAdd from './XmProjectKpiHisAdd';//新增界面
 	import  XmProjectKpiHisEdit from './XmProjectKpiHisEdit';//修改界面
@@ -81,7 +81,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProjectKpiHis界面是否显示
 				//新增xmProjectKpiHis界面初始化数据
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
index f28bf3fb..5c7dce0a 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
@@ -16,10 +16,10 @@
 				<el-form-item label="预算科目" prop="subjectId">
 					<el-select   placeholder="预算科目编号" v-model="addForm.subjectId">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item>   
@@ -62,7 +62,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectMBudgetCostNouser,batchAddXmProjectMBudgetCostNouser } from '@/api/xm/core/xmProjectMBudgetCostNouser';
 	import { mapGetters } from 'vuex'
 	
@@ -98,9 +98,9 @@
 			  this.addForm.budgetCost=totalBudgetCost/this.allMonths.length;
 		  } ,
 	      'addForm.subjectId':function(subjectId) { 
-	      	var options=this.options.projectSubject.filter(i=>i.optionValue==subjectId)
-			if(options!=null && options.length>0){
-				 this.addForm.subjectName=options[0].optionName
+	      	var dicts=this.dicts.projectSubject.filter(i=>i.id==subjectId)
+			if(options!=null && dicts.length>0){
+				 this.addForm.subjectName=dicts[0].name
 			}else{
 				this.addForm.subjectName="";
 			}
@@ -110,7 +110,7 @@
 			var year=new Date().getFullYear(); 
 			var secYear=parseInt(year)+1;
 			return { 
-				options:{
+				dicts:{
 					projectSubject:[]
 				},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
@@ -185,8 +185,8 @@
 		},
 		mounted() {
 			//this.addForm=Object.assign(this.addForm, this.xmProjectMBudgetCostNouser);    				
-			listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-				this.options=res.data.data;
+			initSimpleDicts( 'all',['projectSubject']).then(res=>{
+				this.dicts=res.data.data;
 			})	
 			/**在下面写其它函数***/
 			
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
index e2ceae0b..fa842297 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
@@ -12,10 +12,10 @@
 				<el-form-item label="预算科目" prop="subjectId">
 					<el-select   placeholder="预算科目编号" v-model="editForm.subjectId">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item>   
@@ -42,7 +42,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectMBudgetCostNouser } from '@/api/xm/core/xmProjectMBudgetCostNouser';
 	import { mapGetters } from 'vuex'
 	
@@ -63,9 +63,9 @@
 	      	}
 	      },
 	      'editForm.subjectId':function(subjectId) { 
-	      	var options=this.options.projectSubject.filter(i=>i.optionValue==subjectId)
-			if(options!=null && options.length>0){
-				 this.editForm.subjectName=options[0].optionName
+	      	var dicts=this.dicts.projectSubject.filter(i=>i.id==subjectId)
+			if(options!=null && dicts.length>0){
+				 this.editForm.subjectName=dicts[0].name
 			}else{
 				this.editForm.subjectName="";
 			}
@@ -73,7 +73,7 @@
 	    },
 		data() {
 			return { 
-				options:{
+				dicts:{
 					projectSubject:[]
 				},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
@@ -131,10 +131,11 @@
 		    //在下面添加其它组件 'xm-project-m-budget-cost-nouser-edit':XmProjectMBudgetCostNouserEdit
 		},
 		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmProjectMBudgetCostNouser);    				
-			listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-				this.options=res.data.data;
-			})	
+			this.editForm=Object.assign(this.editForm, this.xmProjectMBudgetCostNouser);    
+			
+			initSimpleDicts('all',['projectSubject']).then(res=>{
+				this.dicts=res.data.data;
+			})
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
index a8732bad..fb590f3f 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
@@ -27,10 +27,10 @@
 					<template slot-scope="scope">
 						<el-select :disabled="batchEditVisible==false"  placeholder="预算科目编号" v-model="scope.row.subjectId"  @change="fieldChange(scope.row)">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select> 
 					</template>
@@ -95,7 +95,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectMBudgetCostNouser, delXmProjectMBudgetCostNouser, batchDelXmProjectMBudgetCostNouser,batchEdit  } from '@/api/xm/core/xmProjectMBudgetCostNouser';
 	import  XmProjectMBudgetCostNouserAdd from './XmProjectMBudgetCostNouserAdd';//新增界面
 	import  XmProjectMBudgetCostNouserEdit from './XmProjectMBudgetCostNouserEdit';//修改界面
@@ -132,7 +132,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					projectSubject:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -349,11 +349,11 @@
 				
 				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
 				this.getXmProjectMBudgetCostNousers();
-			}); 
-			
-				listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-					this.options=res.data.data;
-				})	
+			});  
+				
+			initSimpleDicts('all',['projectSubject']).then(res=>{
+				this.dicts=res.data.data;
+			})	
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
index db775da2..3558c82e 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
@@ -19,10 +19,10 @@
 				<el-form-item label="预算科目" prop="subjectId">
 					<el-select   placeholder="预算科目编号" v-model="addForm.subjectId">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item>  
@@ -64,7 +64,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectMBudgetCostUser,batchAddXmProjectMBudgetCostUser } from '@/api/xm/core/xmProjectMBudgetCostUser';
 	import { mapGetters } from 'vuex'
 	
@@ -100,9 +100,9 @@
 			  this.addForm.budgetCost=totalBudgetCost/this.allMonths.length;
 		  },
 	      'addForm.subjectId':function(subjectId) { 
-	      	var options=this.options.projectSubject.filter(i=>i.optionValue==subjectId)
-			if(options!=null && options.length>0){
-				 this.addForm.subjectName=options[0].optionName
+	      	var dicts=this.dicts.projectSubject.filter(i=>i.id==subjectId)
+			if(options!=null && dicts.length>0){
+				 this.addForm.subjectName=dicts[0].name
 			}else{
 				this.addForm.subjectName="";
 			}
@@ -112,7 +112,7 @@
 			var year=new Date().getFullYear(); 
 			var secYear=parseInt(year)+1;
 			return { 
-				options:{
+				dicts:{
 					projectSubject:[],
 				},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
@@ -188,8 +188,8 @@
 			//this.addForm=Object.assign(this.addForm, this.xmProjectMBudgetCostUser);  
 			/**在下面写其它函数***/
 			
-				listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-					this.options=res.data.data;
+				initSimpleDicts('all',['projectSubject']).then(res=>{
+					this.dicts=res.data.data;
 				})	
 		}//end mounted
 	}
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
index aed7c76d..2097d920 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
@@ -18,10 +18,10 @@
 				<el-form-item label="预算科目" prop="subjectId">
 					<el-select   placeholder="预算科目编号" v-model="editForm.subjectId">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item>  
@@ -47,7 +47,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectMBudgetCostUser } from '@/api/xm/core/xmProjectMBudgetCostUser';
 	import { mapGetters } from 'vuex'
 	
@@ -69,9 +69,9 @@
 	      } ,
 	      'editForm.subjectId':function(subjectId) { 
 			  console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxlg" + subjectId);
-	      	var options=this.options.projectSubject.filter(i=>i.optionValue==subjectId)
-			if(options!=null && options.length>0){
-				 this.editForm.subjectName=options[0].optionName
+	      	var dicts=this.dicts.projectSubject.filter(i=>i.id==subjectId)
+			if(options!=null && dicts.length>0){
+				 this.editForm.subjectName=dicts[0].name
 			}else{
 				this.editForm.subjectName="";
 			}
@@ -79,7 +79,7 @@
 	    },
 		data() {
 			return { 
-				options:{
+				dicts:{
 					projectSubject:[]
 				},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
@@ -138,9 +138,10 @@
 		},
 		mounted() {
 			this.editForm=Object.assign(this.editForm, this.xmProjectMBudgetCostUser);  				
-			listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-				this.options=res.data.data;
-			})	
+			
+				initSimpleDicts('all',['projectSubject']).then(res=>{
+					this.dicts=res.data.data;
+				})
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
index 8a770e97..2692c7a3 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
@@ -34,10 +34,10 @@
 					<template slot-scope="scope">
 						<el-select   :disabled="batchEditVisible==false"  placeholder="预算科目编号" v-model="scope.row.subjectId" @change="fieldChange(scope.row)">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select> 
 					</template>
@@ -100,7 +100,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectMBudgetCostUser, delXmProjectMBudgetCostUser, batchDelXmProjectMBudgetCostUser,batchEdit } from '@/api/xm/core/xmProjectMBudgetCostUser';
 	import  XmProjectMBudgetCostUserAdd from './XmProjectMBudgetCostUserAdd';//新增界面
 	import  XmProjectMBudgetCostUserEdit from './XmProjectMBudgetCostUserEdit';//修改界面
@@ -137,7 +137,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					projectSubject:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -356,9 +356,9 @@
 				this.getXmProjectMBudgetCostUsers();
 			}); 
 			
-				listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-					this.options=res.data.data;
-				})	
+				initSimpleDicts('all',['projectSubject']).then(res=>{
+					this.dicts=res.data.data;
+				})
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
index 7db2b605..8885053a 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
@@ -12,10 +12,10 @@
 				<el-form-item label="预算科目" prop="subjectId">
 					<el-select   placeholder="预算科目编号" v-model="addForm.subjectId">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item>   
@@ -42,7 +42,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { addXmProjectMCostNouser } from '@/api/xm/core/xmProjectMCostNouser';
 	import { mapGetters } from 'vuex'
 	
@@ -63,9 +63,9 @@
 	      	}
 	      },
 	      'addForm.subjectId':function(subjectId) { 
-	      	var options=this.options.projectSubject.filter(i=>i.optionValue==subjectId)
-			if(options!=null && options.length>0){
-				 this.addForm.subjectName=options[0].optionName
+	      	var dicts=this.dicts.projectSubject.filter(i=>i.id==subjectId)
+			if(options!=null && dicts.length>0){
+				 this.addForm.subjectName=dicts[0].name
 			}else{
 				this.addForm.subjectName="";
 			}
@@ -73,7 +73,7 @@
 	    },
 		data() {
 			return { 
-				options:{
+				dicts:{
 					projectSubject:[]
 				},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
@@ -131,10 +131,10 @@
 		    //在下面添加其它组件 'xm-project-m-budget-cost-nouser-add':XmProjectMCostNouserEdit
 		},
 		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectMCostNouser);    				
-			listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-				this.options=res.data.data;
-			})	
+			this.addForm=Object.assign(this.addForm, this.xmProjectMCostNouser);    
+				initSimpleDicts('all',['projectSubject']).then(res=>{
+					this.dicts=res.data.data;
+				})
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
index 69c6021b..3a1ed64b 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
@@ -82,7 +82,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectMCostNouser } from '@/api/xm/core/xmProjectMCostNouser';
 	import { mapGetters } from 'vuex'
 	
@@ -105,7 +105,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
index 1f717861..2809b779 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
@@ -26,10 +26,10 @@
 					<template slot-scope="scope">
 						<el-select :disabled="batchEditVisible==false"  placeholder="成本科目编号" v-model="scope.row.subjectId"  @change="fieldChange(scope.row)">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select> 
 					</template>
@@ -94,7 +94,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectMCostNouser, delXmProjectMCostNouser, batchDelXmProjectMCostNouser,batchEdit  } from '@/api/xm/core/xmProjectMCostNouser';
 	import  XmProjectMCostNouserAdd from './XmProjectMCostNouserAdd';//新增界面
 	import  XmProjectMCostNouserEdit from './XmProjectMCostNouserEdit';//修改界面
@@ -131,7 +131,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					projectSubject:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -351,10 +351,9 @@
 				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
 				this.getXmProjectMCostNousers();
 			}); 
-			
-				listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-					this.options=res.data.data;
-				})	
+				initSimpleDicts('all',['projectSubject']).then(res=>{
+					this.dicts=res.data.data;
+				})
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
index 0348e2a2..b56d12c2 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
@@ -12,10 +12,10 @@
 				<el-form-item label="成本科目" prop="subjectId">
 					<el-select   placeholder="成本科目编号" v-model="addForm.subjectId">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item>  
@@ -54,7 +54,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { addXmProjectMCostUser } from '@/api/xm/core/xmProjectMCostUser';
 	import { mapGetters } from 'vuex'
 	
@@ -76,9 +76,9 @@
 	      } ,
 	      'addForm.subjectId':function(subjectId) { 
 			  console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxlg" + subjectId);
-	      	var options=this.options.projectSubject.filter(i=>i.optionValue==subjectId)
-			if(options!=null && options.length>0){
-				 this.addForm.subjectName=options[0].optionName
+	      	var dicts=this.dicts.projectSubject.filter(i=>i.id==subjectId)
+			if(options!=null && dicts.length>0){
+				 this.addForm.subjectName=dicts[0].name
 			}else{
 				this.addForm.subjectName="";
 			}
@@ -86,7 +86,7 @@
 	    },
 		data() {
 			return { 
-				options:{
+				dicts:{
 					projectSubject:[]
 				},//下拉选择框的所有静态数据 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 },//查询中...
@@ -153,10 +153,10 @@
 		    //在下面添加其它组件 'xm-project-m-budget-cost-user-add':XmProjectMCostUserEdit
 		},
 		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectMCostUser);  				
-			listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-				this.options=res.data.data;
-			})	
+			this.addForm=Object.assign(this.addForm, this.xmProjectMCostUser);
+				initSimpleDicts('all',['projectSubject']).then(res=>{
+					this.dicts=res.data.data;
+				})
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
index 6ae79864..c437b80e 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
@@ -85,7 +85,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectMCostUser } from '@/api/xm/core/xmProjectMCostUser';
 	import { mapGetters } from 'vuex'
 	
@@ -108,7 +108,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
index e0feec25..1bc21daf 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
@@ -20,10 +20,10 @@
 					<template slot-scope="scope">
 						<el-select   :disabled="batchEditVisible==false"  placeholder="成本科目编号" v-model="scope.row.subjectId" @change="fieldChange(scope.row)">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select> 
 					</template>
@@ -77,7 +77,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectMCostUser } from '@/api/xm/core/xmProjectMCostUser';
 	import { mapGetters } from 'vuex'
 	
@@ -112,7 +112,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					projectSubject:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -245,10 +245,9 @@
 				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
 				this.getXmProjectMCostUsers();
 			}); 
-			
-				listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-					this.options=res.data.data;
-				})	
+				initSimpleDicts('all',['projectSubject']).then(res=>{
+					this.dicts=res.data.data;
+				})
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
index 6014bab7..3addf98d 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
@@ -35,10 +35,10 @@
 					<template slot-scope="scope">
 						<el-select   :disabled="batchEditVisible==false"  placeholder="成本科目编号" v-model="scope.row.subjectId" @change="fieldChange(scope.row)">
 						<el-option
-							v-for="(item,i) in options.projectSubject"
+							v-for="(item,i) in dicts.projectSubject"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select> 
 					</template>
@@ -101,7 +101,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectMCostUser, delXmProjectMCostUser, batchDelXmProjectMCostUser,batchEdit } from '@/api/xm/core/xmProjectMCostUser';
 	import  XmProjectMCostUserAdd from './XmProjectMCostUserAdd';//新增界面
 	import  XmProjectMCostUserEdit from './XmProjectMCostUserEdit';//修改界面
@@ -138,7 +138,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					projectSubject:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -356,9 +356,9 @@
 				this.getXmProjectMCostUsers();
 			}); 
 			
-				listOption([{categoryId:'all',itemCode:'projectSubject'}]).then(res=>{
-					this.options=res.data.data;
-				})	
+				initSimpleDicts('all',['projectSubject']).then(res=>{
+					this.dicts=res.data.data;
+				})
 		}
 	}
 
diff --git a/src/views/xm/core/xmProjectState/XmCockpit.vue b/src/views/xm/core/xmProjectState/XmCockpit.vue
index dec55751..623a4521 100644
--- a/src/views/xm/core/xmProjectState/XmCockpit.vue
+++ b/src/views/xm/core/xmProjectState/XmCockpit.vue
@@ -107,7 +107,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectState, delXmProjectState, batchDelXmProjectState } from '@/api/xm/core/xmProjectState';
 	import  XmProjectStateAdd from './XmProjectStateAdd';//新增界面
 	import  XmProjectStateEdit from './XmProjectStateEdit';//修改界面
@@ -135,7 +135,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -293,9 +293,9 @@
 				this.getXmProjectStates();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
index cca8388e..9861860c 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
@@ -184,7 +184,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectState } from '@/api/xm/core/xmProjectState';
 	import { mapGetters } from 'vuex'
 	
@@ -207,7 +207,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
index 34580378..dc71fea3 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
@@ -184,7 +184,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectState } from '@/api/xm/core/xmProjectState';
 	import { mapGetters } from 'vuex'
 	
@@ -207,7 +207,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index bb76dc5b..2a9d0f2e 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
@@ -115,7 +115,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectState,loadProjectToXmProjectState, loadBugsToXmProjectState, loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState';
 	import  XmProjectStateAdd from './XmProjectStateAdd';//新增界面
 	import  XmProjectStateEdit from './XmProjectStateEdit';//修改界面
@@ -152,7 +152,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 					projectStatus:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -406,12 +406,12 @@
 				}else{
 					return cellValue
 				}
-				if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0   ){
+				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
 					return cellValue;
 				}
-				var list=this.options[key].filter(i=>i.optionValue==cellValue)
+				var list=this.dicts[key].filter(i=>i.id==cellValue)
 				if(list.length>0){
-					return list[0].optionName
+					return list[0].name
 				}else{
 					return cellValue;
 				}
@@ -439,19 +439,17 @@
 					this.filters.selProject=this.selProject
 				} 
 
-				this.getXmProjectStates();
-				listOption([{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
-					if(res.data.tips.isOk){  
-						this.options['projectStatus']=res.data.data.projectStatus 
-						//this.editForm.projectStatus=this.options['projectStatus'][0].optionValue
-					}
-				});  
+				this.getXmProjectStates(); 
+				
+				initSimpleDicts('all',['projectStatus']).then(res=>{
+					this.dicts=res.data.data;
+				})
                 this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
index 2bcc2f78..3df8fac5 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
@@ -109,7 +109,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectStateHis } from '@/api/xm/core/xmProjectStateHis';
 	import { mapGetters } from 'vuex'
 	
@@ -132,7 +132,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
index 37aa31d6..a2c53361 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
@@ -109,7 +109,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectStateHis } from '@/api/xm/core/xmProjectStateHis';
 	import { mapGetters } from 'vuex'
 	
@@ -132,7 +132,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
index 3538dac4..1bba31c5 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
@@ -67,7 +67,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectStateHis, delXmProjectStateHis, batchDelXmProjectStateHis } from '@/api/xm/core/xmProjectStateHis';
 	import  XmProjectStateHisAdd from './XmProjectStateHisAdd';//新增界面
 	import  XmProjectStateHisEdit from './XmProjectStateHisEdit';//修改界面
@@ -95,7 +95,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmProjectStateHis界面是否显示
 				//新增xmProjectStateHis界面初始化数据
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
index 96ca70f0..b218ff01 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
@@ -79,7 +79,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmProjectTaskTypeState } from '@/api/xm/core/xmProjectTaskTypeState';
 	import { mapGetters } from 'vuex'
 	
@@ -102,7 +102,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
index 04ab9d7b..6735478c 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
@@ -79,7 +79,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectTaskTypeState } from '@/api/xm/core/xmProjectTaskTypeState';
 	import { mapGetters } from 'vuex'
 	
@@ -102,7 +102,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
index 9fa62693..c14e5485 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
@@ -57,7 +57,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectTaskTypeState, delXmProjectTaskTypeState, batchDelXmProjectTaskTypeState } from '@/api/xm/core/xmProjectTaskTypeState';
 	import  XmProjectTaskTypeStateAdd from './XmProjectTaskTypeStateAdd';//新增界面
 	import  XmProjectTaskTypeStateEdit from './XmProjectTaskTypeStateEdit';//修改界面
@@ -85,7 +85,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -246,9 +246,9 @@
 				this.getXmProjectTaskTypeStates();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
index 25412d32..17981b8e 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
@@ -13,17 +13,17 @@
 					</el-form-item> 
 					<el-form-item label="项目类型" prop="xmType"> 
 					 	 <el-radio-group v-model="addForm.xmType">
-							<el-radio v-for="(i,index) in options['projectType']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
+							<el-radio v-for="(i,index) in dicts['projectType']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 						</el-radio-group>  
 					</el-form-item> 
 					<el-form-item label="紧急程度" prop="urgent">
 					 	 <el-radio-group v-model="addForm.urgent">
-							<el-radio v-for="(i,index) in options['urgencyLevel']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
+							<el-radio v-for="(i,index) in dicts['urgencyLevel']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 						</el-radio-group>   
 					</el-form-item>  
 					<el-form-item label="优先程度" prop="priority">
 					 	 <el-radio-group v-model="addForm.priority">
-							<el-radio v-for="(i,index) in options['priority']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
+							<el-radio v-for="(i,index) in dicts['priority']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 						</el-radio-group> 
 					</el-form-item>   
 					
@@ -135,7 +135,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import {sn} from '@/common/js/sequence';//全局公共库
 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { addXmProjectTemplate } from '@/api/xm/core/xmProjectTemplate'; 
 	import { mapGetters } from 'vuex';  
 	
@@ -263,7 +263,7 @@
 				filters: {
 					ids: [],
 				},
-				options:{ 
+				dicts:{ 
 					projectType:[],
 					urgencyLevel:[],
 					priority:[],
@@ -405,20 +405,17 @@
  		    //在下面添加其它组件 'xm-project-add':XmProjectTemplateEdit
 		},
 		mounted() { 
-			this.addForm.id=sn();
-				listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
-					if(res.data.tips.isOk){ 
-						this.options['projectType']=res.data.data.projectType
-						this.options['urgencyLevel']=res.data.data.urgencyLevel
-						this.options['priority']=res.data.data.priority
-						this.options['projectStatus']=res.data.data.projectStatus
+			this.addForm.id=sn();  
+				initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+					this.dicts['projectType']=res.data.data.projectType
+					this.dicts['urgencyLevel']=res.data.data.urgencyLevel
+					this.dicts['priority']=res.data.data.priority
+					this.dicts['projectStatus']=res.data.data.projectStatus
 
-						this.addForm.xmType=this.options['projectType'][0].optionValue
-						this.addForm.urgent=this.options['urgencyLevel'][0].optionValue
-						this.addForm.priority=this.options['priority'][0].optionValue
-						//this.addForm.projectStatus=this.options['projectStatus'][0].optionValue
-					}
-				});
+					this.addForm.xmType=this.dicts['projectType'][0].id
+					this.addForm.urgent=this.dicts['urgencyLevel'][0].id
+					this.addForm.priority=this.dicts['priority'][0].id
+				})
 			
 		}
 	}
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
index 8846f0bf..03e05743 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
@@ -14,22 +14,22 @@
 						</el-form-item> 
 						<el-form-item label="项目状态" prop="status"> 
 							<el-radio-group v-model="editForm.status">
-								<el-radio v-for="(i,index) in options['projectStatus']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
+								<el-radio v-for="(i,index) in dicts['projectStatus']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 							</el-radio-group>  
 						</el-form-item> 
 						<el-form-item label="项目类型" prop="xmType"> 
 							<el-radio-group v-model="editForm.xmType">
-								<el-radio v-for="(i,index) in options['projectType']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
+								<el-radio v-for="(i,index) in dicts['projectType']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 							</el-radio-group>  
 						</el-form-item> 
 						<el-form-item label="紧急程度" prop="urgent">
 							<el-radio-group v-model="editForm.urgent">
-								<el-radio v-for="(i,index) in options['urgencyLevel']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
+								<el-radio v-for="(i,index) in dicts['urgencyLevel']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 							</el-radio-group>   
 						</el-form-item>  
 						<el-form-item label="优先程度" prop="priority">
 							<el-radio-group v-model="editForm.priority">
-								<el-radio v-for="(i,index) in options['priority']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio> 
+								<el-radio v-for="(i,index) in dicts['priority']" :label="i.id" :key="index">{{i.name}}</el-radio> 
 							</el-radio-group> 
 						</el-form-item>   
 						
@@ -141,7 +141,7 @@
 	import {sn} from '@/common/js/sequence';//全局公共库
 
 	import config from "@/common/config"; //全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmProjectTemplate } from '@/api/xm/core/xmProjectTemplate';  
 	
 	import { mapGetters } from 'vuex'; 
@@ -272,7 +272,7 @@
 				filters: {
 					ids: [],
 				},
-				options:{ 
+				dicts:{ 
 					projectType:[],
 					urgencyLevel:[],
 					priority:[],
@@ -421,15 +421,13 @@
 		},
 		mounted() { 
 			 	this.editForm=Object.assign({},this.selProjectTemplate);
-				listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
-					if(res.data.tips.isOk){ 
-						this.options['projectType']=res.data.data.projectType
-						this.options['urgencyLevel']=res.data.data.urgencyLevel
-						this.options['priority']=res.data.data.priority
-						this.options['projectStatus']=res.data.data.projectStatus 
-						//this.editForm.projectStatus=this.options['projectStatus'][0].optionValue
-					}
-				});
+				
+				initSimpleDicts('all',['projectType','urgencyLevel','priority','projectStatus']).then(res=>{
+					this.dicts['projectType']=res.data.data.projectType
+					this.dicts['urgencyLevel']=res.data.data.urgencyLevel
+					this.dicts['priority']=res.data.data.priority
+					this.dicts['projectStatus']=res.data.data.projectStatus 
+				})
 			
 		}
 	}
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
index c1998199..a82136b8 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
@@ -20,7 +20,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectTemplate,editStatus , delXmProjectTemplate, batchDelXmProjectTemplate } from '@/api/xm/core/xmProject'; 
 	import { mapGetters } from 'vuex';
 	import xmTaskTemplateMng from '../xmTaskTemplate/XmTaskTemplateMng'; 
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
index d7e0361d..31d0bb9e 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
@@ -3,7 +3,7 @@
 		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="项目模板名称查询"></el-input>  
 			<el-select v-model="filters.xmType" @change="searchXmProjectTemplates">
-				<el-option v-for="i in this.options.projectType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+				<el-option v-for="i in this.dicts.projectType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 			</el-select>
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectTemplates">查询</el-button> 
   		</el-row>
@@ -50,7 +50,7 @@
 
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProject  } from '@/api/xm/core/xmProject';
  	import { mapGetters } from 'vuex'
  	 
@@ -77,7 +77,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 					projectType:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -192,10 +192,10 @@
 			/**begin 自定义函数请在下面加**/
 			
 			formatXmType(row,column,cellValue){
-				if(this.options.projectType){
-					var xmType=this.options.projectType.find(i=>i.optionValue==cellValue)
+				if(this.dicts.projectType){
+					var xmType=this.dicts.projectType.find(i=>i.id==cellValue)
 					if(xmType){
-						return xmType.optionName
+						return xmType.name
 					}else{
 						return cellValue;
 					}
@@ -214,17 +214,17 @@
 			this.$nextTick(() => { 
                 this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmProjectTemplates();
-				listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
+				initSimpleDicts( 'all' ['projectType'] ).then(res=>{
 					if(res.data.tips.isOk){ 
-						this.options['projectType']=res.data.data.projectType
+						this.dicts['projectType']=res.data.data.projectType
 					}
 				}); 
 			}); 
 			
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
index dde66a35..18d1b8b3 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
@@ -4,7 +4,7 @@
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			
 			<el-select v-model="filters.xmType" @change="searchXmProjectTemplates">
-				<el-option v-for="i in this.options.projectType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+				<el-option v-for="i in this.dicts.projectType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 			</el-select>
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectTemplates">查询</el-button> 
 			<el-button type="primary" @click="showAdd">+项目模板</el-button>
@@ -56,7 +56,7 @@
 
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmProjectTemplate, delXmProjectTemplate, batchDelXmProjectTemplate } from '@/api/xm/core/xmProjectTemplate';
 	import  XmProjectTemplateAdd from './XmProjectTemplateAdd';//新增界面
 	import  XmProjectTemplateEdit from './XmProjectTemplateEdit';//修改界面
@@ -91,7 +91,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 					projectType:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -260,17 +260,15 @@
 			this.$nextTick(() => { 
                 this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmProjectTemplates();
-				listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
-					if(res.data.tips.isOk){ 
-						this.options['projectType']=res.data.data.projectType
-					}
-				});
+				initSimpleDicts( 'all' ['projectType'] ).then(res=>{ 
+						this.dicts=res.data.data 
+				}); 
 			}); 
 			
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index 473572bc..2084c411 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -23,15 +23,15 @@
 						<el-form-item label="缺陷属性" prop="priority">
 							<el-col :span="24">
 							<el-select v-model="addForm.priority" placeholder="请选择紧急程度">
-								<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option>
+								<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="i.id">{{i.name}}</el-option>
 							</el-select>
 
 							<el-select v-model="addForm.bugSeverity" placeholder="请选择严重程度">
-								<el-option v-for="(i,index) in options['bugSeverity']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option>
+								<el-option v-for="(i,index) in dicts['bugSeverity']" :label="i.name" :value="i.id" :key="i.id">{{i.name}}</el-option>
 							</el-select>
 
 							<el-select v-model="addForm.solution" placeholder="请选择解决方案">
-								<el-option v-for="(i,index) in options['bugSolution']" :label="i.optionName" :value="i.optionValue" :key="i.optionValue">{{i.optionName}}</el-option>
+								<el-option v-for="(i,index) in dicts['bugSolution']" :label="i.name" :value="i.id" :key="i.id">{{i.name}}</el-option>
 							</el-select>
 							</el-col>
 						</el-form-item>
@@ -104,7 +104,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { addXmQuestion } from '@/api/xm/core/xmQuestion';
 	import { mapGetters } from 'vuex';
 	import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件
@@ -156,7 +156,7 @@
 				filters:{
 					selProject:null,
 				},
-				options:{
+				dicts:{
 					urgencyLevel:[],
 					bugSeverity:[],
 					bugSolution:[],
@@ -401,13 +401,13 @@
 			this.addForm.qtype=this.qtype
 			this.setDefaultData();
 			this.initByExec();
-			listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{
+			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','urgencyLevel']).then(res=>{
 				if(res.data.tips.isOk){
-					this.options['bugSeverity']=res.data.data.bugSeverity
-					this.options['bugSolution']=res.data.data.bugSolution
-					this.options['bugStatus']=res.data.data.bugStatus
-					this.options['bugType']=res.data.data.bugType
-					this.options['urgencyLevel']=res.data.data.urgencyLevel
+					this.dicts['bugSeverity']=res.data.data.bugSeverity
+					this.dicts['bugSolution']=res.data.data.bugSolution
+					this.dicts['bugStatus']=res.data.data.bugStatus
+					this.dicts['bugType']=res.data.data.bugType
+					this.dicts['urgencyLevel']=res.data.data.urgencyLevel
 				}
 			});
 			/**在下面写其它函数***/
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 4eb34391..5042c223 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -35,15 +35,15 @@
 						<el-form-item label="缺陷属性" prop="priority">
 							<el-col :span="24">
 							<el-select v-model="editForm.priority" placeholder="请选择紧急程度">
-								<el-option v-for="(i,index) in options['urgencyLevel']" :label="i.optionName" :value="i.optionValue" :key="index">{{i.optionName}}</el-option>
+								<el-option v-for="(i,index) in dicts['urgencyLevel']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 							</el-select>
 
 							<el-select v-model="editForm.bugSeverity" placeholder="请选择严重程度">
-								<el-option v-for="(i,index) in options['bugSeverity']" :label="i.optionName" :value="i.optionValue" :key="index">{{i.optionName}}</el-option>
+								<el-option v-for="(i,index) in dicts['bugSeverity']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 							</el-select>
 
 							<el-select v-model="editForm.solution" placeholder="请选择解决方案">
-								<el-option v-for="(i,index) in options['bugSolution']" :label="i.optionName" :value="i.optionValue" :key="index">{{i.optionName}}</el-option>
+								<el-option v-for="(i,index) in dicts['bugSolution']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 							</el-select>
 							</el-col>
 						</el-form-item>
@@ -138,7 +138,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmQuestion } from '@/api/xm/core/xmQuestion'; 
 	import { mapGetters } from 'vuex';
 	import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件
@@ -187,7 +187,7 @@
 	    },
 		data() {
 			return {
-				options:{
+				dicts:{
 					urgencyLevel:[],
 					bugSeverity:[],
 					bugSolution:[],
@@ -336,12 +336,12 @@
 				}else{
 					return cellValue
 				}
-				if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0   ){
+				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
 					return cellValue;
 				}
-				var list=this.options[key].filter(i=>i.optionValue==cellValue)
+				var list=this.dicts[key].filter(i=>i.id==cellValue)
 				if(list.length>0){
-					return list[0].optionName
+					return list[0].name
 				}else{
 					return cellValue;
 				}
@@ -393,7 +393,7 @@
 			},
 			onSelectedMenu(menu){
 				if(menu.ntype=='1'){
-					this.$notify({showClose: true, message: "您选择的【"+menu.menuName+"】属于需求集，请重新选择。建议选择树中叶子节点", type: 'error' });
+					this.$notify({showClose: true, message: "您选择的【"+menu.menuName+"】属于需求池，请重新选择。建议选择树中叶子节点", type: 'error' });
 					return;
 				}
 				this.editForm.menuId=menu.menuId
@@ -425,13 +425,13 @@
 		mounted() {
 			console.log("question_add");
 			this.editForm=Object.assign(this.editForm, this.xmQuestion);
-			listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{
+			initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','urgencyLevel']).then(res=>{
 				if(res.data.tips.isOk){
-					this.options['bugSeverity']=res.data.data.bugSeverity
-					this.options['bugSolution']=res.data.data.bugSolution
-					this.options['bugStatus']=res.data.data.bugStatus
-					this.options['bugType']=res.data.data.bugType
-					this.options['urgencyLevel']=res.data.data.urgencyLevel
+					this.dicts['bugSeverity']=res.data.data.bugSeverity
+					this.dicts['bugSolution']=res.data.data.bugSolution
+					this.dicts['bugStatus']=res.data.data.bugStatus
+					this.dicts['bugType']=res.data.data.bugType
+					this.dicts['urgencyLevel']=res.data.data.urgencyLevel
 				}
 			});
 			//this.getXmQuestionHandle();
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 96403920..9c80e2de 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -2,15 +2,15 @@
 	<section class="padding">
 			<el-row>
 			  	<el-select v-model="filters.bugStatus" placeholder="状态" style="width:100px;"  clearable @change="changeBugStatus">
-					<el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue"  :key="index" :label="b.optionName">{{b.optionName}}
+					<el-option v-for="(b,index) in dicts['bugStatus']" :value="b.id"  :key="index" :label="b.name">{{b.name}}
 					</el-option>
 				</el-select>
 				<el-select class="hidden-md-and-down" v-model="filters.priority" placeholder="紧急程度"  style="width:120px;"  clearable @change="changePriority">
-					<el-option v-for="(b,index) in options['urgencyLevel']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
+					<el-option v-for="(b,index) in dicts['urgencyLevel']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 					</el-option>
 				</el-select>
 				<el-select class="hidden-md-and-down" v-model="filters.bugSeverity" placeholder="严重程度"  style="width:120px;" clearable @change="changeBugSeverity">
-					<el-option v-for="(b,index) in options['bugSeverity']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
+					<el-option v-for="(b,index) in dicts['bugSeverity']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 					</el-option>
 				</el-select>
 				<el-input style="width:200px;" v-model="filters.key" placeholder="缺陷名称" clearable> 
@@ -61,7 +61,7 @@
 							<el-button v-if="!filters.hisHandler||filters.hisHandler.userid!=userInfo.userid" @click="setFiltersHisHandlerAsMySelf">我的</el-button>
 							变更状态为
 							<el-select v-model="filters.hisHandleStatus" placeholder="请选择状态"  clearable @change="changeHisHandleStatus">
-								<el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue"  :key="index" :label="b.optionName">{{b.optionName}}
+								<el-option v-for="(b,index) in dicts['bugStatus']" :value="b.id"  :key="index" :label="b.name">{{b.name}}
 								</el-option>
 							</el-select>的缺陷
 						</el-col>
@@ -74,13 +74,13 @@
 						</el-col>
 						<el-col :span="24" class="hidden-lg-and-up" style="padding-top:12px;">
 							<el-select   v-model="filters.priority" placeholder="请选择紧急程度" clearable @change="changePriority">
-								<el-option v-for="(b,index) in options['urgencyLevel']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
+								<el-option v-for="(b,index) in dicts['urgencyLevel']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 								</el-option>
 							</el-select>
 						</el-col>
 						<el-col :span="24"  style="padding-top:12px;">
 							<el-select  v-model="filters.solution" placeholder="请选择解决方案" clearable @change="changeSolution">
-								<el-option v-for="(b,index) in options['bugSolution']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
+								<el-option v-for="(b,index) in dicts['bugSolution']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 								</el-option>
 							</el-select>
 						</el-col>
@@ -165,9 +165,9 @@
 					<el-table-column prop="tagNames" label="标签"  width="100" show-overflow-tooltip> 
 					</el-table-column>
 					<el-table-column prop="menuName" label="需求" width="100" show-overflow-tooltip></el-table-column>
-					<el-table-column   v-if="!isMultiSelect"  header-align="center" label="操作" fixed="right" width="100">
+					<el-table-column   header-align="center" label="操作" fixed="right" width="100">
 						<template slot-scope="scope">
-							<el-button  :disabled="scope.row.ntype=='1'"  type="primary" @click.stop="showEdit(scope.row)" >编辑</el-button> 	
+							<el-button  type="primary" @click.stop="showEdit(scope.row)" >编辑</el-button> 	
 						</template>
 					</el-table-column>
 				</el-table>
@@ -209,7 +209,7 @@
 
 	import config from '@/common/config';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmQuestion, delXmQuestion, batchDelXmQuestion, editStatus } from '@/api/xm/core/xmQuestion';
 	import  XmQuestionAdd from './XmQuestionAdd';//新增界面
 	import  XmQuestionEdit from './XmQuestionEdit';//修改界面
@@ -278,7 +278,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					urgencyLevel:[],
 					bugSeverity:[],
 					bugSolution:[],
@@ -649,12 +649,12 @@
 				}else{
 					return cellValue
 				}
-				if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0   ){
+				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
 					return cellValue;
 				}
-				var list=this.options[key].filter(i=>i.optionValue==cellValue)
+				var list=this.dicts[key].filter(i=>i.id==cellValue)
 				if(list.length>0){
-					return list[0].optionName
+					return list[0].name
 				}else{
 					return cellValue;
 				}
@@ -704,7 +704,7 @@
 				})
 			},
 			formatJson(filterVal, jsonData) {
-				console.log('this.options==', this.options);
+				console.log('this.dicts==', this.dicts);
 
 				return jsonData.map(v => filterVal.map(j => {
 					let key = '';
@@ -723,12 +723,12 @@
 					} else {
 						return v[j];
 					}
-					if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0){
+					if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0){
 						return v[j];
 					}
-					var rowData = this.options[key].find(i => i.optionValue == v[j]);
+					var rowData = this.dicts[key].find(i => i.id == v[j]);
 					if(rowData){
-						return rowData.optionName;
+						return rowData.name;
 					}else{
 						return v[j];
 					}
@@ -952,13 +952,13 @@
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
 				this.getXmQuestions();
 			});
-				listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{
+				initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','urgencyLevel']).then(res=>{
 					if(res.data.tips.isOk){
-						this.options['bugSeverity']=res.data.data.bugSeverity
-						this.options['bugSolution']=res.data.data.bugSolution
-						this.options['bugStatus']=res.data.data.bugStatus
-						this.options['bugType']=res.data.data.bugType
-						this.options['urgencyLevel']=res.data.data.urgencyLevel
+						this.dicts['bugSeverity']=res.data.data.bugSeverity
+						this.dicts['bugSolution']=res.data.data.bugSolution
+						this.dicts['bugStatus']=res.data.data.bugStatus
+						this.dicts['bugType']=res.data.data.bugType
+						this.dicts['urgencyLevel']=res.data.data.urgencyLevel
 					}
 				});
 		}
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
index 19da4a0a..bd600afa 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
@@ -38,7 +38,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmQuestionHandle, delXmQuestionHandle, batchDelXmQuestionHandle } from '@/api/xm/core/xmQuestionHandle';
 	import { mapGetters } from 'vuex'
 	
@@ -73,7 +73,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmQuestionHandle界面是否显示
 				//新增xmQuestionHandle界面初始化数据
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index 63d2c646..027ec037 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -55,7 +55,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmRecord, delXmRecord, batchDelXmRecord } from '@/api/xm/core/xmRecord'; 
 	import { mapGetters } from 'vuex'
 	
@@ -90,7 +90,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmRecord界面是否显示
 				//新增xmRecord界面初始化数据
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 95760782..c7608ff4 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -3,154 +3,171 @@
 		<el-row class="page-main ">
 			<!--新增界面 XmTask xm_task-->
 			<el-form :model="addForm"  label-width="100px" :rules="addFormRules" ref="addForm">
-				<el-card class="box-card" header="基础信息" id="baseInfoAdd" shadow="hover">  
-					<el-form-item label="" prop="ntype">
-						 <el-radio :disabled="parentTask&&parentTask.id&&parentTask.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-form-item v-if="addForm.ptype==='0'" label="归属项目" prop="projectId">
-						<el-tag>{{addForm.projectName}}</el-tag>
-					</el-form-item>
-					
-					<el-form-item v-if="addForm.ptype==='1'" label="归属产品" prop="productId">
-						<el-tag>{{addForm.productName}}</el-tag>
-					</el-form-item>
-					<el-form-item label="上级" prop="parentTaskname">  
-						<el-tag v-if="addForm.parentTaskid"  @close="clearParentTask" closable >{{addForm.parentTaskname}}</el-tag>
-						<el-button  type="text"  @click.stop="selectParentTaskVisible=true"  >选上级</el-button>
-						<br>
-						<font color="red" style="font-size:12px;">&nbsp;&nbsp;任务数多的情况下，请尽量设置上级,对任务进行归类，方便对其进行管理</font>
-					</el-form-item>
-					<el-form-item label="名称" prop="name"> 
-							<el-input style="width:100%;" v-model="addForm.name" placeholder="名称" ></el-input>  
-					</el-form-item>
-					<el-form-item label="序号" prop="sortLevel"> 
-						<el-input  v-model="addForm.sortLevel" style="width:30%;"   placeholder="如1.0或者1.2.3等" ></el-input> <el-checkbox v-model="addForm.milestone" :true-label="1" :false-label="0">里程碑</el-checkbox>
-					</el-form-item>
-					<div>
-					<el-form-item label="前置">
-						<el-tag v-if="addForm.preTaskid"  @close="clearPreTask" closable >{{addForm.preTaskname}}</el-tag>
-						<el-button  type="text"  @click.stop="selectTaskVisible=true"  >选前置</el-button>
-					</el-form-item>
-					<el-row>
-						<el-col :span="8">
-							<el-form-item label="状态">  
-								<el-select v-model="addForm.taskState">
-									<el-option value="0" label="待领取"></el-option>
-									<el-option value="1" label="已领取执行中"></el-option>
-									<el-option value="2" label="已完工"></el-option>
-									<el-option value="3" label="已结算"></el-option>
-								</el-select>   
-							</el-form-item> 
-						</el-col>
-						<el-col :span="8">
-							<el-form-item  label="紧急程度" prop="level">  
-								<el-select v-model="addForm.level">
-										<el-option v-for="i in options.urgencyLevel" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option> 
-								</el-select>    
-							</el-form-item>  
-						</el-col>
-						<el-col :span="8">
-							<el-form-item  label="类型" prop="taskType">   
-								<el-select v-model="addForm.taskType">
-									<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
-								</el-select>  
-							</el-form-item>   
-						</el-col>
-					</el-row>
-					<el-form-item  label="所属需求" prop="menuId" id="menuInfoAdd" v-if="addForm.ntype=='0'">
-						{{addForm.menuName}} <el-button @click="menuVisible=true" round>选择归属需求</el-button>
-					</el-form-item>
-					<el-form-item prop="skill" label="技能要求">
-						<el-button class="useradd-icon" type="text" @click.stop="showSkill()" icon="el-icon-circle-plus-outline">增加</el-button>
-						<el-tag class="fs-ft" style="margin-right:10px" v-for="(item,i) in taskSkills" :key="i">{{item.taskSkillName}}</el-tag>
-					</el-form-item>
-					<el-form-item label="描述" prop="description">
-						<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="addForm.description" placeholder="描述" ></el-input>
-					</el-form-item>
-					</div>
-				</el-card> 
- 				<el-card class="box-card" id="planInfoAdd" header="进度计划" shadow="hover">
-					<el-form-item label="负责人">
-						<el-tag  v-if="addForm.createUserid" style="margin-left:10px;border-radius:30px;"  >{{addForm.createUsername}}</el-tag>
-						<el-tag  v-else style="margin-left:10px;border-radius:30px;"  icon="el-icon-right" >未设置</el-tag>
-						<el-button  @click="showGroupUserSelect(addForm)" icon="el-icon-setting">设置负责人</el-button>
-					</el-form-item> 
-					
-					<el-form-item label="执行人" prop="executorUsername">
-						<el-tag  v-if="addForm.executorUserid" style="margin-left:10px;border-radius:30px;"  >{{addForm.executorUsername}}</el-tag>
- 						<el-button  @click="execGroupUserSelectVisible=true" icon="el-icon-setting">设置执行人</el-button>
-					</el-form-item>
-					<el-form-item label="预计时间">
-							<el-tooltip content="计划类型">
-								<el-select v-model=" addForm.planType" style="width:20%;">
-									<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
-								</el-select>
-							</el-tooltip>
-							<el-date-picker
-								v-model="budgetDateRanger"
-								@change="onBudgetDateRangerChange"
-								class="hidden-sm-and-down"
-								type="daterange"
-								align="right"
-								unlink-panels
-								range-separator="至"
-								start-placeholder="计划开始日期"
-								end-placeholder="计划完成日期"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								:default-time="['00:00:00','23:59:59']"
-								:picker-options="pickerOptions"
-							></el-date-picker>
-					</el-form-item>  
-				</el-card>
 
- 				<el-card class="box-card" header="工作量、成本" id="costInfoAdd">
-					<el-form-item label="预估工作量" prop="budgetWorkload">
-						<el-input-number style="width:200px;"  v-model="addForm.budgetWorkload" @change="onBudgetWorkloadChange" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)"></el-input-number> <el-tag>人时，{{this.toFixed(addForm.budgetWorkload/8/20)}}人月</el-tag>
-		 				<br/>
-						<el-checkbox v-model="addForm.taskOut" @change="onTaskOutChange" true-label="1" false-label="0">是否为众包</el-checkbox>
- 
-					</el-form-item> 
-					<el-form-item label="预估金额" prop="taskOut">
-						<el-row v-if="addForm.taskOut!=='1'">
-							工时单价&nbsp;<el-input-number style="width:200px;"  v-model="addForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="工时单价"></el-input-number>   元/人时
- 						</el-row> 
-						<el-row v-if="addForm.taskOut==='1'">
- 							工时单价&nbsp;<el-input-number style="width:200px;" v-if="addForm.taskOut==='1'" v-model="addForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价"></el-input-number>   元/人时
+				<el-collapse value="1" accordion>
+					<el-collapse-item title="基础信息" name="1"> 
+						<el-form-item label="" prop="ntype">
+							<el-radio :disabled="parentTask&&parentTask.id&&parentTask.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-form-item v-if="addForm.ptype==='0'" label="归属项目" prop="projectId">
+							<el-tag>{{addForm.projectName}}</el-tag>
+						</el-form-item>
+						
+						<el-form-item v-if="addForm.ptype==='1'" label="归属产品" prop="productId">
+							<el-tag>{{addForm.productName}}</el-tag>
+						</el-form-item>
+						
+						<el-row>
+							<el-col :span="12">
+								<el-form-item label="上级" prop="parentTaskname">  
+									<el-tag v-if="addForm.parentTaskid"  @close="clearParentTask" closable >{{addForm.parentTaskname}}</el-tag>
+									<el-button  type="text"  @click.stop="selectParentTaskVisible=true"  >选上级</el-button>
+									<br>
+									<font color="red" style="font-size:12px;">请尽量设置上级,对任务进行归类管理</font>
+								</el-form-item>
+
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="前置">
+									<el-tag v-if="addForm.preTaskid"  @close="clearPreTask" closable >{{addForm.preTaskname}}</el-tag>
+									<el-button  type="text"  @click.stop="selectTaskVisible=true"  >选前置</el-button>
+								</el-form-item> 
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="6">
+								<el-form-item label="序号名称" prop="sortLevel" > 
+									<el-input  v-model="addForm.sortLevel"   placeholder="如1.0或者1.2.3等" ></el-input> 
+									<br>
+									
+									<el-checkbox v-model="addForm.milestone" :true-label="1" :false-label="0">里程碑</el-checkbox>
+								</el-form-item>
+							</el-col>
+							<el-col :span="18">
+								<el-form-item label="" prop="name" label-width="0px"> 
+										<el-input style="width:100%;" v-model="addForm.name" placeholder="名称" ></el-input>  
+								</el-form-item> 
+							</el-col>
 						</el-row>
+						<div>
 						<el-row>
-							预估金额&nbsp;<el-input-number style="width:200px;"  v-model="addForm.budgetCost" :precision="2" :step="100" :min="0" placeholder="预算金额"></el-input-number>   元
+							<el-col :span="8">
+								<el-form-item label="状态">  
+									<el-select v-model="addForm.taskState">
+										<el-option value="0" label="待领取"></el-option>
+										<el-option value="1" label="已领取执行中"></el-option>
+										<el-option value="2" label="已完工"></el-option>
+										<el-option value="3" label="已结算"></el-option>
+									</el-select>   
+								</el-form-item> 
+							</el-col>
+							<el-col :span="8">
+								<el-form-item  label="紧急程度" prop="level">  
+									<el-select v-model="addForm.level">
+											<el-option v-for="i in dicts.urgencyLevel" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+									</el-select>    
+								</el-form-item>  
+							</el-col>
+							<el-col :span="8">
+								<el-form-item  label="类型" prop="taskType">   
+									<el-select v-model="addForm.taskType">
+										<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>  
+								</el-form-item>   
+							</el-col>
 						</el-row>
-					</el-form-item> 
-				 </el-card>
- 				<el-card class="box-card" header="结算信息" id="settleInfoAdd" shadow="hover" v-if="addForm.ntype!='1'">
-					<el-form-item label="" prop="taskClass">
-						<el-checkbox v-model="addForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox>
-					</el-form-item>
-					<el-form-item v-if="addForm.taskClass=='1'" label="结算方案" prop="settlSchemel">
-						<el-select v-model=" addForm.settleSchemel">
-							<el-option v-for="i in options.xmTaskSettleSchemel" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
-						</el-select>
-					</el-form-item>
-				 </el-card>
+						<el-form-item  label="所属需求" prop="menuId" id="menuInfoAdd" v-if="addForm.ntype=='0'">
+							{{addForm.menuName}} &nbsp;<el-button type="text" @click="menuVisible=true" round>选择归属需求</el-button>
+						</el-form-item>
+						<el-form-item prop="skill" label="技能要求">
+							<el-button class="useradd-icon" type="text" @click.stop="showSkill()" icon="el-icon-circle-plus-outline">增加</el-button>
+							<el-tag class="fs-ft" style="margin-right:10px" v-for="(item,i) in taskSkills" :key="i">{{item.taskSkillName}}</el-tag>
+						</el-form-item>
+						<el-form-item label="描述" prop="description">
+							<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="addForm.description" placeholder="描述" ></el-input>
+						</el-form-item>
+						</div>
+					</el-collapse-item>
+					<el-collapse-item title="进度计划" name="2">
+						<el-form-item label="负责人">
+							<el-tag  v-if="addForm.createUserid" style="margin-left:10px;border-radius:30px;"  >{{addForm.createUsername}}</el-tag>
+							<el-tag  v-else style="margin-left:10px;border-radius:30px;"  icon="el-icon-right" >未设置</el-tag>
+							<el-button  @click="showGroupUserSelect(addForm)" icon="el-icon-setting">设置负责人</el-button>
+						</el-form-item> 
+						
+						<el-form-item label="执行人" prop="executorUsername">
+							<el-tag  v-if="addForm.executorUserid" style="margin-left:10px;border-radius:30px;"  >{{addForm.executorUsername}}</el-tag>
+							<el-button  @click="execGroupUserSelectVisible=true" icon="el-icon-setting">设置执行人</el-button>
+						</el-form-item>
+						<el-form-item label="预计时间">
+								<el-tooltip content="计划类型">
+									<el-select v-model=" addForm.planType" style="width:20%;">
+										<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>
+								</el-tooltip>
+								<el-date-picker
+									v-model="budgetDateRanger"
+									@change="onBudgetDateRangerChange"
+									class="hidden-sm-and-down"
+									type="daterange"
+									align="right"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="计划开始日期"
+									end-placeholder="计划完成日期"
+									value-format="yyyy-MM-dd HH:mm:ss"
+									:default-time="['00:00:00','23:59:59']"
+									:picker-options="pickerOptions"
+								></el-date-picker>
+						</el-form-item>   
+						<el-form-item label="预估工作量" prop="budgetWorkload">
+							<el-input-number style="width:200px;"  v-model="addForm.budgetWorkload" @change="onBudgetWorkloadChange" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)"></el-input-number> <el-tag>人时，{{this.toFixed(addForm.budgetWorkload/8/20)}}人月</el-tag>
+							<br/>
+							<el-checkbox v-model="addForm.taskOut" @change="onTaskOutChange" true-label="1" false-label="0">是否为众包</el-checkbox>
+	
+						</el-form-item> 
+						<el-form-item label="预估金额" prop="taskOut">
+							<el-row v-if="addForm.taskOut!=='1'">
+								工时单价&nbsp;<el-input-number style="width:200px;"  v-model="addForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="工时单价"></el-input-number>   元/人时
+							</el-row> 
+							<el-row v-if="addForm.taskOut==='1'">
+								工时单价&nbsp;<el-input-number style="width:200px;" v-if="addForm.taskOut==='1'" v-model="addForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价"></el-input-number>   元/人时
+							</el-row>
+							<el-row>
+								预估金额&nbsp;<el-input-number style="width:200px;"  v-model="addForm.budgetCost" :precision="2" :step="100" :min="0" placeholder="预算金额"></el-input-number>   元
+							</el-row>
+						</el-form-item> 
 
-				<el-card class="box-card" header="众包" id="taskOutAdd" v-if="addForm.ntype!='1' && addForm.taskOut=='1'">
+					</el-collapse-item>
+					<el-collapse-item title="结算信息" name="4" v-if="addForm.ntype!='1'">
+						<el-form-item label="" prop="taskClass">
+							<el-checkbox v-model="addForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox>
+						</el-form-item>
+						<el-form-item v-if="addForm.taskClass=='1'" label="结算方案" prop="settlSchemel">
+							<el-select v-model=" addForm.settleSchemel">
+								<el-option v-for="i in dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-collapse-item>
+					<el-collapse-item title="众包" name="5" v-if="addForm.ntype!='1' && addForm.taskOut=='1'">
 					 
 					<el-checkbox v-model="addForm.toTaskCenter" true-label="1" false-label="0" id="taskOut">发布到互联网任务大厅</el-checkbox>  
 					 
-					<el-steps :active="calcTaskStep" align-center simple>
-					<el-step title="发布" description="任务创建成功后即发布"></el-step>
-					<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
-					<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>
-					<el-step title="验收" description="任务完成后提交验收，验收通过，即可进行结算"></el-step>
-					<el-step title="结算" description="提交结算申请审批流程，审批过程自动根据审批结果进行结算"></el-step>
-					<el-step title="企业付款" description="结算流程审批通过，自动付款到个人钱包"></el-step>
-					<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step>
-				</el-steps> 
-				 </el-card> 
+						<el-steps :active="calcTaskStep" align-center simple>
+							<el-step title="发布" description="任务创建成功后即发布"></el-step>
+							<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
+							<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>
+							<el-step title="验收" description="任务完成后提交验收，验收通过，即可进行结算"></el-step>
+							<el-step title="结算" description="提交结算申请审批流程，审批过程自动根据审批结果进行结算"></el-step>
+							<el-step title="企业付款" description="结算流程审批通过，自动付款到个人钱包"></el-step>
+							<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step>
+						</el-steps> 
+					</el-collapse-item>
+				</el-collapse>   
 			</el-form>
 		</el-row>
 		<el-row class="page-bottom padding">
@@ -186,7 +203,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import {addTask,addXmTask } from '@/api/xm/core/xmTask';
 	import { mapGetters } from 'vuex';
  	import {sn} from '@/common/js/sequence';
@@ -237,7 +254,7 @@
 			const endDate = new Date();
 			endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
 			return {
-				options:{
+				dicts:{
 					urgencyLevel:[],
 					taskType:[],
 					planType:[],
@@ -556,8 +573,8 @@
 		},
 		mounted() { 
  			this.initData();
- 			listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'xmTaskSettleSchemel'}]).then(res=>{
-				this.options=res.data.data;
+ 			initSimpleDicts('all',['planType','taskType','urgencyLevel','priority','xmTaskSettleSchemel']).then(res=>{
+				this.dicts=res.data.data;
 			})
 			/**在下面写其它函数***/
 
diff --git a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
index ce4a910f..1debeae3 100644
--- a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
+++ b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
@@ -1,25 +1,25 @@
 <template>
   <section class="menu-box">
-		<el-table 
+		<el-table
 			ref="table"
-			:data="menus"
+			:data="menusCpd"
 			header-cell-class-name="head-row"
 			border
 			:height="tableHeight"
 			style="width: 100%">
 			<el-table-column :label="'需求 ('+menus.length + ')'" class-name="menu-name" width="200">
 				<template slot-scope="scope">
-					<div class="menu">{{scope.row.name}}</div>
+					<div class="menu">{{scope.row.menuName}}</div>
 				</template>
 			</el-table-column>
-			<template v-for="(type, tt) in taskState">
+			<template v-for="(type, tt) in taskStateCpd">
 				<el-table-column :label="type.label + '('+ type.number + ')'" :key="tt" width="450">
 					<template slot-scope="scope">
 						<draggable
 							:name="scope.row.menuId"
 							:sort="false"
 							@start="onStart" @end="onEnd"
-							:move="onMove"
+							@move="onMove"
 							:options="{group: scope.row.menuId}"
 							class="draggable"
 							animation="300"
@@ -32,7 +32,7 @@
 									<div class="drag-to-box">{{type.label}}</div>
 								</template> -->
 								<template
-									v-if="tasks && tasks[scope.row.menuId][tt].length"
+									v-if="tasks && tasksCpd[scope.row.menuId][tt].length"
 								>
 									<div
 										:data-menu-id="scope.row.menuId"
@@ -40,18 +40,18 @@
 										:data-task-state="task.taskState"
 										class="task"
 										v-for="(task, t) in tasks[scope.row.menuId][tt]"
-										:key="task.id"
+										:key="task.id+t"
 									>
 										<span>
 											{{task.sortLevel}}&nbsp;
 											<el-tag v-if="task.level<='2'" type="info">轻微</el-tag>
 											<el-tag v-else-if="task.level=='3'" type="warning">一般</el-tag>
 											<el-tag v-else-if="task.level=='4'" type="danger">紧急</el-tag>
-											<el-tag v-else type="danger">特急</el-tag> 
+											<el-tag v-else type="danger">特急</el-tag>
 											<span v-for="(item ,index) in [formatExeUsernames(task)]" :key="index">
 
 												<el-tooltip :content="item.exeUsernames" ><el-link     :type="item.type"     @click.stop="showExecusers(task)">{{item.showMsg}}</el-link></el-tooltip>
-												
+
 											</span>
 											<el-tooltip content="进度"><el-link style="border-radius:30px;" :type="task.rate>=100?'success':'warning'" @click="drawerVisible=true"> {{ (task.rate!=null?task.rate:0)+'%'}} </el-link></el-tooltip>
 											<el-tooltip content="预算金额、工时"><el-tag type="info">{{parseFloat(task.budgetCost/10000).toFixed(2)}}万,{{task.budgetWorkload}}人时</el-tag></el-tooltip>
@@ -64,7 +64,7 @@
 					</template>
 				</el-table-column>
 			</template>
-		</el-table> 
+		</el-table>
   </section>
 </template>
 
@@ -76,14 +76,16 @@ export default {
   name: "XmTaskAgileKanban",
   props: ["xmTasks", "tableHeight"],
   data() {
-    return {
-      taskState: [
-        { label: "待领取", status: 0, number: 0 },
-        { label: "已领取执行中", status: 1, number: 0 },
-        { label: "已完工", status: 2, number: 0 },
-        { label: "已结算", status: 3, number: 0 },
+    return {  
+		
+	  taskState:[
+        { label: "待领取", status: "0", number: 0 },
+        { label: "已领取执行中", status: "1", number: 0 },
+        { label: "已完工", status: "2", number: 0 },
+        { label: "已结算", status: "3", number: 0 },
       ],
-      tasks: {},
+	  tasks:{},
+	  menus:[],
 			drag: {
 				menuId: '',
 				state: '',
@@ -91,38 +93,30 @@ export default {
     };
   },
   components: { draggable },
-  watch: {},
+  watch: {
+	  xmTasks(){
+		  this.initData();
+	  }
+  },
   computed: {
-    menus() {
-      let xmTasks = JSON.parse(JSON.stringify(this.xmTasks || []));
-	  xmTasks=xmTasks.filter(i=>i.ntype=='0') 
-
-      let menus = [], menuIds = {}, tasks = {};
-			this.taskState.map(d => {
-				d.number = 0;
-				return d;
-			})
-      xmTasks.forEach((d, i) => {
-        if (!menus.length || !menuIds[d.menuId]) {
-          menus.push(d);
-          menuIds[d.menuId] = true;
-        }
-        if (!tasks[d.menuId]) {
-					tasks[d.menuId] = [[], [], [], []];
-        }
-        tasks[d.menuId][parseInt(d.taskState)].push(d);
-				this.taskState[parseInt(d.taskState)].number += 1;
-			});
-      this.tasks = tasks;
-      return menus;
+    menusCpd() { 
+      return this.menus;
     },
+	tasksCpd(){
+		return this.tasks;
+	},
+	taskStateCpd(){
+		return this.taskState;
+	}
+
   },
   methods: {
 		onMove(e) {
 			console.log('onMove--e==', e);
+			debugger;
 			let targetEl = { ...e.dragged.dataset };
 			let toEl = { ...e.to.dataset };
-			if (targetEl.menuId === toEl.menuId && targetEl.taskState !== toEl.taskState) {
+			if (targetEl.menuId === toEl.menuId && targetEl.taskState != toEl.taskState) {
 				console.log('onMove--true');
 				return true;
 			}
@@ -140,12 +134,23 @@ export default {
       this.drag = {};
 			// targetEl：拖拽的任务数据; toEl拖拽后的位置.
 			let targetEl = { ...e.item.dataset };
-			let toEl = { ...e.to.dataset }; 
-			if (targetEl.menuId === toEl.menuId && targetEl.taskState !== toEl.taskState) {
+			let toEl = { ...e.to.dataset };
+			if (targetEl.menuId === toEl.menuId && targetEl.taskState != toEl.taskState) {
  				let task = this.xmTasks.find(d => d.id === targetEl.taskId);
+				let taskIndex = this.xmTasks.findIndex(d => d.id === targetEl.taskId);
 				const params = { ...task, taskState: toEl.taskState };
-				editXmTask(params).then(res => { 
+				editXmTask(params).then(res => {
 					//this.$emit('submit');
+					var tips = res.data.tips;
+					if(tips.isOk){ 
+						this.taskState[parseInt(task.taskState)].number=this.taskState[parseInt(task.taskState)].number-1
+						this.taskState[parseInt(params.taskState)].number=this.taskState[parseInt(params.taskState)].number+1
+						task.taskState=params.taskState
+						this.$set(this.xmTasks,taskIndex,task)
+					}else{ 
+         				this.$notify({showClose:true,message:tips.msg,type:'error'})
+					}
+					return res.data.tips.isOk
 				})
  			} else {
  				return false
@@ -186,9 +191,37 @@ export default {
 				respons.showMsg="去设置"
 			}
 			return respons
+		},
+		initData(){
+			let xmTasks = JSON.parse(JSON.stringify(this.xmTasks || []));
+			xmTasks=xmTasks.filter(i=>i.ntype=='0')
+		
+			let menus = [], menuIds = {}, tasks = {};
+					this.taskState.map(d => {
+						d.number = 0;
+						return d;
+					})
+			xmTasks.forEach((d, i) => {
+				if(!d.menuId){
+					d.menuId="noMenuId"
+					d.menuName="未关联需求的任务"
+				}
+				if (!menus.length || !menuIds[d.menuId]) {
+				menus.push(d);
+				menuIds[d.menuId] = true;
+				}
+				if (!tasks[d.menuId]) {
+							tasks[d.menuId] = [[], [], [], []];
+				}
+				tasks[d.menuId][parseInt(d.taskState)].push(d);
+						this.taskState[parseInt(d.taskState)].number += 1;
+					});
+			this.tasks = tasks;
+			this.menus=menus;
 		}
   },
-  mounted(){ 	
+  mounted(){
+	  this.initData();
   }
 };
 </script>
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 9de25a0d..a4580e27 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -2,194 +2,194 @@
 	<section class="page-container padding">  
 		<el-row class="page-main ">
 			<!--新增界面 XmTask xm_task--> 
-			<el-form :model="editForm"  label-width="100px" :rules="editFormRules" ref="editForm">     
-				<el-card class="box-card" header="基础信息" id="baseInfo" shadow="hover">  
-					<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-form-item v-if="editForm.ptype==='0'" label="归属项目" prop="projectId"> 
-						{{editForm.projectName?editForm.projectName:editForm.projectId}}
-					</el-form-item>
-					
-					<el-form-item v-if="editForm.ptype==='1'" label="归属产品" prop="productId">
-						{{editForm.productName?editForm.productName:editForm.productId}}
-					</el-form-item>
-					
-					<el-form-item label="上级计划" prop="parentTaskname">  
-						<font v-if="editForm.parentTaskid" >{{editForm.parentTaskname?editForm.parentTaskname:editForm.parentTaskid}}</font> 
-						<font v-else>无上级(视为顶级)</font> 
-
-					</el-form-item>
-					<el-form-item label="名称" prop="name"> 
-							<el-input v-model="editForm.name" placeholder="名称" ></el-input>   
-					</el-form-item> 
-					<el-form-item label="序号" prop="sortLevel"> 
-						<el-input  v-model="editForm.sortLevel" style="width:30%;"   placeholder="如1.0或者1.2.3等" ></el-input> <font style="color:red;">如1.0或者1.2.3等</font>
-						<br/><el-checkbox v-model="editForm.milestone" :true-label="1" :false-label="0">标记为里程碑</el-checkbox>
-					</el-form-item>  
-					<el-form-item label="前置"> 
-						<el-tag v-if="editForm.preTaskid"  @close="clearPreTask" closable >{{editForm.preTaskname}}</el-tag>
-						<el-button    @click.stop="selectTaskVisible=true"  >选前置</el-button> 
-					</el-form-item>  
-					<el-row>
-						<el-col :span="8">
-							<el-form-item label="状态">  
-								<el-select v-model="editForm.taskState">
-									<el-option value="0" label="待领取"></el-option>
-									<el-option value="1" label="已领取执行中"></el-option>
-									<el-option value="2" label="已完工"></el-option>
-									<el-option value="3" label="已结算"></el-option>
-								</el-select>   
-							</el-form-item> 
-						</el-col>
-						<el-col :span="8">
-							<el-form-item  label="紧急程度" prop="level">  
-								<el-select v-model="editForm.level">
-										<el-option v-for="i in options.urgencyLevel" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option> 
-								</el-select>    
-							</el-form-item>  
-						</el-col>
-						<el-col :span="8">
-							<el-form-item  label="类型" prop="taskType">   
-								<el-select v-model="editForm.taskType">
-									<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
-								</el-select>  
-							</el-form-item>   
-						</el-col>
-					</el-row>
-					 
-					<el-form-item  label="所属需求" prop="menuId" id="menuInfo" v-if="editForm.ntype!='1'"> 
-						{{editForm.menuName}} &nbsp;&nbsp;&nbsp; <el-link @click="menuVisible=true" type="primary">{{editForm.menuName?'更改':'设置'}}</el-link>&nbsp;&nbsp;&nbsp;
-						<el-link v-if="editForm.menuName" @click="toMenu" type="primary">查看需求</el-link>
-					</el-form-item> 
-					<el-row>  
-						<el-col :span="12"> 
-							<el-form-item prop="skill" label="技能要求"  v-if="editForm.ntype!='1'">
-								<el-button class="useradd-icon" type="text" @click.stop="showSkill()" icon="el-icon-circle-plus-outline">增加</el-button>
-								<el-tag class="fs-ft" style="margin-right:10px" v-for="(item,i) in taskSkills" :key="i">{{item.taskSkillName}}</el-tag>
-							</el-form-item> 
-						</el-col>
-						<el-col :span="12">
-							<el-form-item  label="标签" prop="tagNames">   
-								<el-tag v-if="editForm.tagNames">{{editForm.tagNames?editForm.tagNames:''}} </el-tag>
-								<el-button type="text" icon="el-icon-plus" @click="tagSelectVisible=true">标签</el-button> 
-							</el-form-item>   
-						</el-col>
-					</el-row> 
-
-					<el-form-item :label="editForm.ntype=='1'?'计划描述':'任务描述'" prop="description">
-						<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="editForm.description" :placeholder="editForm.ntype=='1'?'计划描述':'任务描述'" ></el-input>
-					</el-form-item>   
-				</el-card>  
- 				<el-card class="box-card" id="planInfo" header="进度预测" shadow="hover"> 
-					<el-form-item label="负责人"> 
-						<el-tag  v-if="editForm.createUserid" style="margin-left:10px;border-radius:30px;"  >{{editForm.createUsername}}</el-tag>
- 						<el-button  @click="showGroupUserSelect(editForm)" icon="el-icon-setting">设置负责人</el-button>
-					</el-form-item> 
-					<el-form-item label="执行人" prop="executorUsername">
-						<el-tag  v-if="editForm.executorUserid" style="margin-left:10px;border-radius:30px;"  >{{editForm.executorUsername}}</el-tag>
- 						<el-button  @click="execGroupUserSelectVisible=true" icon="el-icon-setting">设置执行人</el-button>
-					</el-form-item>
-					<el-form-item label="预计时间"> 
-							<el-tooltip content="计划类型">
-								<el-select v-model=" editForm.planType" style="width:20%;">
-									<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
-								</el-select> 
-							</el-tooltip>
-							<el-date-picker
-								v-model="budgetDateRanger"
-								@change="onBudgetDateRangerChange"
-								class="hidden-sm-and-down"
-								type="daterange"
-								align="right"
-								unlink-panels
-								range-separator="至"
-								start-placeholder="计划开始日期"
-								end-placeholder="计划完成日期"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								:default-time="['00:00:00','23:59:59']"
-								:picker-options="pickerOptions"
-							></el-date-picker> 
-					</el-form-item>   
-					<el-form-item label="实际时间" prop="actStartTime">
-							<el-date-picker
-								v-model="actDateRanger"
-								class="hidden-sm-and-down"
-								type="daterange"
-								align="right"
-								unlink-panels
-								range-separator="至"
-								start-placeholder="实际开始日期"
-								end-placeholder="实际完成日期"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								:default-time="['00:00:00','23:59:59']"
-								:picker-options="pickerOptions"
-							></el-date-picker> 
-					</el-form-item>  
-					<el-form-item label="实际进度" prop="rate">
-						<el-slider
-							v-model="editForm.rate"
-							show-input>
-						</el-slider> 
-					</el-form-item>  
+			<el-form :model="editForm"  label-width="100px" :rules="editFormRules" ref="editForm">    
+				<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>
 							
-				</el-card>
+							<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-form-item v-if="editForm.ptype==='0'" label="归属项目" prop="projectId"> 
+							{{editForm.projectName?editForm.projectName:editForm.projectId}}
+						</el-form-item>
+						
+						<el-form-item v-if="editForm.ptype==='1'" label="归属产品" prop="productId">
+							{{editForm.productName?editForm.productName:editForm.productId}}
+						</el-form-item>
+						
+						<el-form-item label="上级计划" prop="parentTaskname">  
+							<font v-if="editForm.parentTaskid" >{{editForm.parentTaskname?editForm.parentTaskname:editForm.parentTaskid}}</font> 
+							<font v-else>无上级(视为顶级)</font> 
 
- 				<el-card class="box-card" header="工作量、成本" id="costInfo"> 
-					<el-form-item label="预估工作量" prop="budgetWorkload">
-						<el-input-number style="width:200px;"  v-model="editForm.budgetWorkload" @change="onBudgetWorkloadChange" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)"></el-input-number> <el-tag>人时，{{this.toFixed(editForm.budgetWorkload/8/20)}}人月</el-tag> 
-						 <br>
-						 <el-checkbox v-model="editForm.taskOut" @change="onTaskOutChange" true-label="1" false-label="0">是否为众包任务</el-checkbox> 
-					</el-form-item>  
-					<el-form-item label="预估金额" prop="taskOut">
-						<el-row v-if="editForm.taskOut!=='1'">
-							工时单价&nbsp;<el-input-number style="width:200px;"  v-model="editForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="工时单价"></el-input-number>   元/人时
- 						</el-row> 
-						<el-row v-if="editForm.taskOut==='1'">
- 							工时单价&nbsp;<el-input-number style="width:200px;" v-if="editForm.taskOut==='1'" v-model="editForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价"></el-input-number>   元/人时
+						</el-form-item>
+						<el-form-item label="名称" prop="name"> 
+								<el-input v-model="editForm.name" placeholder="名称" ></el-input>   
+						</el-form-item> 
+						<el-form-item label="序号" prop="sortLevel"> 
+							<el-input  v-model="editForm.sortLevel" style="width:30%;"   placeholder="如1.0或者1.2.3等" ></el-input> <font style="color:red;">如1.0或者1.2.3等</font>
+							<br/><el-checkbox v-model="editForm.milestone" :true-label="1" :false-label="0">标记为里程碑</el-checkbox>
+						</el-form-item>  
+						<el-form-item label="前置"> 
+							<el-tag v-if="editForm.preTaskid"  @close="clearPreTask" closable >{{editForm.preTaskname}}</el-tag>
+							<el-button    @click.stop="selectTaskVisible=true"  >选前置</el-button> 
+						</el-form-item>  
+						<el-row>
+							<el-col :span="8">
+								<el-form-item label="状态">  
+									<el-select v-model="editForm.taskState">
+										<el-option value="0" label="待领取"></el-option>
+										<el-option value="1" label="已领取执行中"></el-option>
+										<el-option value="2" label="已完工"></el-option>
+										<el-option value="3" label="已结算"></el-option>
+									</el-select>   
+								</el-form-item> 
+							</el-col>
+							<el-col :span="8">
+								<el-form-item  label="紧急程度" prop="level">  
+									<el-select v-model="editForm.level">
+											<el-option v-for="i in dicts.urgencyLevel" :label="i.name" :key="i.id" :value="i.id"></el-option> 
+									</el-select>    
+								</el-form-item>  
+							</el-col>
+							<el-col :span="8">
+								<el-form-item  label="类型" prop="taskType">   
+									<el-select v-model="editForm.taskType">
+										<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>  
+								</el-form-item>   
+							</el-col>
 						</el-row>
 						
-						预估金额&nbsp;<el-input-number style="width:200px;"  v-model="editForm.budgetCost" :precision="2" :step="1000" :min="0" placeholder="预算金额"></el-input-number>   元
-					</el-form-item>  
-					<el-form-item  label="实际工作量" prop="actWorkload" shadow="hover">
-						<el-input-number style="width:200px;"  disabled v-model="editForm.actWorkload" :precision="2" :step="8" :min="0" placeholder="实际工作量"></el-input-number>  <el-tag>由后台自动计算，无需填写</el-tag>     
-					</el-form-item> 
-					<el-form-item label="实际金额" prop="actCost">
-						<el-input-number  style="width:200px;"  disabled v-model="editForm.actCost" :precision="2" :step="1000" :min="0" placeholder="实际金额"></el-input-number>    <el-tag>由后台自动计算，无需填写</el-tag>  
-					</el-form-item>   
-				 </el-card>  
- 				<el-card class="box-card" header="结算信息" id="settleInfo" shadow="hover" v-if="editForm.ntype!='1'">   
-					<el-form-item label="" prop="taskClass">
-						<el-checkbox v-model="editForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox> 
-					</el-form-item>  
-					<el-form-item v-if="editForm.taskClass=='1'" label="结算方案" prop="settlSchemel"> 
-						<el-select v-model=" editForm.settleSchemel">
-							<el-option v-for="i in options.xmTaskSettleSchemel" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
-						</el-select>
-					</el-form-item>   
-				 </el-card>
-				 
-				<el-card class="box-card" header="众包" id="taskOut" v-if="editForm.ntype!='1'">  
-					<el-form-item label="" prop="toTaskCenter"> 
-						<el-checkbox v-model="editForm.toTaskCenter" true-label="1" false-label="0" id="toTaskCenter">发布到互联网任务大厅</el-checkbox>  
-					</el-form-item>   
-					<el-form-item label="众包流程" prop="taskOut" v-if="editForm.taskOut=='1'">
-						 <el-steps :active="calcTaskStep" align-center finish-status="success" simple>
-							<el-step title="发布" description="任务创建成功后即发布"></el-step>
-							<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
-							<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>
-							<el-step title="验收" description="任务完成后提交验收，验收通过，即可进行结算"></el-step>
-							<el-step title="结算" description="提交结算申请审批流程，审批过程自动根据审批结果进行结算"></el-step>
-							<el-step title="企业付款" description="结算流程审批通过，自动付款到个人钱包"></el-step> 
-							<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step> 
-						</el-steps>
-					</el-form-item> 
-				 </el-card>   
+						<el-form-item  label="所属需求" prop="menuId" id="menuInfo" v-if="editForm.ntype!='1'"> 
+							{{editForm.menuName}} &nbsp;&nbsp;&nbsp; <el-link @click="menuVisible=true" type="primary">{{editForm.menuName?'更改':'设置'}}</el-link>&nbsp;&nbsp;&nbsp;
+							<el-link v-if="editForm.menuName" @click="toMenu" type="primary">查看需求</el-link>
+						</el-form-item> 
+						<el-row>  
+							<el-col :span="12"> 
+								<el-form-item prop="skill" label="技能要求"  v-if="editForm.ntype!='1'">
+									<el-button class="useradd-icon" type="text" @click.stop="showSkill()" icon="el-icon-circle-plus-outline">增加</el-button>
+									<el-tag class="fs-ft" style="margin-right:10px" v-for="(item,i) in taskSkills" :key="i">{{item.taskSkillName}}</el-tag>
+								</el-form-item> 
+							</el-col>
+							<el-col :span="12">
+								<el-form-item  label="标签" prop="tagNames">   
+									<el-tag v-if="editForm.tagNames">{{editForm.tagNames?editForm.tagNames:''}} </el-tag>
+									<el-button type="text" icon="el-icon-plus" @click="tagSelectVisible=true">标签</el-button> 
+								</el-form-item>   
+							</el-col>
+						</el-row> 
+						
+						<el-form-item label="负责人"> 
+							<el-tag  v-if="editForm.createUserid" style="margin-left:10px;border-radius:30px;"  >{{editForm.createUsername}}</el-tag>
+							<el-button  @click="showGroupUserSelect(editForm)" icon="el-icon-setting">设置负责人</el-button>
+						</el-form-item> 
+						<el-form-item label="执行人" prop="executorUsername">
+							<el-tag  v-if="editForm.executorUserid" style="margin-left:10px;border-radius:30px;"  >{{editForm.executorUsername}}</el-tag>
+							<el-button  @click="execGroupUserSelectVisible=true" icon="el-icon-setting">设置执行人</el-button>
+						</el-form-item>
+						<el-form-item :label="editForm.ntype=='1'?'计划描述':'任务描述'" prop="description">
+							<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="editForm.description" :placeholder="editForm.ntype=='1'?'计划描述':'任务描述'" ></el-input>
+						</el-form-item>   
+					</el-collapse-item>
+					<el-collapse-item title="进度预测" name="2">
+						<el-form-item label="预计时间"> 
+								<el-tooltip content="计划类型">
+									<el-select v-model=" editForm.planType" style="width:20%;">
+										<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select> 
+								</el-tooltip>
+								<el-date-picker
+									v-model="budgetDateRanger"
+									@change="onBudgetDateRangerChange"
+									class="hidden-sm-and-down"
+									type="daterange"
+									align="right"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="计划开始日期"
+									end-placeholder="计划完成日期"
+									value-format="yyyy-MM-dd HH:mm:ss"
+									:default-time="['00:00:00','23:59:59']"
+									:picker-options="pickerOptions"
+								></el-date-picker> 
+						</el-form-item>   
+						<el-form-item label="预估工作量" prop="budgetWorkload">
+							<el-input-number style="width:200px;"  v-model="editForm.budgetWorkload" @change="onBudgetWorkloadChange" :precision="2" :step="8" :min="0" placeholder="预计总工作量(人时,不包括下一级)"></el-input-number> <el-tag>人时，{{this.toFixed(editForm.budgetWorkload/8/20)}}人月</el-tag> 
+							<br>
+							<el-checkbox v-model="editForm.taskOut" @change="onTaskOutChange" true-label="1" false-label="0">是否为众包任务</el-checkbox> 
+						</el-form-item>  
+						<el-form-item label="预估金额" prop="taskOut">
+							<el-row v-if="editForm.taskOut!=='1'">
+								工时单价&nbsp;<el-input-number style="width:200px;"  v-model="editForm.uniInnerPrice" :precision="2" :step="10" :min="0" placeholder="工时单价"></el-input-number>   元/人时
+							</el-row> 
+							<el-row v-if="editForm.taskOut==='1'">
+								工时单价&nbsp;<el-input-number style="width:200px;" v-if="editForm.taskOut==='1'" v-model="editForm.uniOutPrice" :precision="2" :step="10" :min="0" placeholder="外发工时单价"></el-input-number>   元/人时
+							</el-row>
+							
+							预估金额&nbsp;<el-input-number style="width:200px;"  v-model="editForm.budgetCost" :precision="2" :step="1000" :min="0" placeholder="预算金额"></el-input-number>   元
+						</el-form-item>  
+					</el-collapse-item>
+					<el-collapse-item title="实际进度、工作量与成本" name="3">
+						
+						<el-form-item label="实际时间" prop="actStartTime">
+								<el-date-picker
+									v-model="actDateRanger"
+									class="hidden-sm-and-down"
+									type="daterange"
+									align="right"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="实际开始日期"
+									end-placeholder="实际完成日期"
+									value-format="yyyy-MM-dd HH:mm:ss"
+									:default-time="['00:00:00','23:59:59']"
+									:picker-options="pickerOptions"
+								></el-date-picker> 
+						</el-form-item>  
+						<el-form-item label="实际进度" prop="rate">
+							<el-slider
+								v-model="editForm.rate"
+								show-input>
+							</el-slider> 
+						</el-form-item>  
+						<el-form-item  label="实际工作量" prop="actWorkload" shadow="hover">
+							<el-input-number style="width:200px;"  disabled v-model="editForm.actWorkload" :precision="2" :step="8" :min="0" placeholder="实际工作量"></el-input-number>  <el-tag>由后台自动计算，无需填写</el-tag>     
+						</el-form-item> 
+						<el-form-item label="实际金额" prop="actCost">
+							<el-input-number  style="width:200px;"  disabled v-model="editForm.actCost" :precision="2" :step="1000" :min="0" placeholder="实际金额"></el-input-number>    <el-tag>由后台自动计算，无需填写</el-tag>  
+						</el-form-item>   
+						</el-collapse-item>
+					<el-collapse-item title="结算信息" name="4"  v-if="editForm.ntype!='1'">
+						<el-form-item label="" prop="taskClass">
+							<el-checkbox v-model="editForm.taskClass" true-label="1" false-label="0">是否需要结算</el-checkbox> 
+						</el-form-item>  
+						<el-form-item v-if="editForm.taskClass=='1'" label="结算方案" prop="settlSchemel"> 
+							<el-select v-model=" editForm.settleSchemel">
+								<el-option v-for="i in dicts.xmTaskSettleSchemel" :label="i.name" :key="i.id" :value="i.id"></el-option>
+							</el-select>
+						</el-form-item>  
+					</el-collapse-item>
+					<el-collapse-item title="众包" name="5" v-if="editForm.ntype!='1'">
+						<el-form-item label="" prop="toTaskCenter"> 
+							<el-checkbox v-model="editForm.toTaskCenter" true-label="1" false-label="0" id="toTaskCenter">发布到互联网任务大厅</el-checkbox>  
+						</el-form-item>   
+						<el-form-item label="众包流程" prop="taskOut" v-if="editForm.taskOut=='1'">
+							<el-steps :active="calcTaskStep" align-center finish-status="success" simple>
+								<el-step title="发布" description="任务创建成功后即发布"></el-step>
+								<el-step title="竞标" description="候选人参与竞标，或者由责任人主动设置候选人"></el-step>
+								<el-step title="执行" description="候选人中标后，成为执行人，执行任务"></el-step>
+								<el-step title="验收" description="任务完成后提交验收，验收通过，即可进行结算"></el-step>
+								<el-step title="结算" description="提交结算申请审批流程，审批过程自动根据审批结果进行结算"></el-step>
+								<el-step title="企业付款" description="结算流程审批通过，自动付款到个人钱包"></el-step> 
+								<el-step title="提现" description="企业付款完成后，个人对钱包中余额进行提现"></el-step> 
+							</el-steps>
+						</el-form-item> 
+					</el-collapse-item>
+				</el-collapse>    
 			</el-form>  
 		</el-row>
 		<el-row class="padding">
@@ -201,10 +201,10 @@
 			<xm-skill-mng :visible="skillVisible" :task-id="editForm.id" @cancel="skillVisible=false" @getSkill="getSkill"></xm-skill-mng>
 		</el-drawer> -->
 		<el-drawer append-to-body title="选择执行人"  :visible.sync="execGroupUserSelectVisible" size="60%"    :close-on-click-modal="false">
-			<xm-group-select :visible="execGroupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="execGroupUserSelectConfirm"></xm-group-select>
+			<xm-group-select :pgClass="editForm.ptype" :xm-product="editForm.productId?{id:editForm.productId,productName:''}:null" :visible="execGroupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="execGroupUserSelectConfirm"></xm-group-select>
 		</el-drawer>
 		<el-drawer append-to-body title="选择负责人"  :visible.sync="groupUserSelectVisible" size="60%"    :close-on-click-modal="false">
-			<xm-group-select :visible="groupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-group-select>
+			<xm-group-select :pgClass="editForm.ptype" :xm-product="editForm.productId?{id:editForm.productId,productName:''}:null" :visible="groupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-group-select>
 		</el-drawer>
 		<el-drawer append-to-body title="新增技能"  :visible.sync="skillVisible" size="60%"    :close-on-click-modal="false">
 			<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
@@ -215,7 +215,7 @@
 		</el-drawer>
 		
 		<el-drawer title="选中任务"  :visible.sync="selectTaskVisible"  size="80%"  append-to-body   :close-on-click-modal="false">
-			<xm-task-list  :sel-project="xmProject"   @task-selected="onSelectedTask"></xm-task-list>
+			<xm-task-list :ptype="editForm.ptype" :xm-product="{id:editForm.productId,productName:''}" :sel-project="xmProject"   @task-selected="onSelectedTask"></xm-task-list>
 		</el-drawer> 	
 		
 		<el-drawer :title="'任务'+editForm.name+'的候选人'"  :visible.sync="execUserVisible" fullscreen size="60%" append-to-body  :close-on-click-modal="false">
@@ -235,7 +235,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import {editXmTask,setTaskCreateUser } from '@/api/xm/core/xmTask';
 	import { mapGetters } from 'vuex';
  	import {sn} from '@/common/js/sequence';
@@ -303,7 +303,7 @@
 			const endDate = new Date();
 			endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
 			return {
-				options:{
+				dicts:{
 					urgencyLevel:[],
 					taskType:[],
 					planType:[],
@@ -609,8 +609,8 @@
 			}
 			
 			this.setSkills();
-			listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'xmTaskSettleSchemel'}]).then(res=>{
-				this.options=res.data.data;
+			initSimpleDicts('all',['planType','taskType','urgencyLevel','priority','xmTaskSettleSchemel']).then(res=>{
+				this.dicts=res.data.data;
 			})
 			/**在下面写其它函数***/
 			
diff --git a/src/views/xm/core/xmTask/XmTaskGantt.vue b/src/views/xm/core/xmTask/XmTaskGantt.vue
index da476f4a..ba4358bf 100644
--- a/src/views/xm/core/xmTask/XmTaskGantt.vue
+++ b/src/views/xm/core/xmTask/XmTaskGantt.vue
@@ -1,8 +1,6 @@
 <template> 
   <section>
     <wl-gantt :data="tasks" 
-            :start-date="projectPhase.beginDate"
-            :end-date="projectPhase.endDate"
             :usePreColumn="true"
             :checkSource="true"
             :useRealTime="true"
@@ -21,7 +19,7 @@ import wlGantt from 'wl-gantt'
 import "wl-gantt/lib/wl-gantt.css" 
 Vue.use(wlGantt)
  export default {
-  props: ["tasks",'projectPhase'],
+  props: ["tasks"],
   watch:{
     tasks(tasks){
      }
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index f09b0830..e436d766 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -7,13 +7,13 @@
 							placement="right"
 							width="400"
 							trigger="click"> 
-							<xm-project-select v-if="ptype==='0' && (!selProject||!selProject.id)" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick"></xm-project-select>
-								<el-link type="warning" slot="reference" v-if="ptype==='0' && (!selProject||!selProject.id)"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
+							<xm-project-select v-if="ptype!=='1' && (!selProject||!selProject.id)" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClear"></xm-project-select>
+								<el-link type="warning" slot="reference" v-if="ptype!=='1' && (!selProject||!selProject.id)"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
 						</el-popover> 
 						
 						<el-select v-model="filters.taskType" placeholder="请选择任务类型" clearable @change="changeTaskType">
 							<el-option class="showall" value="all"  label="全部类型">全部类型</el-option>
-							<el-option  v-for="(i,index) in options.taskType" :value="i.optionValue" :label="i.optionName" :key="index">{{i.optionName}}</el-option>
+							<el-option  v-for="(i,index) in dicts.taskType" :value="i.id" :label="i.name" :key="index">{{i.name}}</el-option>
 						</el-select>   
 						<el-input v-model="filters.key" style="width:20%;" placeholder="任务、需求名称模糊查询">  
 						</el-input>
@@ -92,7 +92,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import treeTool from '@/common/js/treeTool';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { getTask ,listXmTask,editXmTask,editRate, delXmTask, batchDelXmTask,batchImportTaskFromTemplate,batchSaveBudget } from '@/api/xm/core/xmTask'; 
 	import { mapGetters } from 'vuex';  
 	import XmProjectSelect from '../xmProject/XmProjectSelect';
@@ -145,7 +145,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					urgencyLevel:[],
 					taskType:[],
 					planType:[],
@@ -254,6 +254,17 @@
 				if(this.ptype){ 
 					params.ptype=this.ptype
 				}
+				if(params.ptype!=='1'){
+					if(!params.projectId){
+						this.$notify({showClose:true,message:'请选择一个项目',type:'warning'})
+						return;
+					}
+				}else{
+					if(!params.productId){
+						this.$notify({showClose:true,message:'请选择一个产品',type:'warning'})
+						return;
+					}
+				}
 				getTask(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){ 
@@ -303,12 +314,7 @@
 				if (this.filters.selProject) {
 					params.projectId = this.filters.selProject.id;
 				}
-				params.workexec = "true";
-				if (this.projectPhase) {
-					{
-					params.phaseId = this.projectPhase.id;
-					}
-				}
+				params.workexec = "true"; 
 				if (this.isMy == "1") {
 					params.userid = this.userInfo.userid;
 					params.isMy = "1";
@@ -500,6 +506,11 @@
 				this.filters.selProject=project 
 				this.getXmTasks();
 			},  
+			onProjectClear(){
+				this.filters.selProject=null;
+				this.xmTasks=[];
+				this.searchXmTasks();
+			}
 		},//end methods
 		components: {   
 			 XmProjectSelect
@@ -512,8 +523,8 @@
 				this.tableHeight = util.calcTableMaxHeight(this.$refs.taskTable.$el); 
 				this.getXmTasks(); 
 			});
-				listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
-					this.options=res.data.data;
+				initSimpleDicts('all',['planType','taskType','urgencyLevel','priority']).then(res=>{
+					this.dicts=res.data.data;
 				})		
 		}
 	}
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index 5b3cf05e..30dd7cbc 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -3,7 +3,7 @@
 		<el-row class="xm-task"> 
 			<el-menu  active-text-color="#00abfc" :default-active="filters.taskType" @select="changeTaskType" class="el-menu-demo" mode="horizontal">
 				<el-menu-item index="all">全部任务类型</el-menu-item>
-				<el-menu-item v-for="(i,index) in options.taskType" :index="i.optionValue" :key="index">{{i.optionName}}</el-menu-item>
+				<el-menu-item v-for="(i,index) in dicts.taskType" :index="i.id" :key="index">{{i.name}}</el-menu-item>
 			</el-menu> 
 			<el-row>
 				<el-col :span="24">
@@ -90,7 +90,7 @@
 	import Vue from 'vue'
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { getTask ,listXmTask,editXmTask,editRate, delXmTask, batchDelXmTask,batchImportTaskFromTemplate,batchSaveBudget } from '@/api/xm/core/xmTask'; 
 	import { mapGetters } from 'vuex'; 
  	export default { 
@@ -127,7 +127,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					urgencyLevel:[],
 					taskType:[],
 					planType:[],
@@ -406,8 +406,8 @@
 				this.tableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmTasks(); 
 			});
-				listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
-					this.options=res.data.data;
+				initSimpleDicts('all',['planType','taskType','urgencyLevel','priority']).then(res=>{
+					this.dicts=res.data.data;
 				})		
 		}
 	}
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 7a144a84..308fcf6e 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -8,12 +8,13 @@
       >
         <el-row>  
           
-          <el-popover v-if="(!xmProduct||!xmProduct.id) && (!selProject || !selProject.id)"
+          <el-popover v-if=" ptype==='0' && (!selProject || !selProject.id)"
             placement="right"
             width="400"
-            trigger="click"> 
-            <xm-project-select v-if="!selProject||!selProject.id" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="filters.selProject=null"></xm-project-select>
-              <el-link type="warning" slot="reference" v-if="!selProject||!selProject.id"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
+            v-model="projectVisible"
+            trigger="manual"> 
+            <xm-project-select v-if="!selProject||!selProject.id" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClear" @close="projectVisible=false"></xm-project-select>
+              <el-link type="warning" @click="projectVisible=true" slot="reference" v-if="!selProject||!selProject.id"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
           </el-popover> 
 					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable>
 									<el-option value="0" label="待领取"></el-option>
@@ -74,11 +75,11 @@
               >全部类型</el-option
             >
             <el-option
-              v-for="(i, index) in options.taskType"
-              :value="i.optionValue"
-              :label="i.optionName"
+              v-for="(i, index) in dicts.taskType"
+              :value="i.id"
+              :label="i.name"
               :key="index"
-              >{{ i.optionName }}</el-option
+              >{{ i.name }}</el-option
             >
           </el-select>
           <el-checkbox
@@ -437,6 +438,11 @@
                 </template>
               </el-table-column>
               
+              <el-table-column sortable prop="productId" label="产品" width="100" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column sortable prop="projectId" label="项目" width="100" show-overflow-tooltip>
+              </el-table-column>
+              
               <el-table-column sortable prop="tagNames" label="标签" width="100">
               </el-table-column>
               <el-table-column
@@ -553,11 +559,7 @@
           </template>
           <xm-gantt
             v-if="displayType == 'grant'"
-            :tree-data="tasksTreeData"
-            :project-phase="{
-              startTime: currentProjectPhase.beginDate,
-              endTime: currentProjectPhase.endDate,
-            }"
+            :tree-data="tasksTreeData" 
             :useRealTime="true"
           ></xm-gantt>
         </el-row>
@@ -565,8 +567,7 @@
     </el-row>
     <el-row v-if="batchEditVisible">
       <xm-task-mng-batch
-        :sel-project="selProject"
-        :sel-project-phase="currentProjectPhase"
+        :sel-project="selProject" 
         :visible="batchEditVisible"
         :xmTasks="xmTasks"
         @back="batchEditBack"
@@ -750,8 +751,7 @@
     >
       <xm-task-edit
         :xm-project="currentProject"
-        :xm-task="editForm"
-        :project-phase="currentProjectPhase"
+        :xm-task="editForm" 
         :visible="editFormVisible"
         @cancel="editFormVisible = false"
         @after-add-submit="afterExecEditSubmit"
@@ -920,6 +920,7 @@
         :visible="menuGroupUser"
         :sel-project="selProject"
         :isSelectSingleUser="1"
+        :ptype="ptype"
         @user-confirm="seleConfirm"
       ></xm-group-select>
     </el-drawer>
@@ -934,6 +935,7 @@
         :visible="menuExecutor"
         :sel-project="selProject"
         :isSelectSingleUser="1"
+        :ptype="ptype"
         @user-confirm="seleExecutor"
       ></xm-group-select>
     </el-drawer>
@@ -961,6 +963,7 @@
         :visible="groupUserSelectVisible"
         :sel-project="selProject"
         :isSelectSingleUser="1"
+        :ptype="ptype"
         @user-confirm="groupUserSelectConfirm"
       ></xm-group-select>
     </el-drawer>
@@ -1005,7 +1008,7 @@ import Vue from "vue";
 import util from "@/common/js/util"; //全局公共库
 import treeTool from "@/common/js/treeTool"; //全局公共库
 //import Sticky from '@/components/Sticky' // 粘性header组件
-import { listOption } from "@/api/mdp/meta/itemOption"; //下拉框数据查询
+import { initSimpleDicts } from '@/api/mdp/meta/item'; //下拉框数据查询
 import {
   getTask,
   listXmTask,
@@ -1056,27 +1059,7 @@ export default {
       } else {
         return null;
       }
-    },
-    currentProjectPhase() {
-      if (this.projectPhase != null && this.projectPhase != undefined) {
-        return this.projectPhase;
-      } else {
-        var projectPhase = {};
-        if (
-          this.editForm && this.editForm.id
-        ) {
-          projectPhase.id = this.editForm.phaseId;
-          projectPhase.name = this.editForm.projectPhaseName;
-          projectPhase.taskType = this.editForm.taskType;
-          projectPhase.projectId = this.editForm.projectId;
-          projectPhase.projectName = this.editForm.projectName;
-          projectPhase.ntype="0"
-          return projectPhase;
-        } else {
-          return null;
-        }
-      }
-    },
+    }, 
     curUser() {
       return {
         id: this.userInfo.userid,
@@ -1181,7 +1164,7 @@ export default {
       },
       load: { list: false, edit: false, del: false, add: false }, //查询中...
       sels: [], //列表选中数据
-      options: {
+      dicts: {
         urgencyLevel: [],
         taskType: [],
         planType: [],
@@ -1276,8 +1259,7 @@ export default {
 
       skillVisible: false,
       skillIds: [],
-      taskSkills: [],
-      projectPhase: null,
+      taskSkills: [], 
       taskTemplateVisible: false,
       parentTask: null,
       projectInfoVisible: false,
@@ -1302,6 +1284,7 @@ export default {
       tagSelectVisible: false,
       batchRelTasksWithMenuVisible:false,
       selectParentTaskVisible:false,
+      projectVisible:false,
       maps:new Map(),
     };
   }, //end data
@@ -1396,10 +1379,20 @@ export default {
         params.ntype="1"
       }else if(this.queryScope==='task'){
         params.ntype="0"
-      } 
-      if(this.ptype){
-        params.ptype=this.ptype
+      }  
+      if(this.ptype==='1'){
+        if(!params.productId){
+          this.$notify.error("请先选中产品")
+          return;
+        } 
+      }else if(this.ptype==='0'){
+        if(!params.projectId){ 
+          this.$notify.error("请先选中项目")
+          return;
+        }
       }
+      params.ptype=this.ptype
+      
       getTask(params)
         .then((res) => {
           var tips = res.data.tips;
@@ -1594,6 +1587,7 @@ export default {
                 message: "请先选择项目",
                 type: "warning",
               });
+              this.projectVisible=true;
               return false;
           }else if(this.ptype==='1'){
             if( !this.filters.product && this.filters.product.id){
@@ -1602,6 +1596,8 @@ export default {
                 message: "请先选择产品",
                 type: "warning",
               });
+              
+              this.productSelectVisible=true;
               return false;
             }
           }
@@ -1954,21 +1950,7 @@ export default {
 
     handleSelect(key, keyPath) {
       this.drawerkey = key;
-    },
-    
-    projectPhaseRowClick: function (projectPhase) {
-       this.projectPhase = projectPhase;
-      if(projectPhase.ntype=='1'){
-        this.pageInfo.total=0;
-        this.xmTasks=[];
-        return;
-      } 
-      this.getXmTasks();
-    },
-    clearSelectPhase: function () {
-      this.projectPhase = null;
-      this.getXmTasks();
-    },
+    },  
     getDateString(dateStr) {
       if (dateStr == null || dateStr == "" || dateStr == undefined) {
         return "";
@@ -1982,12 +1964,12 @@ export default {
       }
     },
     formateOption: function (itemCode, value) {
-      if (this.options[itemCode]) {
-        var options = this.options[itemCode].filter(
-          (i) => i.optionValue == value
+      if (this.dicts[itemCode]) {
+        var dicts = this.dicts[itemCode].filter(
+          (i) => i.id == value
         );
-        if (options && options.length > 0) {
-          return options[0].optionName;
+        if (dicts && dicts.length > 0) {
+          return dicts[0].name;
         } else {
           return value;
         }
@@ -2005,15 +1987,15 @@ export default {
         return cellValue;
       }
       if (
-        this.options[key] == undefined ||
-        this.options[key] == null ||
-        this.options[key].length == 0
+        this.dicts[key] == undefined ||
+        this.dicts[key] == null ||
+        this.dicts[key].length == 0
       ) {
         return cellValue;
       }
-      var list = this.options[key].filter((i) => i.optionValue == cellValue);
+      var list = this.dicts[key].filter((i) => i.id == cellValue);
       if (list.length > 0) {
-        return list[0].optionName;
+        return list[0].name;
       } else {
         return cellValue;
       }
@@ -2123,6 +2105,13 @@ export default {
     }, 
     onProjectRowClick: function (project) {
       this.filters.selProject = project; 
+      this.projectVisible=false;
+      this.searchXmTasks();
+    },
+    onProjectClear(){
+      this.filters.selProject=null; 
+      this.projectVisible=false;
+      this.xmTasks=[]
       this.searchXmTasks();
     },
     handleCommand(command) {
@@ -2357,12 +2346,7 @@ export default {
       if (this.filters.selProject) {
         params.projectId = this.filters.selProject.id;
       }
-      params.workexec = "true";
-      if (this.projectPhase) {
-        {
-          params.phaseId = this.projectPhase.id;
-        }
-      }
+      params.workexec = "true"; 
       if (this.isMy == "1") {
         params.userid = this.userInfo.userid;
         params.isMy = "1";
@@ -2404,7 +2388,10 @@ export default {
     loadXmTaskLazy(tree, treeNode, resolve) {    
       this.maps.set(tree.id, { tree, treeNode, resolve }) //储存数据
         var params={parentTaskid:tree.id}
-        params=this.getParams(params);
+        params=this.getParams(params); 
+        if(params.projectId && params.productId){
+          params.ptype=""
+        }
         params.isTop=""
         this.load.list = true;
         var func=listXmTask 
@@ -2423,15 +2410,22 @@ export default {
       
     },
     showParentTaskList(){ 
-      if(this.filters.selProject && this.filters.selProject.id){
-        if(this.sels.length==0){
-          this.$notify({showClose:true,message:"请先选择一个或者多个需要更换上级的计划/任务",type:'warning'})
-          return;
+      if(this.sels.length==0){
+        this.$notify({showClose:true,message:"请先选择一个或者多个需要更换上级的计划/任务",type:'warning'})
+        return;
+      }
+      if(this.ptype==='0'){
+        if( !this.filters.selProject|| !this.filters.selProject.id){ 
+           this.$notify({showClose:true,message:"请先选择项目",type:'warning'})
+           return;
+        }  
+      }else if(this.ptype==='1'){
+        if( !this.filters.product|| !this.filters.product.id){ 
+           this.$notify({showClose:true,message:"请先选择产品",type:'warning'})
+           return;
         }
-         this.selectParentTaskVisible=true
-      }else{
-        this.$notify({showClose:true,message:"请先选择项目",type:'warning'})
       }
+      this.selectParentTaskVisible=true
      
     },
     onSelectedParentTask(task){
@@ -2501,14 +2495,8 @@ export default {
     this.$nextTick(() => {
       this.getXmTasks(); 
       this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);  
-      listOption([
-        { categoryId: "all", itemCode: "planType" },
-        { categoryId: "all", itemCode: "taskType" },
-        { categoryId: "all", itemCode: "urgencyLevel" },
-        { categoryId: "all", itemCode: "xmTaskSettleSchemel" },
-        { categoryId: "all", itemCode: "priority" },
-      ]).then((res) => {
-        this.options = res.data.data;
+      initSimpleDicts( "all", ["planType","taskType","urgencyLevel","xmTaskSettleSchemel","priority" ]).then((res) => {
+        this.dicts = res.data.data;
       });
     });
   },
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index e6cc65f6..9b57e21c 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -9,11 +9,6 @@
           icon="el-icon-finished"
           >保存</el-button
         >
-        <el-button
-          type="success"
-          @click="handlePopover(null, 'add')"
-          icon="el-icon-plus"
-        ></el-button>
         <el-button
           @click="noBatchEdit"
           v-loading="load.edit"
@@ -42,37 +37,7 @@
         >
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
           <el-table-column prop="sortLevel" label="序号/名称" width="350" fixed="left">
-            <template slot-scope="scope"> 
-              <el-popover placement="top" width="400" trigger="click">
-                <div style="text-align: center; margin: 0">
-                  <div
-                    :ref="'task_' + scope.$index"
-                    :data-task-id="scope.row.id"
-                  ></div>
-				  <!--
-                  <el-button
-                    type="primary"
-                    @click="handlePopover(scope.row, 'highestPmenuId')"
-                    >成为顶级节点</el-button
-                  >
-				  -->
-                  <el-button
-                    type="danger"
-                    @click="handlePopover(scope.row, 'delete')"
-                    >删除当前行</el-button
-                  >
-                  <el-button
-                    type="success"
-                    @click="handlePopover(scope.row, 'addSub')"
-                    >增加子行</el-button
-                  >
-                </div>
-                <el-button
-                  slot="reference" 
-                  :type="scope.row.opType ? 'success' : 'plain'"
-                  icon="el-icon-edit"
-                ></el-button>
-              </el-popover>
+            <template slot-scope="scope">  
               <el-input
                 style="width: 100px"
                 v-model="scope.row.sortLevel"
@@ -227,10 +192,10 @@
                 @change="fieldChange(scope.row, 'settleSchemel')"
               >
                 <el-option
-                  v-for="i in options.xmTaskSettleSchemel"
-                  :label="i.optionName"
-                  :key="i.optionValue"
-                  :value="i.optionValue"
+                  v-for="i in dicts.xmTaskSettleSchemel"
+                  :label="i.name"
+                  :key="i.id"
+                  :value="i.id"
                 ></el-option>
               </el-select>
             </template>
@@ -260,6 +225,7 @@
         :visible="batchExecUserSelectVisible"
         :sel-project="selProject"
         :isSelectSingleUser="1"
+        :ptype="ptype"
         @user-confirm="batchExecUserSelectConfirm"
       ></xm-group-select>
     </el-drawer>
@@ -275,6 +241,7 @@
         :visible="batchGroupUserSelectVisible"
         :sel-project="selProject"
         :isSelectSingleUser="1"
+        :ptype="ptype"
         @user-confirm="batchCreateUserSelectConfirm"
       ></xm-group-select>
     </el-drawer>
@@ -306,7 +273,7 @@ import Vue from "vue";
 import util from "@/common/js/util"; //全局公共库
 import treeTool from "@/common/js/treeTool"; //全局公共库
 //import Sticky from '@/components/Sticky' // 粘性header组件
-import { listOption } from "@/api/mdp/meta/itemOption"; //下拉框数据查询
+import { initSimpleDicts } from '@/api/mdp/meta/item'; //下拉框数据查询
 import {
   getTask,
   listXmTask,
@@ -383,7 +350,7 @@ export default {
       },
       load: { list: false, edit: false, del: false, add: false }, //查询中...
       sels: [], //列表选中数据
-      options: {
+      dicts: {
         urgencyLevel: [],
         taskType: [],
         planType: [],
@@ -1244,14 +1211,8 @@ export default {
     } 
     this.$nextTick(() => { 
       this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el); 
-      listOption([
-        { categoryId: "all", itemCode: "planType" },
-        { categoryId: "all", itemCode: "taskType" },
-        { categoryId: "all", itemCode: "urgencyLevel" },
-        { categoryId: "all", itemCode: "xmTaskSettleSchemel" },
-        { categoryId: "all", itemCode: "priority" },
-      ]).then((res) => {
-        this.options = res.data.data;
+      initSimpleDicts( "all",["planType","taskType","urgencyLevel","xmTaskSettleSchemel","priority"]).then((res) => {
+        this.dicts = res.data.data;
       });
     });
     // 阻止默认行为
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
index 774c351b..d4ce3a44 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
@@ -63,7 +63,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser';
 	import { mapGetters } from 'vuex'
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@@ -97,7 +97,7 @@
 			const endDate = new Date();
 			endDate.setTime(beginDate.getTime() + 3600 * 1000 * 24 * 7 * 4);
 			return {
-				options:{
+				dicts:{
 					projectTaskExecuserStatus:[],
 					projectTaskSettleStatus:[],
 
@@ -235,8 +235,8 @@
 			}
 			
 			/**在下面写其它函数***/
-			listOption([{categoryId:'all',itemCode:'projectTaskExecuserStatus'},{categoryId:'all',itemCode:'projectTaskSettleStatus'}]).then(res=>{
-				this.options=res.data.data;
+			initSimpleDicts('all',['projectTaskExecuserStatus','projectTaskSettleStatus']).then(res=>{
+				this.dicts=res.data.data;
 			})	
 		}//end mounted
 	}
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
index 519f9998..a1e67ba6 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
@@ -16,10 +16,10 @@
 				<el-form-item label="执行人状态" prop="status">
 					<el-select :disabled="editForm.status == '2'" style="width:100%;" placeholder="选择状态" v-model="editForm.status">
 						<el-option
-							v-for="(item,i) in options.projectTaskExecuserStatus"
+							v-for="(item,i) in dicts.projectTaskExecuserStatus"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item>
@@ -41,10 +41,10 @@
 				<el-form-item label="结算状态" prop="settleStatus">
 					<el-select style="width:100%;" placeholder="选择结算状态" v-model="editForm.settleStatus">
 						<el-option
-							v-for="(item,i) in options.projectTaskSettleStatus"
+							v-for="(item,i) in dicts.projectTaskSettleStatus"
 							:key="i"
-							:label="item.optionName"
-							:value="item.optionValue">
+							:label="item.name"
+							:value="item.id">
 						</el-option>
 					</el-select>
 				</el-form-item> 
@@ -70,7 +70,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser';
 	import { mapGetters } from 'vuex'
 	
@@ -95,7 +95,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
@@ -148,8 +148,8 @@
 			this.editForm=Object.assign(this.editForm, this.xmTaskExecuser);
 			this.execUser.userid = this.editForm.userid;
 			this.execUser.username = this.editForm.username;
-			listOption([{categoryId:'all',itemCode:'projectTaskExecuserStatus'},{categoryId:'all',itemCode:'projectTaskSettleStatus'}]).then(res=>{
-				this.options=res.data.data;
+			initSimpleDicts('all',['projectTaskExecuserStatus','projectTaskSettleStatus']).then(res=>{
+				this.dicts=res.data.data;
 			})	
 		}
 	}
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 968c0f3e..4d0e0df4 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -129,10 +129,10 @@
 						<el-select disabled style="width:100%;" placeholder="结算状态" v-model="settleForm.settleStatus">
 							<el-option
 								no-data-text="暂无结算状态"
-								v-for="(item,i) in options.projectTaskSettleStatus"
+								v-for="(item,i) in dicts.projectTaskSettleStatus"
 								:key="i"
-								:label="item.optionName"
-								:value="item.optionValue">
+								:label="item.name"
+								:value="item.id">
 							</el-option>
 						</el-select>
 					</el-form-item>
@@ -209,7 +209,7 @@
 	import config from "@/common/config"; //全局公共库
 
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmTaskExecuser,editXmTaskExecuser,leaveTask,beExecutor,settleExec, delXmTaskExecuser, batchDelXmTaskExecuser,quotePrice,becomeCandidate,toTest,testSuccess,testFail } from '@/api/xm/core/xmTaskExecuser';
 	import  XmTaskExecuserAdd from './XmTaskExecuserAdd';//新增界面
 	import  XmTaskExecuserEdit from './XmTaskExecuserEdit';//修改界面
@@ -249,7 +249,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					projectTaskExecuserStatus:[],
 					projectTaskSettleStatus:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
@@ -576,12 +576,12 @@
 				}else{
 					return cellValue
 				}
-				if(this.options[key]==undefined || this.options[key]==null || this.options[key].length==0   ){
+				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
 					return cellValue;
 				}
-				var list=this.options[key].filter(i=>i.optionValue==cellValue)
+				var list=this.dicts[key].filter(i=>i.id==cellValue)
 				if(list.length>0){
-					return list[0].optionName
+					return list[0].name
 				}else{
 					return cellValue;
 				}
@@ -821,8 +821,8 @@
 				this.getXmTaskExecusers();
 				});
 
-			listOption([{categoryId:'all',itemCode:'projectTaskExecuserStatus'},{categoryId:'all',itemCode:'projectTaskSettleStatus'}]).then(res=>{
-				this.options=res.data.data;
+			initSimpleDicts('all',['projectTaskExecuserStatus','projectTaskSettleStatus']).then(res=>{
+				this.dicts=res.data.data;
 			})
 		}
 	}
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
index 9e452778..8082036f 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
@@ -31,7 +31,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmTaskSkill } from '@/api/xm/core/xmTaskSkill';
 	import { mapGetters } from 'vuex'
 	
@@ -54,7 +54,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
index 28616d56..e1ca6df6 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
@@ -31,7 +31,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmTaskSkill } from '@/api/xm/core/xmTaskSkill';
 	import { mapGetters } from 'vuex'
 	
@@ -54,7 +54,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
index 470adee2..f40d235b 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
@@ -45,7 +45,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmTaskSkill, delXmTaskSkill, batchDelXmTaskSkill ,batchAddSkill } from '@/api/xm/core/xmTaskSkill';
 	import  XmTaskSkillAdd from './XmTaskSkillAdd';//新增界面
 	import  XmTaskSkillEdit from './XmTaskSkillEdit';//修改界面
@@ -83,7 +83,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				// addFormVisible: false,//新增xmTaskSkill界面是否显示
 				//新增xmTaskSkill界面初始化数据
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
index 2fa5d318..e0f35f8b 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
@@ -11,12 +11,12 @@
 				</el-form-item>
 				<el-form-item  label="计划类型" prop="planType"> 
 					<el-select v-model=" addForm.planType">
-						<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+						<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item  label="任务类型" prop="taskType"> 
 					<el-select v-model=" addForm.taskType">
-						<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+						<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item prop="skill" label="技能要求">
@@ -99,7 +99,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import {addXmTaskTemplate } from '@/api/xm/core/xmTaskTemplate';
 	import { mapGetters } from 'vuex';
 	import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件
@@ -157,7 +157,7 @@
 		},
 		data() { 
 			return { 
-				options:{ 
+				dicts:{ 
 					planType:[],
 					taskType:[],
 				},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -298,8 +298,8 @@
 				this.addForm=Object.assign(this.addForm, this.parentTaskTemplate); 
 			}
 			this.addForm.id = sn();
-			listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
-				this.options=res.data.data;
+			initSimpleDicts('all',['planType','taskType']).then(res=>{
+				this.dicts=res.data.data;
 			})
 			/**在下面写其它函数***/
 			
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
index 3e5a8c3d..b830c40f 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
@@ -11,12 +11,12 @@
 				</el-form-item>
 				<el-form-item  label="计划类型" prop="planType"> 
 					<el-select v-model=" editForm.planType">
-						<el-option v-for="i in this.options.planType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+						<el-option v-for="i in this.dicts.planType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item  label="任务类型" prop="taskType"> 
 					<el-select v-model=" editForm.taskType">
-						<el-option v-for="i in this.options.taskType" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
+						<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item prop="skill" label="技能要求">
@@ -99,7 +99,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import {editXmTaskTemplate } from '@/api/xm/core/xmTaskTemplate';
 	import { mapGetters } from 'vuex';
 	import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件
@@ -146,7 +146,7 @@
 		data() { 
 			return {
 				levelList:[{key:'H',value:"高"},{key:'M',value:"中"},{key:'L',value:"低"}],
-				options:{  
+				dicts:{  
 					planType:[],
 					taskType:[],
 				},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -268,8 +268,8 @@
 			this.fileVisible = this.visible;
 			this.editForm=Object.assign(this.editForm, this.xmTaskTemplate);
 			//this.editForm.id = sn();
-			listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'}]).then(res=>{
-				this.options=res.data.data;
+			initSimpleDicts('all',['planType','taskType']).then(res=>{
+				this.dicts=res.data.data;
 			})
 			/**在下面写其它函数***/
 			
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
index 9bb5cf24..6bab7561 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
@@ -49,7 +49,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import treeTool from '@/common/js/treeTool';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmTask  } from '@/api/xm/core/xmTask';  
 	import XmProductTplMng from '../xmProduct/XmProductTplMng'
 	import XmProjectTplMng from '../xmProject/XmProjectTplMng'
@@ -86,7 +86,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
 				addFormVisible: false,//新增xmTaskTemplate界面是否显示
 				//新增xmTaskTemplate界面初始化数据
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
index 5bbf53f4..817e971f 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
@@ -44,7 +44,7 @@
 	import util from '@/common/js/util';//全局公共库
 	import {sn} from '@/common/js/sequence';//全局公共库
 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { addXmTestCase } from '@/api/xm/core/xmTestCase';
 	import { mapGetters } from 'vuex'
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
@@ -69,7 +69,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					menuId: [
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index aa14d5b6..4097115e 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -44,7 +44,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmTestCase } from '@/api/xm/core/xmTestCase';
 	import { mapGetters } from 'vuex'
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
@@ -69,7 +69,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+				dicts:{},//下拉选择框的所有静态数据  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: {
 					menuId: [
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 1d640c28..154f5b65 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -128,7 +128,7 @@
 <script>
 	import util from '@/common/js/util';//全局公共库
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmTestCase, delXmTestCase, batchDelXmTestCase } from '@/api/xm/core/xmTestCase';
 	import  XmTestCaseAdd from './XmTestCaseAdd';//新增界面
 	import  XmTestCaseEdit from './XmTestCaseEdit';//修改界面
@@ -168,7 +168,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -458,9 +458,9 @@
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
index a7153e31..9575495d 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
@@ -73,7 +73,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
 	import { addXmTestCaseExec } from '@/api/xm/core/xmTestCaseExec';
 	import { mapGetters } from 'vuex'
 	
@@ -96,7 +96,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据  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, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
index 9b833500..842d9987 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
@@ -73,7 +73,7 @@
 
 <script>
 	import util from '@/common/js/util';//全局公共库
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { editXmTestCaseExec } from '@/api/xm/core/xmTestCaseExec';
 	import { mapGetters } from 'vuex'
 	
@@ -96,7 +96,7 @@
 	    },
 		data() {
 			return {
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				dicts:{},//下拉选择框的所有静态数据 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, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					id: [
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 0009208a..38e37f0b 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -211,7 +211,7 @@
 	import {sn} from '@/common/js/sequence';//全局公共库
 
 	import config from '@/common/config';//全局公共库 
-	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmTestCaseExec, delXmTestCaseExec, batchDelXmTestCaseExec,batchAddXmTestCaseExec,batchEditXmTestCaseExec } from '@/api/xm/core/xmTestCaseExec';
 	import { listXmTestCase} from '@/api/xm/core/xmTestCase';
 
@@ -267,7 +267,7 @@
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
-				options:{
+				dicts:{
 					//sex:[],
 				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
 				
@@ -767,9 +767,9 @@
 				this.getXmTestCaseExecs();
         	}); 
         	/** 举例，
-    		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
+    		initSimpleDicts( "all",["sex","grade"] ).then(res=>{
 				if(res.data.tips.isOk){ 
- 					this.options=res.data.data
+ 					this.dicts=res.data.data
 				}
 			});
 			**/