diff --git a/config/index.js b/config/index.js
index 319f6769..b4a435a5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -27,7 +27,7 @@ module.exports = {
                 '^/api/m1/workflow': '/workflow'
               }
           }, 
-          */
+          **/
         '/api': {
             target: 'https://www.qingqinkj.com',
             changeOrigin: true,
@@ -105,4 +105,4 @@ module.exports = {
     // Set to `true` or `false` to always turn it on or off
     bundleAnalyzerReport: process.env.npm_config_report
   }
-}
+}
\ No newline at end of file
diff --git a/src/views/xm/core/components/headEditor.vue b/src/views/xm/core/components/headEditor.vue
index 0f403936..245543d4 100644
--- a/src/views/xm/core/components/headEditor.vue
+++ b/src/views/xm/core/components/headEditor.vue
@@ -22,7 +22,7 @@ export default {
   props:["id","user","projectId","taskId","quoteId","replyId"],
   computed: {
     ...mapGetters([
-      'userInfo',
+      'userInfo','roles',
     ]),
   },
   data() {
diff --git a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
index 9640240e..8dc5b1a7 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentAdd.vue
@@ -44,7 +44,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmAttachment','visible'],
diff --git a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
index 21ca512d..80b53613 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentEdit.vue
@@ -44,7 +44,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmAttachment','visible'],
diff --git a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
index 80520ef9..dd5f1d16 100644
--- a/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
+++ b/src/views/xm/core/xmAttachment/XmAttachmentMng.vue
@@ -52,7 +52,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
index b4af3fac..5f09cbc9 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateAdd.vue
@@ -179,7 +179,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmBranchState','visible'],
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
index 83d86058..405a9149 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateEdit.vue
@@ -179,7 +179,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmBranchState','visible'],
diff --git a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
index 4cc2abf7..04815e5c 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
@@ -99,7 +99,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
index a1a9c2ee..629f518e 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue
@@ -83,7 +83,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmBranchTaskTypeState','visible'],
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
index ff47a589..c9911e4a 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue
@@ -83,7 +83,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmBranchTaskTypeState','visible'],
diff --git a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
index 843cc2ce..fb915fbc 100644
--- a/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
+++ b/src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue
@@ -65,7 +65,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
index 1ccda6fb..86628ff7 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListAdd.vue
@@ -79,7 +79,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmEnvList','visible'],
diff --git a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
index bd1cd63c..e06eba62 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListEdit.vue
@@ -79,7 +79,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmEnvList','visible'],
diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index c9609cd2..948d4096 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -66,7 +66,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmExchange/TaskUserEditor.vue b/src/views/xm/core/xmExchange/TaskUserEditor.vue
index 60e60983..9a77f6ea 100644
--- a/src/views/xm/core/xmExchange/TaskUserEditor.vue
+++ b/src/views/xm/core/xmExchange/TaskUserEditor.vue
@@ -23,7 +23,7 @@ export default {
   props:['id',"projectId","taskId",'user'],
   computed: {
     ...mapGetters([
-      'userInfo',
+      'userInfo','roles',
     ]),
   },
   data() {
diff --git a/src/views/xm/core/xmExchange/XmExchangeAdd.vue b/src/views/xm/core/xmExchange/XmExchangeAdd.vue
index 612c0696..54473902 100644
--- a/src/views/xm/core/xmExchange/XmExchangeAdd.vue
+++ b/src/views/xm/core/xmExchange/XmExchangeAdd.vue
@@ -92,7 +92,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmExchange','visible'],
diff --git a/src/views/xm/core/xmExchange/XmExchangeEdit.vue b/src/views/xm/core/xmExchange/XmExchangeEdit.vue
index 1000346d..7524d7ef 100644
--- a/src/views/xm/core/xmExchange/XmExchangeEdit.vue
+++ b/src/views/xm/core/xmExchange/XmExchangeEdit.vue
@@ -92,7 +92,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmExchange','visible'],
diff --git a/src/views/xm/core/xmExchange/XmExchangeMng.vue b/src/views/xm/core/xmExchange/XmExchangeMng.vue
index 183d28b6..5b8c967b 100644
--- a/src/views/xm/core/xmExchange/XmExchangeMng.vue
+++ b/src/views/xm/core/xmExchange/XmExchangeMng.vue
@@ -52,7 +52,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTask'],
diff --git a/src/views/xm/core/xmFile/XmFileAdd.vue b/src/views/xm/core/xmFile/XmFileAdd.vue
index d6b88a02..ba969281 100644
--- a/src/views/xm/core/xmFile/XmFileAdd.vue
+++ b/src/views/xm/core/xmFile/XmFileAdd.vue
@@ -42,7 +42,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmFile','visible'],
diff --git a/src/views/xm/core/xmFile/XmFileEdit.vue b/src/views/xm/core/xmFile/XmFileEdit.vue
index 76a79be7..ee2863f3 100644
--- a/src/views/xm/core/xmFile/XmFileEdit.vue
+++ b/src/views/xm/core/xmFile/XmFileEdit.vue
@@ -43,7 +43,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmFile','visible'],
diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue
index 21f518ee..baef646e 100644
--- a/src/views/xm/core/xmFile/XmFileMng.vue
+++ b/src/views/xm/core/xmFile/XmFileMng.vue
@@ -85,7 +85,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]),
 				Files() {
 					if(this.selProject != undefined){
diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
index bc34388f..0c43f9a8 100644
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue
@@ -50,7 +50,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIteration','visible','parentIteration'],
@@ -99,7 +99,7 @@
 			},
 			//新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit"
 			addSubmit: function () {
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以修改迭代", type:  'error' }); 
 					return ;
 				}
diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue
index 8a539909..ee669996 100644
--- a/src/views/xm/core/xmIteration/XmIterationEdit.vue
+++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue
@@ -50,7 +50,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIteration','visible'],
@@ -92,7 +92,7 @@
 			},
 			//新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit"
 			editSubmit: function () {
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以修改迭代", type:  'error' }); 
 					return ;
 				}
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 3633ec07..87fbb209 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -91,7 +91,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			xmIterationTreeData(){ 
@@ -232,7 +232,7 @@
 			},
 			//显示新增界面 XmIteration 迭代定义
 			showAdd: function () {
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以新增迭代", type:  'error' }); 
 					return ;
 				}
@@ -259,7 +259,7 @@
 			}, 
 			//删除xmIteration
 			handleDel: function (row,index) { 
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以删除迭代", type:  'error' }); 
 					return ;
 				}
@@ -281,7 +281,7 @@
 			},
 			//批量删除xmIteration
 			batchDel: function () {
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以删除迭代", type:  'error' }); 
 					return ;
 				}
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
index 2aefed3c..4966c544 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue
@@ -41,7 +41,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIterationMenu','visible'],
@@ -81,7 +81,7 @@
 			},
 			//新增提交XmIterationMenu 迭代定义 父组件监听@submit="afterAddSubmit"
 			addSubmit: function () {
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以操作", type:  'error' }); 
 					return ;
 				}
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
index 8e599f7f..536dd701 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue
@@ -41,7 +41,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIterationMenu','visible'],
@@ -81,7 +81,7 @@
 			},
 			//编辑提交XmIterationMenu 迭代定义父组件监听@submit="afterEditSubmit"
 			editSubmit: function () {
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以操作", type:  'error' }); 
 					return ;
 				}
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 29d18fa2..0d271b88 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -48,7 +48,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ]),
 			xmIterationMenusTreeData(){ 
 				return this.translateDataToTree(this.xmIterationMenus);
@@ -166,7 +166,7 @@
 			},
 			//显示新增界面 XmIterationMenu 迭代定义
 			showAdd: function () {
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以操作", type:  'error' }); 
 					return ;
 				}
