Merge branch 'master' into dev

* master: no message # Conflicts: # src/router/index.js
3 years ago · 80eac8ead5
parent a6abd8a1af d75780b9fe
commit 80eac8ead5
7 changed files with 199 additions and 89 deletions
--- a/src/router/basic.js
+++ b/src/router/basic.js
@ -0,0 +1,96 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:45:04
+ * @LastEditTime: 2021-11-24 14:58:38
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/basic.js
+ */
+export default [
+    {
+        path: '/Console',
+        name: "Console",
+        title: "控制台",
+        hide: false,
+        icon: 'container',
+        component: resolve => require(['@/views/Console'], resolve),
+        meta: {title: '控制台'}
+    },
+    {
+        path: '/Employee',
+        name: "Employee",
+        title: "员工管理",
+        icon: 'database',
+        hide: false,
+        component: resolve => require(['@/views/Employee'], resolve),
+        meta: {title: '员工管理'}
+    },
+    {
+        path: '/authority',
+        name: "Authority",
+        title: "权限管理",
+        icon: 'profile',
+        hide: false,
+        component: resolve => require(['@/views/Authority'], resolve),
+        meta: {title: '权限管理'},
+        children: [
+            {
+                path: '/Authority/_details',
+                name: "Authority_details",
+                title: "账单管理-详情",
+                icon: 'profile', 
+                hide: true,
+                component: resolve => require(['@/views/Authority/_details'], resolve),
+                meta: {title: '账单管理-详情'},
+            }
+        ]
+    },
+    {
+        path: '/attendance',
+        name: "Attendance",
+        title: "考勤管理",
+        icon: 'profile',
+        hide: false,
+        component: resolve => require(['@/views/Attendance'], resolve),
+        meta: {title: '考勤管理'},
+        children: [
+            {
+                path: '/attendance/record',
+                name: "Attendance_record",
+                title: "考勤记录",
+                icon: 'profile', 
+                hide: false,
+                component: resolve => require(['@/views/Attendance/_record'], resolve),
+                meta: {title: '考勤记录'},
+            },
+            {
+                path: '/attendance/application',
+                name: "Attendance_application",
+                title: "申请记录",
+                icon: 'profile', 
+                hide: false,
+                component: resolve => require(['@/views/Attendance/_application'], resolve),
+                meta: {title: '申请记录'},
+            },
+            {
+                path: '/attendance/attendanceteam',
+                name: "Attendance_attendanceteam",
+                title: "考勤小组",
+                icon: 'profile', 
+                hide: false,
+                component: resolve => require(['@/views/Attendance/_attendanceteam'], resolve),
+                meta: {title: '考勤小组'},
+            },
+            {
+                path: '/attendance/scheduling',
+                name: "Attendance_scheduling",
+                title: "排班计划",
+                icon: 'profile', 
+                hide: false,
+                component: resolve => require(['@/views/Attendance/_scheduling'], resolve),
+                meta: {title: '排班计划'},
+            },
+
+        ]
+    }
+]
--- a/src/router/index.js
+++ b/src/router/index.js
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-11-18 17:30:38
- * @LastEditTime: 2021-11-24 14:56:43
+ * @LastEditTime: 2021-11-24 14:59:12
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: /ansu-business/src/router/index.js
@ -16,6 +16,13 @@ Router.prototype.push = function push(location) {
 Vue.use(Router);

 import Layout from "@/views/Layout"
+// import test from "./test" 
+import basic from "./basic" // 基础功能
+// import payment from "./payment" // 缴费管理
+// import smartMall from "./smartMall" // 智慧商城 
+// import operation from "./operation" // 运营管理
+// import set from "./set" // 设置
+
 const router = [
    {
        path: "/",
@ -24,94 +31,7 @@ const router = [
        component: Layout,
        redirect: '/Console',
        meta: {title: '首页'},
-        children: [
-            {
-                path: '/Console',
-                name: "Console",
-                title: "控制台",
-                hide: false,
-                icon: 'container',
-                component: resolve => require(['@/views/Console'], resolve),
-                meta: {title: '控制台'}
-            },
-            {
-                path: '/Employee',
-                name: "Employee",
-                title: "员工管理",
-                icon: 'database',
-                hide: false,
-                component: resolve => require(['@/views/Employee'], resolve),
-                meta: {title: '员工管理'}
-            },
-            {
-                path: '/authority',
-                name: "Authority",
-                title: "权限管理",
-                icon: 'profile',
-                hide: false,
-                component: resolve => require(['@/views/Authority'], resolve),
-                meta: {title: '权限管理'},
-                children: [
-                    {
-                        path: '/Authority/_details',
-                        name: "Authority_details",
-                        title: "账单管理-详情",
-                        icon: 'profile', 
-                        hide: true,
-                        component: resolve => require(['@/views/Authority/_details'], resolve),
-                        meta: {title: '账单管理-详情'},
-                    }
-                ]
-            },
-            {
-                path: '/attendance',
-                name: "Attendance",
-                title: "考勤管理",
-                icon: 'profile',
-                hide: false,
-                component: resolve => require(['@/views/Attendance'], resolve),
-                meta: {title: '考勤管理'},
-                children: [
-                    {
-                        path: '/attendance/record',
-                        name: "Attendance_record",
-                        title: "考勤记录",
-                        icon: 'profile', 
-                        hide: false,
-                        component: resolve => require(['@/views/Attendance/_record'], resolve),
-                        meta: {title: '考勤记录'},
-                    },
-                    {
-                        path: '/attendance/application',
-                        name: "Attendance_application",
-                        title: "申请记录",
-                        icon: 'profile', 
-                        hide: false,
-                        component: resolve => require(['@/views/Attendance/_application'], resolve),
-                        meta: {title: '申请记录'},
-                    },
-                    {
-                        path: '/attendance/attendanceteam',
-                        name: "Attendance_attendanceteam",
-                        title: "考勤小组",
-                        icon: 'profile', 
-                        hide: false,
-                        component: resolve => require(['@/views/Attendance/_attendanceteam'], resolve),
-                        meta: {title: '考勤小组'},
-                    },
-                    {
-                        path: '/attendance/scheduling',
-                        name: "Attendance_scheduling",
-                        title: "排班计划",
-                        icon: 'profile', 
-                        hide: false,
-                        component: resolve => require(['@/views/Attendance/_scheduling'], resolve),
-                        meta: {title: '排班计划'},
-                    },
-
-                ]
-            },
-        ]
+        children: [...basic]
    },
    {
        path: "/login",
--- a/src/router/operation.js
+++ b/src/router/operation.js
@ -0,0 +1,9 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:52:24
+ * @LastEditTime: 2021-11-24 14:52:24
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/operation.js
+ */
+export default []
--- a/src/router/payment.js
+++ b/src/router/payment.js
@ -0,0 +1,9 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:48:01
+ * @LastEditTime: 2021-11-24 14:48:02
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/payment.js
+ */
+export default []
--- a/src/router/set.js
+++ b/src/router/set.js
@ -0,0 +1,9 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:55:05
+ * @LastEditTime: 2021-11-24 14:55:06
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/set.js
+ */
+export default []
--- a/src/router/smartMall.js
+++ b/src/router/smartMall.js
@ -0,0 +1,9 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:50:31
+ * @LastEditTime: 2021-11-24 14:50:31
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/smartMall.js
+ */
+export default []
--- a/src/router/test.js
+++ b/src/router/test.js
@ -0,0 +1,58 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:43:24
+ * @LastEditTime: 2021-11-24 14:43:25
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/test.js
+ */
+
+export default [
+    {
+        path: '/forecastShipping',
+        name: "ForecastShipping",
+        title: "预报寄件",
+        hide: false,
+        icon: 'container',
+        component: resolve => require(['@/views/ForecastShipping'], resolve),
+        meta: {title: '预报寄件'}
+    },
+    {
+        path: '/waybill',
+        name: "Waybill",
+        title: "运单管理",
+        icon: 'database',
+        hide: false,
+        component: resolve => require(['@/views/Waybill'], resolve),
+        meta: {title: '运单管理'}
+    },
+    {
+        path: '/billing',
+        name: "Billing",
+        title: "账单管理",
+        icon: 'profile',
+        hide: false,
+        component: resolve => require(['@/views/Billing'], resolve),
+        meta: {title: '账单管理'},
+        children: [
+            {
+                path: '/billing/_details',
+                name: "Billing_details",
+                title: "账单管理-详情",
+                icon: 'profile', 
+                hide: true,
+                component: resolve => require(['@/views/Billing/_details'], resolve),
+                meta: {title: '账单管理-详情'},
+            }
+        ]
+    },
+    {
+        path: '/mySettings',
+        name: "MySettings",
+        title: "我的设置",
+        hide: false,
+        icon: 'setting',
+        component: resolve => require(['@/views/MySettings'], resolve),
+        meta: {title: '我的设置'}
+    }
+]