merge master

2019-03-19 15:42:05 +08:00
parent 0e9f32f25a 715fe3e684
commit ae02d6bb56
118 changed files with 722 additions and 303 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -279,6 +279,12 @@ export const asyncRoutes = [
        name: 'SelectExcel',
        meta: { title: 'selectExcel' }
      },
+      {
+        path: 'export-merge-header',
+        component: () => import('@/views/excel/mergeHeader'),
+        name: 'MergeHeader',
+        meta: { title: 'mergeHeader' }
+      },
      {
        path: 'upload-excel',
        component: () => import('@/views/excel/uploadExcel'),