Merge branch 'test' into 'master'

Test

See merge request spfm-group/spfm-market-front!45

src/pages/main/meetingDeclaration/marketDecisionMeeting.vue

@@ -884,18 +884,37 @@ export default {
             this.loginNoStr = this.userInfo.loginNoStr;
 
             this.personInfo = this.userInfo.groupName.split("/");
+        },
+        getRole(){
+            this.$http({
+                url:"/market/cMeetingDeclaration/getRoleByCode",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                    // page: '{"pageNo":"' + n + '","pageSize":"10"}'
+                },
+                data: {}
+            }).then(res => {
+                if(res.data.result == "0"){
+                    this.isAllExport = true
+                }else{
+                    this.isAllExport = false
+                }
+            });
         }
     },
     mounted() {
         this.getList({}, 1);
         this.getUser();
-        this.menus.forEach(item=>{
-            if(item.jspUrl == '/allExport'){
-                this.isAllExport = true
-			}else{
-                this.isAllExport = false
-            }
-        })
+        this.getRole()
+        // this.menus.forEach(item=>{
+        //     console.log(1);
+        //     if(item.jspUrl == '/allExport'){
+        //         this.isAllExport = true
+		// 	}else{
+        //         this.isAllExport = false
+        //     }
+        // })
     },
     created() {}
 };

src/pages/main/meetingDeclaration/specialReport.vue

@@ -880,19 +880,38 @@ export default {
             this.userInfo = JSON.parse(window.sessionStorage.userInfo);
             this.loginNoStr = this.userInfo.loginNoStr;
             this.personInfo = this.userInfo.groupName.split("/");
+        },
+        getRole(){
+            this.$http({
+                url:"/market/cMeetingDeclaration/getRoleByCode",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                    // page: '{"pageNo":"' + n + '","pageSize":"10"}'
+                },
+                data: {}
+            }).then(res => {
+                if(res.data.result == "0"){
+                    this.isAllExport = true
+                }else{
+                    this.isAllExport = false
+                }
+            });
         }
     },
     mounted() {
         this.getList({}, 1);
+        
         this.getUser();
-
-        this.menus.forEach(item=>{
-            if(item.jspUrl == '/allExport'){
-                this.isAllExport = true
-			}else{
-                this.isAllExport = false
-            }
-        })
+        this.getRole()
+        // this.menus.forEach(item=>{
+        //     console.log(1);
+        //     if(item.jspUrl == '/allExport'){
+        //         this.isAllExport = true
+		// 	}else{
+        //         this.isAllExport = false
+        //     }
+        // })
     },
     created() {}
 };