diff --git a/src/store/modules/user.js b/src/store/modules/user.js index db1d6b5..bfc56d9 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -3,7 +3,8 @@ export default { state: { id: 0, name: '', - site: 0, + // 当前登录工厂编码，默认空字符串避免数值0影响菜单授权判定 - rqrq + site: '', languageDefault: '', userDisplay: '', userDev: false, diff --git a/src/views/main.vue b/src/views/main.vue index 5a6097f..86bda25 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -33,32 +33,33 @@
+ -
+
• 收货入库
-
+
采购入库
-
+
生产入库
-
+
生产退料
-
+
@@ -68,43 +69,43 @@
-
+
• 拣货出库
-
+
移库
-
+
其他出入库
-
+
生产领料
-
+
MR发料
-
+
委外发料
-
+
@@ -119,55 +120,55 @@
-->
-
+
• 立库常规操作
-
+
立库取货
-
+
组盘入库
-
+
分拣组盘
-
+
查看托盘
-
+
托盘运输
-
+
空托盘入库
-
+
取消组盘
-
+
@@ -175,49 +176,49 @@
-
+
• 立库特殊操作
-
+
Call料
-
+
直接组盘
-
+
栈板人工移动
-
+
取消预留
-
+
无AGV分拣
-
+
合托Call板
-
+
@@ -226,7 +227,7 @@
-
+
• 库内管理 @@ -238,14 +239,14 @@
属性变动
--> -
+
标签查询
-
+
@@ -280,6 +281,21 @@ export default { showWarehouseDropdown: false } }, + directives: { + // 站点授权指令：* 或 当前site 命中才渲染菜单 - rqrq + siteAuth: { + inserted(el, binding, vnode) { + if (vnode.context && vnode.context.applySiteAuthForElement) { + vnode.context.applySiteAuthForElement(el, binding) + } + }, + componentUpdated(el, binding, vnode) { + if (vnode.context && vnode.context.applySiteAuthForElement) { + vnode.context.applySiteAuthForElement(el, binding) + } + } + } + }, computed: { documentClientHeight: { get() { @@ -312,7 +328,12 @@ export default { }, site: { get() { - return localStorage.getItem('site') + const storeSite = this.$store.state.user.site + const normalizedStoreSite = storeSite === null || storeSite === undefined ? '' : String(storeSite).trim() + if (normalizedStoreSite && normalizedStoreSite !== '0') { + return normalizedStoreSite + } + return (localStorage.getItem('site') || '').trim() }, set(val) { this.$store.commit('user/updateSite', val) @@ -343,10 +364,44 @@ export default { document.removeEventListener('click', this.handleDocumentClick) }, created() { + this.syncStoreSiteFromCache() this.getUserInfo() this.getWarehouseList(); }, methods: { + // 将缓存site同步到store，保证菜单渲染和接口取值一致 - rqrq + syncStoreSiteFromCache() { + const cacheSite = (localStorage.getItem('site') || '').trim() + if (cacheSite) { + this.$store.commit('user/updateSite', cacheSite) + } + }, + // 标准化菜单授权site配置：空值按*处理，支持逗号分隔多site - rqrq + normalizeMenuSiteAuthValue(siteAuthValue) { + const rawValue = siteAuthValue === null || siteAuthValue === undefined ? '*' : String(siteAuthValue).trim() + return rawValue === '' ? '*' : rawValue + }, + // 菜单授权规则：*全工厂可见，非*必须命中当前site才显示 - rqrq + isMenuVisibleForCurrentSite(siteAuthValue) { + const normalizedAuthValue = this.normalizeMenuSiteAuthValue(siteAuthValue) + if (normalizedAuthValue === '*') { + return true + } + const currentSite = this.site + if (!currentSite) { + return false + } + const authSiteList = normalizedAuthValue + .split(',') + .map(item => item.trim()) + .filter(item => item !== '') + return authSiteList.includes('*') || authSiteList.includes(String(currentSite).trim()) + }, + // 指令落地：根据site授权值直接控制菜单节点显示 - rqrq + applySiteAuthForElement(el, binding) { + const isVisible = this.isMenuVisibleForCurrentSite(binding.value) + el.style.display = isVisible ? '' : 'none' + }, // 处理禁用功能点击 handleDisabledFeature(featureName) { this.$message({ @@ -365,7 +420,7 @@ export default { }, // 获取仓库列表 getWarehouseList() { - const currentSite = localStorage.getItem('site'); + const currentSite = this.site; if (!currentSite) { this.$message.error('请先选择工厂'); this.$router.push({ name: 'login' }); @@ -461,6 +516,8 @@ export default { this.loading = false this.userId = data.user.userId this.userName = data.user.username + // 再次确保user对象建立后store中可直接读取当前site - rqrq + this.$store.commit('user/updateSite', this.site) this.languageDefault = data.user.languageDefault this.userDisplay = data.user.userDisplay let userSubSiteCodeList = []