diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 17937c0..e2b2e09 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -77,13 +77,15 @@ export default { this.levelList = [activeRoute[0].children[0],matched[0]] } else if(matched[0].path == "/taskAuditInfo") { // 管理端--任务管理--任务审核--资产审核 - const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'myTask') - this.levelList = [activeRoute[0].children[0],matched[0]] + const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'task') + const route = sidebarRouters.filter(item => item.path == '') + const twoActiveRoute = route[0].children.filter(item => item.path == "taskInfo") + this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]] } else if(matched[0].path == "/mytaskAuditInfo") { // 单位端--我的任务--资产核查--资产审核详情 const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'myTask') const route = sidebarRouters.filter(item => item.path == '') - const twoActiveRoute = route[0].children.filter(item => item.path == "mytaskAudit") + const twoActiveRoute = route[0].children.filter(item => item.path == "mytaskInfo") this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]] } else if(matched[0].path == "/unitAuth" ) { // 管理端--资产管理--新增资产 diff --git a/src/views/auditPages/taskManagement/audit.vue b/src/views/auditPages/taskManagement/audit.vue index 3aca3e5..71184ea 100644 --- a/src/views/auditPages/taskManagement/audit.vue +++ b/src/views/auditPages/taskManagement/audit.vue @@ -3102,12 +3102,10 @@ export default { }, }, beforeRouteEnter(to,from,next){ - if(to.query.pageType == 'add') { - to.meta.title = '新增资产' - } else if(to.query.pageType == 'change') { - to.meta.title = '修改资产' + if(to.query.pageType == 'change') { + to.meta.title = '审核资产' } else if(to.query.pageType == 'look') { - to.meta.title = '资产详情' + to.meta.title = '查看资产' } next(); }, diff --git a/src/views/auditPages/taskManagement/auditList.vue b/src/views/auditPages/taskManagement/auditList.vue index c4b7e98..649473e 100644 --- a/src/views/auditPages/taskManagement/auditList.vue +++ b/src/views/auditPages/taskManagement/auditList.vue @@ -111,13 +111,13 @@ diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue index 0fbcade..a9eacfc 100644 --- a/src/views/auditPages/taskManagement/index.vue +++ b/src/views/auditPages/taskManagement/index.vue @@ -95,16 +95,16 @@ diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue index eb097e4..92fa7e2 100644 --- a/src/views/auditPages/taskManagement/info.vue +++ b/src/views/auditPages/taskManagement/info.vue @@ -127,9 +127,18 @@ @@ -157,7 +166,7 @@ @pagination="getPagination" :current-page.sync="pagination.current"> -
+
任务流程节点
@@ -295,8 +304,8 @@ export default { } }, titleInfo() { - console.log(this.$route.query); - getassetTaskid(this.$route.query.id).then(res => { + // console.log(this.$route.query); + getassetTaskid(this.$route.query.id || this.$route.meta.id).then(res => { if (res.code == 200) { this.titleInfoObj = res.data } @@ -388,6 +397,18 @@ export default { this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 120; } }, + beforeRouteEnter(to,from,next){ + if(to.query.pageType == 'info') { + to.meta.title = '任务审核' + to.meta.pageType = to.query.pageType + to.meta.id = to.query.id + } else if(to.query.pageType == 'look') { + to.meta.title = '任务详情' + to.meta.pageType = to.query.pageType + to.meta.id = to.query.id + } + next(); + }, }