snow 2 rokov pred
rodič
commit
397dba6023

+ 6 - 18
src/layout/components/company-select/index.vue

@@ -31,7 +31,7 @@
       加载中...
     </p>
 
-    <p v-if="state.noMore" class="company-more">没有更多数据了...</p>
+    <p v-if="state.noMore || !isSupertube" class="company-more">没有更多数据了...</p>
   </el-select>
 </template>
 
@@ -199,19 +199,14 @@ export default {
       const result = await this.$store.dispatch(userStoreActions.reloadMenu)
       this.companyChangeLoading = false
       switch (result) {
-        // 登出
-        case 'noToken':
+        case 'noToken': // 登出
           await this.$store.dispatch('user/logout')
           await this.$router.push(`/login`)
           break
-
-          // 角色异常或该公司禁用清空菜单返回首页
-        case 'disabled':
+        case 'disabled': // 角色异常或该公司禁用清空菜单返回首页
           await this.$store.dispatch('user/disabledCompany')
           break
-
-          // 切换路由
-        default:
+        default: // 切换路由
           queryString = isDetailPath ? this.parsePathDetail2List(path) : keys.reduce(chunk, '?')
           await this.$router.replace('/reload' + queryString)
           break
@@ -254,7 +249,6 @@ export default {
     },
 
     async loadMore() {
-      if (!this.isSupertube) return
       // 区分超管用户和普通用户
       const api = this.isSupertube ? requsetSupertubeCompany : requsetUserBindingCompany
       const isSupplier = this.currentLevel === accountLevels.supplier
@@ -297,14 +291,8 @@ export default {
       if (result) this.$store.commit(userStoreActions.setCompanyList, result)
     },
 
-    bindEvent(ScrollWrapper) {
-      this.isSupertube && ScrollWrapper.addEventListener('scroll', this.handleScroll)
-    },
-
-    removeEvent(ScrollWrapper) {
-      ScrollWrapper.removeEventListener('scroll', this.handleScroll)
-    },
-
+    bindEvent(ScrollWrapper) { this.isSupertube && ScrollWrapper.addEventListener('scroll', this.handleScroll) },
+    removeEvent(ScrollWrapper) { this.isSupertube && ScrollWrapper.removeEventListener('scroll', this.handleScroll) },
     selectAllCompany() {
       this.value = ''
       this.$nextTick(() => (this.key = this.key + 1))