From f7a3d41075e00498f7033475108c0bcd86cda733 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 01 七月 2025 14:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/common/CommonHeader.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/company/src/components/common/CommonHeader.vue b/company/src/components/common/CommonHeader.vue
index 9945708..606771e 100644
--- a/company/src/components/common/CommonHeader.vue
+++ b/company/src/components/common/CommonHeader.vue
@@ -114,7 +114,9 @@
},
created () {
document.title=this.systemTitle
- this.setFindByCompanyId(this.userInfo.companyId)
+ if (this.userInfo.companyId) {
+ this.setFindByCompanyId(this.userInfo.companyId)
+ }
},
computed: {
...mapState(['menuData', 'userInfo']),
@@ -153,9 +155,9 @@
})
},
setFindByCompanyId(companyId) {
+ if (this.userInfo.type !== 1) return
findByCompanyId(companyId)
.then(res => {
- console.log(res)
this.info = res
})
},
@@ -212,7 +214,11 @@
}
}
</script>
-
+<style>
+ .el-dropdown-menu {
+ width: 240px !important;
+ }
+</style>
<style scoped lang="scss">
@import "@/assets/style/variables.scss";
.common-header {
--
Gitblit v1.9.3