From 21d45adf22c2ee491f0990e7df0f244dc38fc86d Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 14 Mar 2022 10:59:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/i18n/en/module/basicData.js | 9 +- src/lang/i18n/zh/module/basicData.js | 10 +- src/router/index.js | 10 +- src/views/basicData/Warehouse/CurrentTask.vue | 7 +- .../basicData/Warehouse/HistoricalTask.vue | 75 ++++++------ .../Warehouse/ProcessStorageManagement.vue | 12 +- .../basicData/Warehouse/StorageBoxInfo.vue | 21 ++-- .../Warehouse/components/CurrentTask-add.vue | 110 +++++++++++++++--- 8 files changed, 165 insertions(+), 89 deletions(-) diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js index 19d5938..e19df38 100644 --- a/src/lang/i18n/en/module/basicData.js +++ b/src/lang/i18n/en/module/basicData.js @@ -1,13 +1,8 @@ /* * @Author: gtz * @Date: 2021-03-04 16:13:51 -<<<<<<< HEAD - * @LastEditors: fzq - * @LastEditTime: 2022-03-11 11:13:47 -======= - * @LastEditors: gtz - * @LastEditTime: 2022-03-12 14:22:52 ->>>>>>> develop + * @LastEditors: zwq + * @LastEditTime: 2022-03-14 10:58:20 * @Description: file content */ export default { diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js index c64f787..f79ded7 100644 --- a/src/lang/i18n/zh/module/basicData.js +++ b/src/lang/i18n/zh/module/basicData.js @@ -1,14 +1,8 @@ /* * @Author: gtz * @Date: 2021-03-04 16:13:51 -<<<<<<< HEAD - * @LastEditors: fzq - * @LastEditTime: 2022-03-11 11:13:22 - * @Description: file content -======= - * @LastEditors: gtz - * @LastEditTime: 2022-03-12 14:23:06 ->>>>>>> develop + * @LastEditors: zwq + * @LastEditTime: 2022-03-14 10:58:12 */ 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/Warehouse/CurrentTask.vue b/src/views/basicData/Warehouse/CurrentTask.vue index aed2e5c..4714f3c 100644 --- a/src/views/basicData/Warehouse/CurrentTask.vue +++ b/src/views/basicData/Warehouse/CurrentTask.vue @@ -1,8 +1,8 @@