diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ac3c8e3..7e5e112 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -58,7 +58,7 @@ export default { selectChange(val) { if (val === 'loginout') { this.$store.commit('user/RESET_STATE') - this.$store.commit('permission/SET_ROUTES', []) + this.$store.commit('permission/RESET_STATE') this.$router.push('/login') return } diff --git a/src/permission.js b/src/permission.js index 2cb9803..fd4c991 100644 --- a/src/permission.js +++ b/src/permission.js @@ -4,7 +4,7 @@ import store from './store' import NProgress from 'nprogress' // progress bar import 'nprogress/nprogress.css' // progress bar style import getPageTitle from '@/utils/get-page-title' -import { filterAsyncRoutes, getALLRouter } from '@/utils' +import { getALLRouter } from '@/utils' NProgress.configure({ showSpinner: false }) // NProgress Configuration diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index df1c710..ece95fa 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -20,6 +20,12 @@ const mutations = { }, SET_OPTS: (state, opt) => { state.opts = opt + }, + RESET_STATE: (state) => { + state.routes = [] + state.addRoutes = [] + state.roleData = {} + state.opts = [] } } diff --git a/src/utils/request.js b/src/utils/request.js index 6149748..96f020a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -71,7 +71,7 @@ service.interceptors.response.use( type: 'warning' }).then(() => { store.commit('user/RESET_STATE') - store.commit('permission/SET_ROUTES', []) + store.commit('permission/RESET_STATE', []) router.push('/login') }) } diff --git a/src/views/reagent/client/index.vue b/src/views/reagent/client/index.vue index c280e03..6854a94 100644 --- a/src/views/reagent/client/index.vue +++ b/src/views/reagent/client/index.vue @@ -96,7 +96,7 @@ @current-change="pageChange" /> - + @@ -180,7 +180,7 @@ 确定 - +
- +
搜索 diff --git a/src/views/reagent/customform/index.vue b/src/views/reagent/customform/index.vue index d2148fd..3dae94e 100644 --- a/src/views/reagent/customform/index.vue +++ b/src/views/reagent/customform/index.vue @@ -71,7 +71,7 @@ @current-change="pageChange" />
- + diff --git a/src/views/reagent/envrecord/index.vue b/src/views/reagent/envrecord/index.vue index f8cc656..fceadd0 100644 --- a/src/views/reagent/envrecord/index.vue +++ b/src/views/reagent/envrecord/index.vue @@ -92,7 +92,7 @@ /> - +
- +
{{ `${item.name} (${item.purity})` }}
@@ -93,7 +93,7 @@ 确定
- +
diff --git a/src/views/reagent/mainoverview/index.vue b/src/views/reagent/mainoverview/index.vue index 106e79f..ac0ce13 100644 --- a/src/views/reagent/mainoverview/index.vue +++ b/src/views/reagent/mainoverview/index.vue @@ -198,7 +198,7 @@
- +
- + - +
搜索 @@ -237,7 +237,7 @@
- + diff --git a/src/views/reagent/receivingandreturn/index.vue b/src/views/reagent/receivingandreturn/index.vue index 2a60227..58d1fee 100644 --- a/src/views/reagent/receivingandreturn/index.vue +++ b/src/views/reagent/receivingandreturn/index.vue @@ -61,7 +61,7 @@ /> - + 备选项1 备选项2 diff --git a/src/views/reagent/warehousing/index.vue b/src/views/reagent/warehousing/index.vue index 64b2f9b..93b94be 100644 --- a/src/views/reagent/warehousing/index.vue +++ b/src/views/reagent/warehousing/index.vue @@ -94,7 +94,7 @@ /> - +
搜索 @@ -137,6 +137,7 @@ - +
@@ -189,6 +190,7 @@
- +
请扫描试剂条码
diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 048a698..929af8e 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -117,6 +117,7 @@ />