角色判断修改

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
   }
-}
+}

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() {

src/views/xm/core/xmAttachment/XmAttachmentAdd.vue

@@ -44,7 +44,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmAttachment','visible'],

src/views/xm/core/xmAttachment/XmAttachmentEdit.vue

@@ -44,7 +44,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmAttachment','visible'],

src/views/xm/core/xmAttachment/XmAttachmentMng.vue

@@ -52,7 +52,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmBranchState/XmBranchStateAdd.vue

@@ -179,7 +179,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmBranchState','visible'],

src/views/xm/core/xmBranchState/XmBranchStateEdit.vue

@@ -179,7 +179,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmBranchState','visible'],

src/views/xm/core/xmBranchState/XmBranchStateMng.vue

@@ -99,7 +99,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue

@@ -83,7 +83,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmBranchTaskTypeState','visible'],

src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue

@@ -83,7 +83,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmBranchTaskTypeState','visible'],

src/views/xm/core/xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue

@@ -65,7 +65,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmEnvList/XmEnvListAdd.vue

@@ -79,7 +79,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmEnvList','visible'],

src/views/xm/core/xmEnvList/XmEnvListEdit.vue

@@ -79,7 +79,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmEnvList','visible'],

src/views/xm/core/xmEnvList/XmEnvListMng.vue

@@ -66,7 +66,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmExchange/TaskUserEditor.vue

@@ -23,7 +23,7 @@ export default {
   props:['id',"projectId","taskId",'user'],
   computed: {
     ...mapGetters([
-      'userInfo',
+      'userInfo','roles',
     ]),
   },
   data() {

src/views/xm/core/xmExchange/XmExchangeAdd.vue

@@ -92,7 +92,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmExchange','visible'],

src/views/xm/core/xmExchange/XmExchangeEdit.vue

@@ -92,7 +92,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmExchange','visible'],

src/views/xm/core/xmExchange/XmExchangeMng.vue

@@ -52,7 +52,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmTask'],

src/views/xm/core/xmFile/XmFileAdd.vue

@@ -42,7 +42,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmFile','visible'],

src/views/xm/core/xmFile/XmFileEdit.vue

@@ -43,7 +43,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmFile','visible'],

src/views/xm/core/xmFile/XmFileMng.vue

@@ -85,7 +85,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]),
 				Files() {
 					if(this.selProject != undefined){

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 ;
 				}

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 ;
 				}

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 ;
 				}

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 ;
 				}

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 ;
 				}

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 ;
 				}

src/views/xm/core/xmIterationState/XmIterationStateAdd.vue

@@ -86,7 +86,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIterationState','visible'],

src/views/xm/core/xmIterationState/XmIterationStateEdit.vue

@@ -86,7 +86,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmIterationState','visible'],

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'],

src/views/xm/core/xmMenu/XmMenuAdd.vue

@@ -43,7 +43,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenu','visible','parentMenu','product'],

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;
 				}

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;
 				}

src/views/xm/core/xmMenu/XmMenuRichDetail.vue

@@ -40,7 +40,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenu','visible','reload'],

src/views/xm/core/xmMenu/XmMenuSelect.vue

@@ -68,7 +68,7 @@
 		props:['isSelectMenu','excludeIterationId','multi','visible'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			xmMenusTreeData(){ 

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;
 				}

src/views/xm/core/xmMenuExchange/MenuUserEditor.vue

@@ -23,7 +23,7 @@ export default {
   props:['id',"productId","menuId",'user'],
   computed: {
     ...mapGetters([
-      'userInfo',
+      'userInfo','roles',
     ]),
   },
   data() {

src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue

@@ -72,7 +72,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenu','simple'],

src/views/xm/core/xmMenuPlan/XmMenuPlanAdd.vue

@@ -161,7 +161,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuPlan','visible'],

src/views/xm/core/xmMenuPlan/XmMenuPlanEdit.vue

@@ -161,7 +161,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuPlan','visible'],

src/views/xm/core/xmMenuPlan/XmMenuPlanMng.vue

@@ -91,7 +91,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmMenuState/XmMenuStateAdd.vue

@@ -161,7 +161,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuState','visible'],

src/views/xm/core/xmMenuState/XmMenuStateEdit.vue

@@ -161,7 +161,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuState','visible'],

src/views/xm/core/xmMenuState/XmMenuStateMng.vue

@@ -136,7 +136,7 @@
 		props:[ 'selProject'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
 			xmMenusTreeData(){ 

src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue

@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuTemplate','visible','parentMenu','product'],

src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue

@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMenuTemplate','visible'],

src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue

@@ -103,7 +103,7 @@
 		props:['isSelectMenu'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 			]),
 			
       xmMenuTemplatesTreeData() {

src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue

@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMyFocus','visible'],

src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue

@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmMyFocus','visible'],

src/views/xm/core/xmMyFocus/XmMyFocusMng.vue

@@ -53,7 +53,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

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;
 				}

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;
 				}

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;
 				}

src/views/xm/core/xmProductState/XmProductStateAdd.vue

@@ -131,7 +131,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProductState','visible'],

src/views/xm/core/xmProductState/XmProductStateEdit.vue

@@ -131,7 +131,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProductState','visible'],

src/views/xm/core/xmProductState/XmProductStateMng.vue

@@ -48,7 +48,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProduct'],

src/views/xm/core/xmProductTemplate/XmProductTemplateAdd.vue

@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProductTemplate','visible'],

src/views/xm/core/xmProductTemplate/XmProductTemplateEdit.vue

@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProductTemplate','visible'],

src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue

@@ -67,7 +67,7 @@
 		props:['simple','isSelectProduct'],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

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;
 				}

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

@@ -13,7 +13,7 @@
 	export default { 
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]), 
 		},
 		watch: {

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 == "负责人");

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;

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;

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

