diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js index b746b0c..26e771a 100644 --- a/src/lang/i18n/en/module/basicData.js +++ b/src/lang/i18n/en/module/basicData.js @@ -1,8 +1,13 @@ /* * @Author: gtz * @Date: 2021-03-04 16:13:51 +<<<<<<< HEAD * @LastEditors: fzq * @LastEditTime: 2022-03-14 16:22:38 +======= + * @LastEditors: zwq + * @LastEditTime: 2022-03-14 10:58:20 +>>>>>>> develop * @Description: file content */ export default { diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js index b79085d..4af5db4 100644 --- a/src/lang/i18n/zh/module/basicData.js +++ b/src/lang/i18n/zh/module/basicData.js @@ -1,9 +1,14 @@ /* * @Author: gtz * @Date: 2021-03-04 16:13:51 +<<<<<<< HEAD * @LastEditors: fzq * @LastEditTime: 2022-03-14 16:22:20 * @Description: file content +======= + * @LastEditors: zwq + * @LastEditTime: 2022-03-14 10:58:12 +>>>>>>> develop */ export default { visual: { diff --git a/src/router/index.js b/src/router/index.js index 2866192..85cf483 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -218,9 +218,9 @@ export const constantRoutes = [ meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true } }, { - path: '/dataDictionary', + path: '/DataDictionary', component: () => import('@/views/basicData/index'), - name: 'dataDictionary', + name: 'DataDictionary', meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true }, children: [{ path: 'dataDictionary', @@ -260,7 +260,7 @@ export const constantRoutes = [ { path: 'processList', component: () => import('@/views/art/processList'), - name: 'Process', + name: 'processList', meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true } } ] @@ -268,7 +268,7 @@ export const constantRoutes = [ { path: '/Warehouse', component: Layout, - redirect: '/Warehouse/workOrderManage', + redirect: '/Warehouse/StorageBoxInfo', name: 'Warehouse', meta: { title: routerTitle.Warehouse?.[language] || routerTitle.Warehouse.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true }, children: [ @@ -497,7 +497,7 @@ export const constantRoutes = [ path: '/basic', component: Layout, redirect: '/user/manager', - name: 'ArticleManager', + name: 'basic', meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true }, children: [ { diff --git a/src/views/basicData/Cache/components/location-add.vue b/src/views/basicData/Cache/components/location-add.vue index 8264076..044f890 100644 --- a/src/views/basicData/Cache/components/location-add.vue +++ b/src/views/basicData/Cache/components/location-add.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 15:41:11 * @LastEditors: fzq - * @LastEditTime: 2022-03-11 11:14:02 + * @LastEditTime: 2022-03-15 09:45:30 * @Description: -->