From f5a003876fee5f87edc61a1a50f1be04cb83936d Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 7 Mar 2022 09:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/i18n.js | 4 + src/lang/i18n/en/module/art.js | 5 +- src/lang/i18n/en/module/basicData.js | 7 +- src/lang/i18n/zh/module/art.js | 5 +- src/lang/i18n/zh/module/basicData.js | 14 +- src/router/index.js | 15 ++ src/views/basicData/Warehouse/CurrentTask.vue | 15 +- .../Warehouse/ProcessStorageManagement.vue | 202 ++++++++++++++++++ .../Warehouse/components/CurrentTask-add.vue | 125 +++++++++++ .../ProcessStorageManagement-info.vue | 166 ++++++++++++++ .../components/processStorageLink.vue | 175 +++++++++++++++ 11 files changed, 716 insertions(+), 17 deletions(-) create mode 100644 src/views/basicData/Warehouse/ProcessStorageManagement.vue create mode 100644 src/views/basicData/Warehouse/components/CurrentTask-add.vue create mode 100644 src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue create mode 100644 src/views/basicData/Warehouse/components/processStorageLink.vue diff --git a/src/lang/i18n.js b/src/lang/i18n.js index a150261..cfa7dcf 100644 --- a/src/lang/i18n.js +++ b/src/lang/i18n.js @@ -747,6 +747,10 @@ export default { HistoricalTask: { zh: '历史任务', en: 'Historical Task' + }, + ProcessStorageManagement: { + zh: '工序存储区域管理', + en: 'Process Storage Management' } }, order: { diff --git a/src/lang/i18n/en/module/art.js b/src/lang/i18n/en/module/art.js index 7310955..81b0a3d 100644 --- a/src/lang/i18n/en/module/art.js +++ b/src/lang/i18n/en/module/art.js @@ -1,8 +1,8 @@ /* * @Author: gtz * @Date: 2021-03-08 09:45:54 - * @LastEditors: gtz - * @LastEditTime: 2021-04-15 19:34:46 + * @LastEditors: zwq + * @LastEditTime: 2022-03-04 15:07:12 * @Description: file content */ @@ -47,6 +47,7 @@ export default { sameEqError: 'Can not choice same equipment!', processList: { processName: 'Process Step Name', + processCode: 'process Code', processEq: 'Process Step Equipment', description: 'Description', addProcess: 'Add a Process Step', diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js index 540e899..6b0ec17 100644 --- a/src/lang/i18n/en/module/basicData.js +++ b/src/lang/i18n/en/module/basicData.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-03-04 16:13:51 * @LastEditors: zwq - * @LastEditTime: 2022-03-04 10:13:58 + * @LastEditTime: 2022-03-04 15:24:39 * @Description: file content */ export default { @@ -287,6 +287,7 @@ export default { BoxStatus: 'Box Status', BoxNumber: 'Box Number', PreviousOperation: 'Previous Operation', + ExecutionOperation: 'Execution Operation', NextOperation: 'Next Operation', CompletionTime: 'Completion Time', StartLocation: 'Start Location', @@ -315,6 +316,8 @@ export default { IsEmpty: 'Is Empty', IsEmptyBox: 'Is Empty Box', LocationName: 'Location Name', - LocationCode: 'Location Code' + LocationCode: 'Location Code', + PerformTaskManual: 'Perform Task Manual', + processStorageLink: 'Process Storage Link' } } diff --git a/src/lang/i18n/zh/module/art.js b/src/lang/i18n/zh/module/art.js index 4e75646..4c73a7f 100644 --- a/src/lang/i18n/zh/module/art.js +++ b/src/lang/i18n/zh/module/art.js @@ -1,8 +1,8 @@ /* * @Author: gtz * @Date: 2021-03-08 09:46:00 - * @LastEditors: gtz - * @LastEditTime: 2021-04-15 19:35:00 + * @LastEditors: zwq + * @LastEditTime: 2022-03-04 15:07:02 * @Description: file content */ @@ -47,6 +47,7 @@ export default { sameEqError: '不能选择相同的设备!', processList: { processName: '工序名称', + processCode: '工序编码', processEq: '工序设备', description: '描述', addProcess: '添加一道工序', diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js index 61a1620..ad889f2 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-06 19:53:27 -======= * @LastEditors: zwq - * @LastEditTime: 2022-03-04 10:13:41 ->>>>>>> develop - * @Description: file content + * @LastEditTime: 2022-03-07 09:14:33 */ export default { visual: { @@ -307,6 +301,7 @@ export default { BoxStatus: '箱状态', BoxNumber: '箱号', PreviousOperation: '上一个工序', + ExecutionOperation: '执行工序', NextOperation: '下一个工序', CompletionTime: '完成时间', StartLocation: '开始库位', @@ -335,7 +330,8 @@ export default { IsEmpty: '是否有基板', IsEmptyBox: '是否空箱', LocationName: '库位名', - LocationCode: '库位编码' - + LocationCode: '库位编码', + PerformTaskManual: '手动执行任务', + processStorageLink: '工序关联库位' } } diff --git a/src/router/index.js b/src/router/index.js index d149f69..c19af58 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -298,6 +298,21 @@ export const constantRoutes = [ import('@/views/basicData/Warehouse/HistoricalTask'), name: 'HistoricalTask', meta: { title: routerTitle.Warehouse.HistoricalTask?.[language] || routerTitle.Warehouse.HistoricalTask.en, icon: 'form', affix: true, required: true, requireToken: true } + }, + { + path: '/ProcessStorageManagement', + component: () => + import('@/views/basicData/Warehouse/ProcessStorageManagement'), + name: 'ProcessStorageManagement', + meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true } + }, + { + path: '/ProcessStorageManagementInfo', + hidden: true, + component: () => + import('@/views/basicData/Warehouse/components/ProcessStorageManagement-info'), + name: 'ProcessStorageManagementInfo', + meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true } } ] }, diff --git a/src/views/basicData/Warehouse/CurrentTask.vue b/src/views/basicData/Warehouse/CurrentTask.vue index 9ec0239..8a93c20 100644 --- a/src/views/basicData/Warehouse/CurrentTask.vue +++ b/src/views/basicData/Warehouse/CurrentTask.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 15:41:11 * @LastEditors: zwq - * @LastEditTime: 2022-01-14 15:54:12 + * @LastEditTime: 2022-03-04 10:56:41 * @Description: --> + + diff --git a/src/views/basicData/Warehouse/components/CurrentTask-add.vue b/src/views/basicData/Warehouse/components/CurrentTask-add.vue new file mode 100644 index 0000000..af1104c --- /dev/null +++ b/src/views/basicData/Warehouse/components/CurrentTask-add.vue @@ -0,0 +1,125 @@ + + + + diff --git a/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue b/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue new file mode 100644 index 0000000..0817d25 --- /dev/null +++ b/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue @@ -0,0 +1,166 @@ + + + + + + diff --git a/src/views/basicData/Warehouse/components/processStorageLink.vue b/src/views/basicData/Warehouse/components/processStorageLink.vue new file mode 100644 index 0000000..0cadf20 --- /dev/null +++ b/src/views/basicData/Warehouse/components/processStorageLink.vue @@ -0,0 +1,175 @@ + + + + + +