jiaxing.zhou

Merge branch 'dev'

...@@ -7,10 +7,32 @@ export {} ...@@ -7,10 +7,32 @@ export {}
7 7
8 declare module 'vue' { 8 declare module 'vue' {
9 export interface GlobalComponents { 9 export interface GlobalComponents {
10 + ElButton: typeof import('element-plus/es')['ElButton']
11 + ElCard: typeof import('element-plus/es')['ElCard']
12 + ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
13 + ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
14 + ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
15 + ElDialog: typeof import('element-plus/es')['ElDialog']
16 + ElForm: typeof import('element-plus/es')['ElForm']
17 + ElFormItem: typeof import('element-plus/es')['ElFormItem']
18 + ElIcon: typeof import('element-plus/es')['ElIcon']
19 + ElInput: typeof import('element-plus/es')['ElInput']
20 + ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
21 + ElOption: typeof import('element-plus/es')['ElOption']
22 + ElPagination: typeof import('element-plus/es')['ElPagination']
23 + ElRadio: typeof import('element-plus/es')['ElRadio']
24 + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
25 + ElSelect: typeof import('element-plus/es')['ElSelect']
26 + ElTable: typeof import('element-plus/es')['ElTable']
27 + ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
28 + ElTag: typeof import('element-plus/es')['ElTag']
10 Header: typeof import('./src/components/layout/Header.vue')['default'] 29 Header: typeof import('./src/components/layout/Header.vue')['default']
11 RouterLink: typeof import('vue-router')['RouterLink'] 30 RouterLink: typeof import('vue-router')['RouterLink']
12 RouterView: typeof import('vue-router')['RouterView'] 31 RouterView: typeof import('vue-router')['RouterView']
13 Sidebar: typeof import('./src/components/layout/Sidebar.vue')['default'] 32 Sidebar: typeof import('./src/components/layout/Sidebar.vue')['default']
14 SidebarItem: typeof import('./src/components/layout/SidebarItem.vue')['default'] 33 SidebarItem: typeof import('./src/components/layout/SidebarItem.vue')['default']
15 } 34 }
35 + export interface ComponentCustomProperties {
36 + vLoading: typeof import('element-plus/es')['ElLoadingDirective']
37 + }
16 } 38 }
......
...@@ -147,6 +147,7 @@ const menuItems = ref([ ...@@ -147,6 +147,7 @@ const menuItems = ref([
147 { name: '产品管理', path: '/main/product', icon: '📦' }, 147 { name: '产品管理', path: '/main/product', icon: '📦' },
148 { name: '经销商管理', path: '/main/dealer', icon: '🏢' }, 148 { name: '经销商管理', path: '/main/dealer', icon: '🏢' },
149 { name: '返利管理', path: '/main/rebate', icon: '💰' }, 149 { name: '返利管理', path: '/main/rebate', icon: '💰' },
150 + { name: '异常工单', path: '/main/exception-workorder', icon: '⚠️' },
150 { 151 {
151 name: '系统设置', 152 name: '系统设置',
152 icon: '⚙️', 153 icon: '⚙️',
......
...@@ -153,6 +153,24 @@ const staticRoutes: RouteRecordRaw[] = [ ...@@ -153,6 +153,24 @@ const staticRoutes: RouteRecordRaw[] = [
153 } 153 }
154 }, 154 },
155 { 155 {
156 + path: 'exception-workorder',
157 + name: 'ExceptionWorkorder',
158 + component: () => import('@/views/exceptionWorkorder/index.vue'),
159 + meta: {
160 + title: '异常工单',
161 + requiresAuth: true
162 + }
163 + },
164 + {
165 + path: 'test-menu',
166 + name: 'TestMenu',
167 + component: () => import('@/views/test-menu.vue'),
168 + meta: {
169 + title: '菜单测试',
170 + requiresAuth: true
171 + }
172 + },
173 + {
156 path: 'settings', 174 path: 'settings',
157 name: 'Settings', 175 name: 'Settings',
158 component: () => import('@/views/settings/index.vue'), 176 component: () => import('@/views/settings/index.vue'),
......