diff --git a/src/router/index.js b/src/router/index.js index 585f60c..d7f0be3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -20,6 +20,7 @@ const _import = require('./import-' + process.env.NODE_ENV) const globalRoutes = [ { path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } }, { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } }, + { path: '/login-token', component: _import('common/login-token'), name: 'login', meta: { title: '登录' } }, { path: '/BMPage', component: _import('modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail'), name: 'BM', meta: { title: '技术参数卡' } }, ] diff --git a/src/views/common/login-token.vue b/src/views/common/login-token.vue new file mode 100644 index 0000000..3a08c38 --- /dev/null +++ b/src/views/common/login-token.vue @@ -0,0 +1,242 @@ + + + + + diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index 9026bf7..60c8edd 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -1714,8 +1714,14 @@ }, activated () { - if (this.$route.params.changeNo) { - this.searchData.changeNo = this.$route.params.changeNo + if (this.$route.params.type === 'tokenLogin') { + if (this.$route.params.docNo) { + this.searchData.changeNo = this.$route.params.docNo + } + } else { + if (this.$route.params.changeNo) { + this.searchData.changeNo = this.$route.params.changeNo + } } this.getDataList() }, @@ -2159,7 +2165,7 @@ changeNo: row.changeNo, menuId: this.$route.meta.menuId } - issueChange2(tempData).then(({data}) => { + issueChange(tempData).then(({data}) => { if (data && data.code === 0) { this.getDataList() this.$message({message: '操作成功', type: 'success'}) @@ -2195,7 +2201,7 @@ menuId: this.$route.meta.menuId, nodeConclusion: this.modalData.nodeConclusion } - submitChange2(tempData).then(({data}) => { + submitChange(tempData).then(({data}) => { if (data && data.code === 0) { this.getDataList() this.$message({message: '操作成功', type: 'success'})