diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 03d15a1..ea64642 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -427,6 +427,13 @@ export default { .icon-svg { width: 2em; } +.site-sidebar{ + overflow-y: auto; +} + +.site-sidebar__inner{ + overflow-y: visible; +} .el-menu--collapse .el-menu .el-submenu, .el-menu--popup, .el-menu-item { min-width: 50px !important; diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 5712326..379f1cb 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -94,6 +94,15 @@ label="操作"> @@ -2839,6 +2848,12 @@ created () { this.getDataList() }, + activated() { + if (this.$route.params.partNo) { + this.searchData.partNo = this.$route.params.partNo + } + this.getDataList() + }, methods: { // 页签选择替换 @@ -4232,7 +4247,10 @@ * 单机选中物料信息 * @param row */ - partClickRow (row) { + partClickRow (row,column) { + if (column.label === '操作'){ + return + } this.$refs.partTable.toggleRowSelection(row) this.partCurrentRow = JSON.parse(JSON.stringify(row)) }, @@ -4516,6 +4534,19 @@ json += '}' let s = eval('(' + json + ')') return s + }, + toMenu(type,row){ + let path = ''; + if (type === 'Routing'){ + path = 'routing' + }else if (type === 'BOM'){ + path = 'bom' + } + if (this.$router.resolve(`/part-${path}Management`).resolved.name === '404'){ + this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',}); + }else { + this.$router.push({name:`part-${path}Management`,params:{partNo:row.partNo},}) + } } } } diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index 5488367..06aa573 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -37,9 +37,16 @@ :min-width="item.columnWidth" :label="item.columnLabel"> @@ -1700,7 +1707,13 @@ changeDurabilityWeek () { this.modalData.durabilityWeek = this.modalData.durabilityDay / 7 }, - + toPartMenu(partNo){ + if (this.$router.resolve(`/part-partInformation`).resolved.name === '404'){ + this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',}); + }else { + this.$router.push({name:`part-partInformation`,params:{partNo:partNo},}) + } + } }, }