@@ -18,7 +18,7 @@
 		props: ["selProject"],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 		},
 		data() {

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;
 				}

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

@@ -89,7 +89,7 @@
 		props: ["selProject","visible"],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 				]), 
 		}, 
 		watch:{

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

@@ -38,7 +38,7 @@
 	export default {  
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]), 
 		}, 
 		data() {

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

@@ -190,7 +190,7 @@
 		props:['dataScope'],
 		computed: {
 			...mapGetters([
-				'userInfo'
+				'userInfo','roles'
 			]),
 			ScreenData() {
 				const key = this.menukey;

src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue

@@ -143,7 +143,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectBaseline','visible'],

src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue

@@ -143,7 +143,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectBaseline','visible'],

src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue

@@ -85,7 +85,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue

@@ -29,7 +29,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectContract','visible'],

src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue

@@ -29,7 +29,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectContract','visible'],

src/views/xm/core/xmProjectContract/XmProjectContractMng.vue

@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['selProject'],

src/views/xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue

@@ -59,7 +59,7 @@
 	export default {
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectEnvList','visible',"currProject"],

src/views/xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue

@@ -62,7 +62,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectEnvList','visible'],

src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue

@@ -92,7 +92,7 @@
 		props: ["selProject"],
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmProjectGroup/XmProjectGroupAdd.vue

@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroup','visible'],

src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue

@@ -32,7 +32,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroup','visible'],

src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue

@@ -18,7 +18,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props: ["selProject" ,"isSelectSingleUser","isSelectMultiUser"],

src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

@@ -40,7 +40,7 @@
 	export default {
 		computed: {
 			...mapGetters([
-				'workShop','userInfo'
+				'workShop','userInfo','roles'
 			])
 		},
 		//

src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue

@@ -111,7 +111,7 @@
 	export default {
 		computed: {
 			...mapGetters([
-				'workShop','userInfo'
+				'workShop','userInfo','roles'
 			])
 		},
 		//

src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkAdd.vue

@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupFormwork','visible'],

src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkEdit.vue

@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupFormwork','visible'],

src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormworkMng.vue

@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmProjectGroupState/XmProjectGroupStateAdd.vue

@@ -131,7 +131,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupState','visible'],

src/views/xm/core/xmProjectGroupState/XmProjectGroupStateEdit.vue

@@ -131,7 +131,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupState','visible'],

src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue

@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['selProject','visible'],

src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue

@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupUser','visible'],

src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue

@@ -35,7 +35,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupUser','visible'],

src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue

@@ -49,7 +49,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue

@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupUserCandidate','visible'],

src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue

@@ -47,7 +47,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectGroupUserCandidate','visible'],

src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue

@@ -53,7 +53,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		data() {

src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue

@@ -68,7 +68,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectKpi','visible'],

src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue

@@ -68,7 +68,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectKpi','visible'],

src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue

@@ -70,7 +70,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props: ['selProject'],

src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue

@@ -74,7 +74,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectKpiHis','visible'],

src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue

@@ -74,7 +74,7 @@
 	export default { 
 		computed: {
 		    ...mapGetters([
-		      'userInfo'
+		      'userInfo','roles'
 		    ])
 		},
 		props:['xmProjectKpiHis','visible'],