@@ -187,7 +187,7 @@
 			}, 
 			//删除xmIterationMenu
 			handleDel: function (row,index) { 
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以操作", type:  'error' }); 
 					return ;
 				}
@@ -209,7 +209,7 @@
 			},
 			//批量删除xmIterationMenu
 			batchDel: function () {
-				if(!this.userInfo.isIterationAdmin){
+				if(!this.roles.some(i=>i.roleid=='iterationAdmin')){
 					this.$message({ message: "只有迭代管理员可以操作", type:  'error' }); 
 					return ;
 				}
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
index 9dff9ac6..5f93c212 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
@@ -86,7 +86,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIterationState','visible'],
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
index 94cc13a6..87b56eeb 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
@@ -86,7 +86,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIterationState','visible'],
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
index 22527544..3b0482d8 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
@@ -60,7 +60,7 @@ import TabPane from '../../../example/tab/components/tabPane.vue';
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIteration'],
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 4cec27e8..7abb0a27 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -43,7 +43,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenu','visible','parentMenu','product'],
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 85507a19..e2f05da6 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -43,7 +43,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenu','visible','parentMenu','product'],
@@ -93,7 +93,7 @@
 			//新增提交XmMenu 项目故事表 父组件监听@submit="afterAddSubmit"
 			editSubmit: function () {
 				
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index ea9099fc..f0564984 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -193,7 +193,7 @@
 		props:['selProject'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
       xmMenusTreeData() {
@@ -344,7 +344,7 @@
 			},
 			//显示新增界面 XmMenu xm_project_menu
 			showAdd: function () { 
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
@@ -357,7 +357,7 @@
 				//this.addForm=Object.assign({}, this.editForm);
 			},
 			showSubAdd:function(row){
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
@@ -702,7 +702,7 @@
 			},
 			showImportFromMenuTemplate(row){
 				
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
@@ -780,7 +780,7 @@
 			},
 			toBatchEdit(){
 				
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
@@ -797,7 +797,7 @@
 			},
 			batchSaveMenu(){
 				
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
@@ -846,7 +846,7 @@
 			},
 			showTaskList(row){ 
 				
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
diff --git a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
index 88bc781d..f2d478e8 100644
--- a/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
+++ b/src/views/xm/core/xmMenu/XmMenuRichDetail.vue
@@ -40,7 +40,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenu','visible','reload'],
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 6de717d1..eb10e976 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -68,7 +68,7 @@
 		props:['isSelectMenu','excludeIterationId','multi','visible'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			xmMenusTreeData(){ 
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index e578df3f..44bb70e8 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -138,7 +138,7 @@
 		props:[ 'selProject'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			xmMenusTreeData(){ 
@@ -299,7 +299,7 @@
 			}, 
 			//批量删除xmMenu
 			batchDel: function () {
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
@@ -393,7 +393,7 @@
 
 			},
 			showBatchEdit:function(){
-				if(!this.userInfo.isProductAdmin && !this.userInfo.isProductTeamAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
 					this.$message({ message: "只有产品经理、产品组长能够修改故事", type: 'error'}); 
 					return false;
 				}
diff --git a/src/views/xm/core/xmMenuExchange/MenuUserEditor.vue b/src/views/xm/core/xmMenuExchange/MenuUserEditor.vue
index 509690d7..f1cfae0f 100644
--- a/src/views/xm/core/xmMenuExchange/MenuUserEditor.vue
+++ b/src/views/xm/core/xmMenuExchange/MenuUserEditor.vue
@@ -23,7 +23,7 @@ export default {
   props:['id',"productId","menuId",'user'],
   computed: {
     ...mapGetters([
-      'userInfo',
+      'userInfo','roles',
     ]),
   },
   data() {
diff --git a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
index 4fcb1891..fcfa28fc 100644
--- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
+++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
@@ -72,7 +72,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenu','simple'],
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue
index 624202ca..1a95f2de 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue
@@ -161,7 +161,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuPlan','visible'],
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue
index ba9ccf57..7d2b5c8a 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue
@@ -161,7 +161,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuPlan','visible'],
diff --git a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
index 91ec8cef..93ae319b 100644
--- a/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
+++ b/src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue
@@ -91,7 +91,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
index 4db5e8c8..bd11ca0e 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
@@ -161,7 +161,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuState','visible'],
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
index 9979d425..7b23db5c 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
@@ -161,7 +161,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuState','visible'],
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index 67b34bf9..d98a3bd6 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -136,7 +136,7 @@
 		props:[ 'selProject'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			xmMenusTreeData(){ 
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
index de8b8395..d42f833e 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue
@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuTemplate','visible','parentMenu','product'],
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
index cbeb5308..56d04fbe 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue
@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuTemplate','visible'],
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index b3c30e76..e9d9997c 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@@ -103,7 +103,7 @@
 		props:['isSelectMenu'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
       xmMenuTemplatesTreeData() {
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
index 68ea8984..1a87fb9a 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue
@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMyFocus','visible'],
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
index 2127c0a1..0b64cb93 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue
@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMyFocus','visible'],
diff --git a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
index 216bd47d..87afc609 100644
--- a/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
+++ b/src/views/xm/core/xmMyFocus/XmMyFocusMng.vue
@@ -53,7 +53,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProduct/XmProductAdd.vue b/src/views/xm/core/xmProduct/XmProductAdd.vue
index 0adf50ce..35b9256e 100644
--- a/src/views/xm/core/xmProduct/XmProductAdd.vue
+++ b/src/views/xm/core/xmProduct/XmProductAdd.vue
@@ -44,7 +44,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProduct','visible'],
@@ -93,7 +93,7 @@
 			},
 			//新增提交XmProduct 产品表 父组件监听@submit="afterAddSubmit"
 			addSubmit: function () {
-				if(!this.userInfo.isProductAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin')){
 					this.$message({ message: "只有产品经理能够创建产品", type: 'error'}); 
 					return false;
 				}
diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index 292a3778..d5989da1 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -44,7 +44,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProduct','visible'],
@@ -118,7 +118,7 @@
 				});
 			},
 			selectUser(){
-				if(!this.userInfo.isProductAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin')){
 					this.$message({ message: "你不是产品经理，不能修改产品负责人", type:  'error' });  
 					return;
 				}
@@ -132,7 +132,7 @@
 				this.userSelectVisible=false
 			},
 			clearPmUser:function(){
-				if(!this.userInfo.isProductAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin')){
 					this.$message({ message: "你不是产品经理，不能修改产品负责人", type:  'error' });  
 					return;
 				}
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 17ae8b64..c9444829 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -93,7 +93,7 @@
 		props:['simple','isSelectProduct','selProject'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
@@ -222,7 +222,7 @@
 			},
 			//显示新增界面 XmProduct 产品表
 			showAdd: function () {
-				if(!this.userInfo.isProductAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin')){
 					this.$message({ message: "只有产品经理能够创建产品", type: 'error'}); 
 					return false;
 				}
@@ -244,7 +244,7 @@
 			}, 
 			//删除xmProduct
 			handleDel: function (row,index) { 
-				if(!this.userInfo.isProductAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin')){
 					this.$message({ message: "只有产品经理能够删除产品", type: 'error'}); 
 					return false;
 				}
@@ -266,7 +266,7 @@
 			},
 			//批量删除xmProduct
 			batchDel: function () {
-				if(!this.userInfo.isProductAdmin){
+				if(!this.roles.some(i=>i.roleid=='productAdmin')){
 					this.$message({ message: "只有产品经理能够删除产品", type: 'error'}); 
 					return false;
 				}
diff --git a/src/views/xm/core/xmProductState/XmProductStateAdd.vue b/src/views/xm/core/xmProductState/XmProductStateAdd.vue
index dab80684..cafb5282 100644
--- a/src/views/xm/core/xmProductState/XmProductStateAdd.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateAdd.vue
@@ -131,7 +131,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProductState','visible'],
diff --git a/src/views/xm/core/xmProductState/XmProductStateEdit.vue b/src/views/xm/core/xmProductState/XmProductStateEdit.vue
index 2cd7beca..e23fcfc7 100644
--- a/src/views/xm/core/xmProductState/XmProductStateEdit.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateEdit.vue
@@ -131,7 +131,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProductState','visible'],
diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue
index f43aa263..0d4eb6cc 100644
--- a/src/views/xm/core/xmProductState/XmProductStateMng.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue
@@ -48,7 +48,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProduct'],
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
index 48c9ec75..27ed0ed2 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue
@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProductTemplate','visible'],
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
index cf40ded7..11d7ac59 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue
@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProductTemplate','visible'],
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
index c8bc7a53..12eb4601 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
@@ -67,7 +67,7 @@
 		props:['simple','isSelectProduct'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue
index 7b31d260..e2ba63cd 100644
--- a/src/views/xm/core/xmProject/XmProjectAdd.vue
+++ b/src/views/xm/core/xmProject/XmProjectAdd.vue
@@ -160,7 +160,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 			
 			autoParams:function(){
@@ -344,7 +344,7 @@
 			},
 			//编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit"
 			addSubmit: function () {
-				if(!this.userInfo.isProjectAdmin){
+				if(!this.roles.some(i=>i.roleid=='projectAdmin')){
 					this.$message({ message: "只有项目经理可以建立项目", type: 'error' }); 
 					return;
 				}
diff --git a/src/views/xm/core/xmProject/XmProjectAllMng.vue b/src/views/xm/core/xmProject/XmProjectAllMng.vue
index 48fe7b98..27bbb225 100644
--- a/src/views/xm/core/xmProject/XmProjectAllMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectAllMng.vue
@@ -13,7 +13,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]), 
 		},
 		watch: {
diff --git a/src/views/xm/core/xmProject/XmProjectAssess.vue b/src/views/xm/core/xmProject/XmProjectAssess.vue
index bdf40ccc..d5b70ce9 100644
--- a/src/views/xm/core/xmProject/XmProjectAssess.vue
+++ b/src/views/xm/core/xmProject/XmProjectAssess.vue
@@ -56,7 +56,7 @@
 		props: ["selProject"],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]),
 				Leader() {
 					return this.selProject.leader.filter(i=>i.leadType == "负责人");
diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
index cd8c1c03..3b734f70 100644
--- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
@@ -113,7 +113,7 @@ import { months } from 'moment';
 		props: ["selProject"],
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			selYearMonths:function(){
 				var selYear=this.selYear;
diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue
index 2dead56c..0c2ac442 100644
--- a/src/views/xm/core/xmProject/XmProjectCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectCost.vue
@@ -113,7 +113,7 @@ import { months } from 'moment';
 		props: ["selProject"],
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			selYearMonths:function(){
 				var selYear=this.selYear;
diff --git a/src/views/xm/core/xmProject/XmProjectDetail.vue b/src/views/xm/core/xmProject/XmProjectDetail.vue
index f4ae0408..3f23f294 100644
--- a/src/views/xm/core/xmProject/XmProjectDetail.vue
+++ b/src/views/xm/core/xmProject/XmProjectDetail.vue
@@ -18,7 +18,7 @@
 		props: ["selProject"],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 		},
 		data() {
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index a920379a..59b994b0 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -168,7 +168,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 			
 			autoParams:function(){
@@ -353,7 +353,7 @@
 			},
 			//编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit"
 			editSubmit: function () {
-				if(!this.userInfo.isProjectAdmin){
+				if(!this.roles.some(i=>i.roleid=='projectAdmin')){
 					this.$message({ message: "只有项目经理可以修改项目", type: 'error' }); 
 					return;
 				}
@@ -483,7 +483,7 @@
 				return msg;
 			},
 			sendToProcessApprova:function(row,bizKey){ 
-				if(!this.userInfo.isProjectAdmin){
+				if(!this.roles.some(i=>i.roleid=='projectAdmin')){
 					this.$message({ message: "只有项目经理可以发起流程", type: 'error' }); 
 					return;
 				}
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 60ad5ce6..0b6faf6d 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -89,7 +89,7 @@
 		props: ["selProject","visible"],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 		}, 
 		watch:{
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index 3b9dbb94..e4096251 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -38,7 +38,7 @@
 	export default {  
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]), 
 		}, 
 		data() {
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 93a295cc..82daad7d 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -190,7 +190,7 @@
 		props:['dataScope'],
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			ScreenData() {
 				const key = this.menukey;
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
index 4077fa6b..f9ad6ff8 100644
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
+++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
@@ -143,7 +143,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectBaseline','visible'],
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
index e1ed0e80..06532899 100644
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
+++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
@@ -143,7 +143,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectBaseline','visible'],
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
index e5a561c6..7a6e2530 100644
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
+++ b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
@@ -85,7 +85,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
index 7766f520..956c90be 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue
@@ -29,7 +29,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectContract','visible'],
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
index f1d969b0..7f5004b7 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue
@@ -29,7 +29,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectContract','visible'],
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index 83d14e35..fcf18469 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['selProject'],
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
index 45bd9213..fc5c305b 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue
@@ -59,7 +59,7 @@
 	export default {
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectEnvList','visible',"currProject"],
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
index b375a69d..b9aed31a 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue
@@ -62,7 +62,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectEnvList','visible'],
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
index c8b7f980..ef7b09f6 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
@@ -92,7 +92,7 @@
 		props: ["selProject"],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue
index db0f8afe..a4dab8fb 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue
@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroup','visible'],
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
index ce0cff42..4d03138a 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroup','visible'],
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index a5963c53..01959c71 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -18,7 +18,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props: ["selProject" ,"isSelectSingleUser","isSelectMultiUser"],
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
index ab898cc2..f184282a 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
@@ -40,7 +40,7 @@
 	export default {
 		computed: {
 			...mapGetters([
-				'workShop','userInfo'
+				'workShop','userInfo','roles'
 			])
 		},
 		//
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
index a85a781b..7c5ff49a 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
@@ -111,7 +111,7 @@
 	export default {
 		computed: {
 			...mapGetters([
-				'workShop','userInfo'
+				'workShop','userInfo','roles'
 			])
 		},
 		//
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue
index ceb41aaf..8d468241 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue
@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupFormwork','visible'],
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue
index 2e40a8f1..f73d15a9 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue
@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupFormwork','visible'],
diff --git a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
index 8885c9f9..c4de2231 100644
--- a/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
+++ b/src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue
@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue
index 0da14c51..d021bff5 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue
@@ -131,7 +131,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupState','visible'],
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue
index a96fd49a..1c0cc5ab 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue
@@ -131,7 +131,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupState','visible'],
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
index e275fe91..bad1bcb5 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['selProject','visible'],
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue
index 373ec9fa..84019691 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue
@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupUser','visible'],
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
index da13de45..0f17a4bb 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupUser','visible'],
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index bc3404e7..aaac89ba 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
index aff0c801..d9a2c36b 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupUserCandidate','visible'],
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
index ecb28526..7906e1c4 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupUserCandidate','visible'],
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
index a8537371..3b6839c2 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
@@ -53,7 +53,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
index 978a46ff..2843ece2 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue
@@ -68,7 +68,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectKpi','visible'],
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
index 34533f84..9b4476f5 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue
@@ -68,7 +68,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectKpi','visible'],
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
index 36136255..f1bd9a58 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
@@ -70,7 +70,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props: ['selProject'],
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
index 1afbf421..2dd08789 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue
@@ -74,7 +74,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectKpiHis','visible'],
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
index c8ea812f..4a4b00a4 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue
@@ -74,7 +74,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectKpiHis','visible'],
diff --git a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
index 5f795011..c5f622ba 100644
--- a/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
+++ b/src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue
@@ -62,7 +62,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
index 5bcef0d7..6f85881b 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserAdd.vue
@@ -69,7 +69,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ]),
 		  'allMonths': function(){
 			  var bizzMonths=this.bizzMonths.map(i=>this.bizzYear+"-"+i);
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
index 19f74006..286e937b 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserEdit.vue
@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectMBudgetCostNouser','visible'],
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
index 630c8f98..5d7d5ee8 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
@@ -99,7 +99,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		}, 
 		props:["selProject",'budgetCostNouser','fieldName','queryType','visible'],
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
index fd101e88..b6ff4a53 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserAdd.vue
@@ -71,7 +71,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ]),
 		  'allMonths': function(){
 			  var bizzMonths=this.bizzMonths.map(i=>this.bizzYear+"-"+i);
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
index 1d5a0d80..4e718394 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserEdit.vue
@@ -54,7 +54,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectMBudgetCostUser','visible'],
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
index 35d1bd45..c46619b0 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
@@ -104,7 +104,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:["selProject",'budgetCostUser','fieldName','queryType','visible'],
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
index 27e78980..e47fae0a 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue
@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectMCostNouser','visible'],
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
index 2886d293..b2aa9148 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserEdit.vue
@@ -89,7 +89,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectMCostNouser','visible'],
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
index 109c73db..e5046d40 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
@@ -99,7 +99,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		}, 
 		props:["selProject",'costNouser','fieldName','queryType','visible'],
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
index 0a3a2ddf..bb2dfa8f 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue
@@ -61,7 +61,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectMCostUser','visible'],
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
index ccca4b3e..6cef9eb3 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue
@@ -92,7 +92,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectMCostUser','visible'],
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
index fe35c8e2..10aacd2a 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
@@ -84,7 +84,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['projectId','taskId','userid'],
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
index 07cf7417..5fe4ec5a 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
@@ -104,7 +104,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:["selProject",'costUser','fieldName','queryType','visible'],
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
index f52a88ac..f4de8461 100644
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
+++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectOptions','visible'],
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
index e32b996f..8f144aca 100644
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
+++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectOptions','visible'],
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
index 8e85eb05..28863c38 100644
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
+++ b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
index 1abebc15..ebd4a160 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue
@@ -115,7 +115,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			autoParams:function(){
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
index 58ad5ef9..8cfa0c25 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue
@@ -115,7 +115,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			autoParams:function(){
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 5c7a6979..05c047f1 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -261,7 +261,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
       projectPhaseTreeData() {
         let xmProjectPhases = JSON.parse(JSON.stringify(this.xmProjectPhases || []));
@@ -486,7 +486,7 @@
 			//显示编辑界面 XmProjectPhase xm_project_phase
 			showEdit: function ( row,index ) {
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -496,7 +496,7 @@
 			//显示新增界面 XmProjectPhase xm_project_phase
 			showAdd: function () { 
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -508,7 +508,7 @@
 			},
 			
 			showSubAdd: function (parentProjectPhase) {  
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -620,7 +620,7 @@
 			//删除xmProjectPhase
 			handleDel: function (row,index) { 
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -652,7 +652,7 @@
 			//批量删除xmProjectPhase
 			batchDel: function () {
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -684,7 +684,7 @@
 			},
 			showPhaseTemplate: function(parentPhase){
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -788,7 +788,7 @@
 			
 			sendToProcessApprova:function(row,bizKey){   
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -875,7 +875,7 @@
 			},  
 			handleCommand(command) { 
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -1040,7 +1040,7 @@
 			},
 			saveBatchEdit:function(){
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -1373,7 +1373,7 @@
 			},
 			showMenu:function(parentPhase){
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
@@ -1399,7 +1399,7 @@
 			},
 			handlePopover:function(row,opType){
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin') ){
 					this.$message({ message: "只有项目经理、小组组长可以操作阶段计划", type: 'error' });
 					return; 
 				}
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
index 29730664..4ad5dc46 100644
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
+++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
@@ -89,7 +89,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectPhaseBaseline','visible'],
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
index 8f4c78ce..7a2c8966 100644
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
+++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
@@ -89,7 +89,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectPhaseBaseline','visible'],
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
index ecd58cce..136577dd 100644
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
+++ b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
@@ -67,7 +67,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue
index 4d702d5e..671d8517 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue
@@ -60,7 +60,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ]),
 			autoParams:function(){
 				
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue
index 12915d26..ed5e5d7d 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue
@@ -60,7 +60,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ]),
 			autoParams:function(){
 				
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
index 244df8e1..f5719087 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
@@ -81,7 +81,7 @@
 		props:['xmType','selProjectTemplate','simple','isSelect'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]), 
 			xmProjectPhaseTemplateTreeData(){ 
 				return this.translateDataToTree(this.xmProjectPhaseTemplates);
diff --git a/src/views/xm/core/xmProjectState/XmCockpit.vue b/src/views/xm/core/xmProjectState/XmCockpit.vue
index f314c7f1..3c80f6e0 100644
--- a/src/views/xm/core/xmProjectState/XmCockpit.vue
+++ b/src/views/xm/core/xmProjectState/XmCockpit.vue
@@ -116,7 +116,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
index 6d732485..4f046a68 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
@@ -191,7 +191,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectState','visible'],
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
index 7582d30a..9d808a58 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateEdit.vue
@@ -191,7 +191,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectState','visible'],
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index 931279a2..2f648822 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
@@ -124,7 +124,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['selProject'],
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
index 68e75178..377c3868 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue
@@ -116,7 +116,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectStateHis','visible'],
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
index 12d35186..5f82cd04 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue
@@ -116,7 +116,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectStateHis','visible'],
diff --git a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
index 751e668c..4677fefd 100644
--- a/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
+++ b/src/views/xm/core/xmProjectStateHis/XmProjectStateHisMng.vue
@@ -76,7 +76,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
index d47dfb05..21f3f3b0 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue
@@ -86,7 +86,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectTaskTypeState','visible'],
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
index 0357501b..5f695b6b 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue
@@ -86,7 +86,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectTaskTypeState','visible'],
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
index 6a08893f..6eea039e 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
@@ -66,7 +66,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
index f5f4cc2b..8de382c8 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue
@@ -142,7 +142,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 			
 			autoParams:function(){
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
index a4dbe619..d1165ba1 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue
@@ -150,7 +150,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 			
 			autoParams:function(){
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
index 98722a01..880f8f1e 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue
@@ -31,7 +31,7 @@
 		props: ["selProjectTemplate"],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 		}, 
 		watch:{
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
index d7765d87..172e0edd 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
@@ -48,7 +48,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
index d29808f6..424e73ea 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
@@ -72,7 +72,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index 92648b8a..dfb9a28a 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -107,7 +107,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),  
 		},
 		props:['xmQuestion','visible',"selProject",'qtype','xmTestCaseExec','xmTestCase'],
diff --git a/src/views/xm/core/xmQuestion/XmQuestionCenter.vue b/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
index 84c7d86c..0d0f2891 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionCenter.vue
@@ -71,7 +71,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 6debeeee..a17b39c9 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -123,7 +123,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),  
 		},
 		props:['xmQuestion','visible',"selProject"],
@@ -253,7 +253,7 @@
 			handleQuestion:function(tardgetBugStatus){
 				var oldBugStatus=this.editForm.bugStatus;  
 				if(tardgetBugStatus=="closed"){ 
-					if( !this.userInfo.isTestAdmin && !this.userInfo.isTester && !this.userInfo.isTestTeamAdmin ){
+					if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 						this.$message({message:"只有测试经理、测试组长、测试员可以关闭bug",type:"error"});
 						return ;
 					}
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index c38ec1a6..17d1925d 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -113,7 +113,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]), 
 		},
 		props: ["selProject",'qtype','xmTestCaseExec','xmTestCase','visible'],
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue
index 86ba411e..f93da7ae 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue
@@ -74,7 +74,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmQuestionHandle','visible'],
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue
index cdad66a4..8a8a89af 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue
@@ -74,7 +74,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmQuestionHandle','visible'],
diff --git a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
index 7a9c75db..8d97d9e2 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
@@ -62,7 +62,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
index 432a6bc6..021ec187 100644
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
+++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
@@ -38,7 +38,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmQuestionTag','visible'],
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
index 1d672d27..1f6091db 100644
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
+++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
@@ -38,7 +38,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmQuestionTag','visible'],
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
index 3ae56de1..3885338c 100644
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
+++ b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
@@ -50,7 +50,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index 40687631..c06e8ca8 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -57,7 +57,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:["projectId","objType","objId","simple" ,"visible"],
diff --git a/src/views/xm/core/xmRecord/XmRecordMng.vue b/src/views/xm/core/xmRecord/XmRecordMng.vue
index 162a7ba1..151aa02d 100644
--- a/src/views/xm/core/xmRecord/XmRecordMng.vue
+++ b/src/views/xm/core/xmRecord/XmRecordMng.vue
@@ -19,7 +19,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['selProject'],
diff --git a/src/views/xm/core/xmTask/XmMyTaskCenter.vue b/src/views/xm/core/xmTask/XmMyTaskCenter.vue
index 705c66db..8244f444 100644
--- a/src/views/xm/core/xmTask/XmMyTaskCenter.vue
+++ b/src/views/xm/core/xmTask/XmMyTaskCenter.vue
@@ -15,7 +15,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			 
 		}, 
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index f8453e2a..9467da21 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -170,7 +170,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),   
 		},
 		props:['xmTask','visible','xmProject','projectPhase',"parentTask"],
diff --git a/src/views/xm/core/xmTask/XmTaskCenter.vue b/src/views/xm/core/xmTask/XmTaskCenter.vue
index 2b0f4437..3b6f715d 100644
--- a/src/views/xm/core/xmTask/XmTaskCenter.vue
+++ b/src/views/xm/core/xmTask/XmTaskCenter.vue
@@ -15,7 +15,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			 
 		}, 
diff --git a/src/views/xm/core/xmTask/XmTaskCenterForProduct.vue b/src/views/xm/core/xmTask/XmTaskCenterForProduct.vue
index f3553e22..38c330ee 100644
--- a/src/views/xm/core/xmTask/XmTaskCenterForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskCenterForProduct.vue
@@ -15,7 +15,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			 
 		}, 
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 582a3e98..9ee40d20 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -170,7 +170,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),   
 		},
 		props:['xmTask','visible','xmProject','projectPhase',"parentTask"],
@@ -253,7 +253,7 @@
 			},
 			//新增提交XmTask xm_task 父组件监听@submit="afterAddSubmit"
 			editSubmit: function () {
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return;
 				}
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index fa465330..ea630fbc 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -83,7 +83,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),  
 			tasksTreeData() {
 				 return this.translateDataToTree(this.xmTasks);
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index a83199a8..984d53e0 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -102,7 +102,7 @@
  	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]), 
 			 
 			tasksTreeData() {
diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
index 19d626f2..57d7f901 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -111,7 +111,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),  
 			tasksTreeData() {
 				 return this.translateDataToTree(this.xmTasks);
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index c8b6b697..83300fbf 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -466,7 +466,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			currentProject(){
 				if(this.filters.selProject){
@@ -872,7 +872,7 @@
 			},
 			showTaskTemplate:function(){
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return;
 				}
@@ -884,7 +884,7 @@
 			},
 			showSubAdd(row) { 
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return;
 				}
@@ -895,7 +895,7 @@
 			//显示新增界面 XmTask xm_task
 			showAdd: function () {
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return;
 				}
@@ -921,7 +921,7 @@
 			//删除xmTask
 			handleDel: function (row,index) { 
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return;
 				}
@@ -944,7 +944,7 @@
 			//批量删除xmTask
 			batchDel: function () {
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return;
 				}
@@ -989,7 +989,7 @@
 			},
 			showMenu:function(parentTask){
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return;
 				}
@@ -1279,7 +1279,7 @@
 			},
 			showBatchEdit:function(){
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return; 
 				}
@@ -1290,7 +1290,7 @@
 				this.batchEditVisible=true
 			},
 			saveBatchEdit:function(){
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return;
 				}
@@ -1450,7 +1450,7 @@
 			},
 			handlePopover:function(row,opType){
 				
-				if( !this.userInfo.isProjectAdmin && !this.userInfo.isTeamAdmin){
+				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作"); 
 					return; 
 				}
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
index 76066593..a0da4d15 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue
@@ -71,7 +71,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTaskExecuser','visible',"execUserList","xmTask",'execuserAddType'],
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
index e00fa37b..ca15bba0 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue
@@ -77,7 +77,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTaskExecuser','visible',"execUserList","xmTask"],
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index d2b1200f..bbb1259e 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -196,7 +196,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 		},
 		props: ["visible","xmTask","isMy"],
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
index f696fa66..69c6a003 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue
@@ -38,7 +38,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTaskSkill','visible'],
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
index 2262ae59..63bc81f1 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue
@@ -38,7 +38,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTaskSkill','visible'],
diff --git a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
index 87a2c2d9..0dc3cbf6 100644
--- a/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
+++ b/src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue
@@ -56,7 +56,7 @@
 		props: ["visible","taskId"],
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 		},
 		watch:{
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
index 916a1d7d..492089df 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue
@@ -111,7 +111,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			//任务工时
 			TaskTime() {
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
index cc6875ce..f26513d8 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue
@@ -111,7 +111,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			//任务工时
 			TaskTime() {
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
index f85a3779..a0cf0106 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
@@ -88,7 +88,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			xmTaskTemplatesTreeData() {
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
index 69e30cf1..93966b03 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
@@ -53,7 +53,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTestCase','visible'],
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index 971e8ab3..9443c9bd 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -53,7 +53,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTestCase','visible'],
@@ -98,7 +98,7 @@
 			//新增提交XmTestCase 测试用例 父组件监听@submit="afterAddSubmit"
 			editSubmit: function () {
 				
-				if( !this.userInfo.isTestAdmin && !this.userInfo.isTester && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"});
 					return ;
 				}
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index b57e8b51..a7f66210 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -73,7 +73,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['multiSelect'],
@@ -184,7 +184,7 @@
 			},
 			//显示新增界面 XmTestCase 测试用例
 			showAdd: function () { 
-				if( !this.userInfo.isTestAdmin && !this.userInfo.isTester && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"});
 					return ;
 				}
@@ -205,11 +205,11 @@
 			}, 
 			//删除xmTestCase
 			handleDel: function (row,index) { 
-				if( !this.userInfo.isTestAdmin && !this.userInfo.isTester && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"});
 					return ;
 				}
-				if(!this.userInfo.isTestAdmin){
+				if(!this.roles.some(i=>i.roleid=='testAdmin')){
 					this.$message({ message: "只有测试管理员才能删除测试用例", type: 'error' });
 					return;
 				}
@@ -231,11 +231,11 @@
 			},
 			//批量删除xmTestCase
 			batchDel: function () {
-				if( !this.userInfo.isTestAdmin && !this.userInfo.isTester && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"});
 					return ;
 				}
-				if(!this.userInfo.isTestAdmin){
+				if(!this.roles.some(i=>i.roleid=='testAdmin')){
 					this.$message({ message: "只有测试管理员才能删除测试用例", type: 'error' });
 					return;
 				}
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
index 129d24ac..7ecb0cbf 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue
@@ -80,7 +80,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTestCaseExec','visible'],
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
index 79418fe0..61a56866 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue
@@ -80,7 +80,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTestCaseExec','visible'],
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 939756eb..1ab0e247 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -166,7 +166,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
         ]),
 		},
 		props:['selProject'],
@@ -326,7 +326,7 @@
 			}, 
 			//删除xmTestCaseExec
 			handleDel: function (row,index) {  
-				if( !this.userInfo.isTestAdmin  && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin')  && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长可以操作",type:"error"});
 					return ;
 				}
@@ -348,7 +348,7 @@
 			},
 			//批量删除xmTestCaseExec
 			batchDel: function () { 
-				if( !this.userInfo.isTestAdmin  && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin')  && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长可以操作",type:"error"});
 					return ;
 				}
@@ -408,7 +408,7 @@
 
 			},
 			showCase(){
-				if( !this.userInfo.isTestAdmin   && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin')   && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长可以操作",type:"error"});
 					return ;
 				}
@@ -476,7 +476,7 @@
 				this.getXmTestCaseExecs();
 			},	
 			showBatchEdit:function(){ 
-				if( !this.userInfo.isTestAdmin && !this.userInfo.isTester && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"});
 					return ;
 				}
@@ -490,7 +490,7 @@
 			},
 			batchEditXmTestCaseExec:function(){
 				
-				if( !this.userInfo.isTestAdmin && !this.userInfo.isTester && !this.userInfo.isTestTeamAdmin ){
+				if( !this.roles.some(i=>i.roleid=='testAdmin') && !this.roles.some(i=>i.roleid=='tester') && !this.roles.some(i=>i.roleid=='testTeamAdmin') ){
 					this.$message({message:"只有测试经理、测试组长、测试员可以操作",type:"error"});
 					return ;
 				}