Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

6 小时以前 cb9cd49627b65a4c0e137e08063271a8cefe1826

 src/router/routes/modules/mes.ts

@@ -12,33 +12,6 @@
    },
    children: [
      {
        path: 'wm/warehouse/location',
        name: 'MesWmLocation',
        meta: {
          title: '库区设置',
          activePath: '/mes/wm/warehouse',
        },
        component: () => import('#/views/mes/wm/warehouse/location/index.vue'),
      },
      {
        path: 'wm/warehouse/area',
        name: 'MesWmArea',
        meta: {
          title: '库位设置',
          activePath: '/mes/wm/warehouse',
        },
        component: () => import('#/views/mes/wm/warehouse/area/index.vue'),
      },
      {
        path: 'wm/barcode/config',
        name: 'MesWmBarcodeConfig',
        meta: {
          title: '条码配置',
          activePath: '/mes/wm/barcode',
        },
        component: () => import('#/views/mes/wm/barcode/config/index.vue'),
      },
      {
        path: 'pro/task/gantt-edit',
        name: 'MesProTaskGanttEdit',
        meta: {
@@ -47,6 +20,15 @@
        },
        component: () => import('#/views/mes/pro/task/edit/index.vue'),
      },
      {
        path: 'pd/project/detail/:id',
        name: 'MesPdProjectDetail',
        meta: {
          title: '设计任务详情',
          activePath: '/mes/pd/project',
        },
        component: () => import('#/views/mes/pd/project/detail/index.vue'),
      },
    ],
  },
];