Merge branch 'dev-mvp-20200331' of...

Merge branch 'dev-mvp-20200331' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-mvp-20200331

src/App.vue

@@ -140,6 +140,7 @@ export default {
 					vm.changeIdType(res.data.idType)
 					vm.changeMaster(res.data.masterAdministratorFlag)
 					localStorage.setItem('storageIdType', res.data.idType)
+					localStorage.setItem('isRoleOfOuter', res.data.isRoleOfOuter)
 					localStorage.setItem('storageMaster', res.data.masterAdministratorFlag)
 					vm.idType = res.data.idType
 					vm.storageIdType = res.data.idType

src/views/education/item-manager.vue

@@ -397,6 +397,8 @@ export default {
   created() {
     vm = this;
     vm.idType = localStorage.getItem('storageIdType');
+    vm.isRoleOfOuter = localStorage.getItem('isRoleOfOuter');
+   
     let pageSize = vm.formInline.pageSize;
     console.log('idType:',vm.idType);
     if(this.$route.query.pageNum){
@@ -530,7 +532,6 @@ export default {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.data;
-          vm.isRoleOfOuter = res.data.isRoleOfOuter;  // 0 无权限
           //console.log(vm.tableData);
           vm.totalRows = res.data.totalRows;
         }