diff --git a/components.d.ts b/components.d.ts index 5a79f43..c84f273 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,8 +9,6 @@ declare module 'vue' { export interface GlobalComponents { Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] ElBadge: typeof import('element-plus/es')['ElBadge'] - ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] - ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] @@ -18,13 +16,11 @@ declare module 'vue' { ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] - ElCountdown: typeof import('element-plus/es')['ElCountdown'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -35,12 +31,8 @@ declare module 'vue' { ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElStep: typeof import('element-plus/es')['ElStep'] - ElSteps: typeof import('element-plus/es')['ElSteps'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/src/views/Login.vue b/src/views/Login.vue index 62e1900..1561ea6 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -4,7 +4,9 @@ import { ElMessage } from 'element-plus' import { User, Lock } from '@element-plus/icons-vue' import { useRoute, useRouter } from 'vue-router' import { mainStore } from 'store/main' +import { useStore } from 'store/user' const userStore = mainStore() +const store = useStore() const router = useRouter() const route: any = useRoute() const rememberPassword = ref(false) @@ -57,6 +59,7 @@ const handlerLogin = async () => { // } localStorage.setItem('rolesType', '1') + store.editcurrentMenuItem('goodsManagement') // 跳转登录页面 if (route.query && route.query.redirect) { router.push(decodeURIComponent(route.query.redirect)) diff --git a/src/views/user/sourcingNeed/index.vue b/src/views/user/sourcingNeed/index.vue index e052d00..f972aa3 100644 --- a/src/views/user/sourcingNeed/index.vue +++ b/src/views/user/sourcingNeed/index.vue @@ -246,7 +246,7 @@ - + + + + + + @@ -323,23 +339,6 @@ /> - - - - - - -