From 7fd51b5211309d8b68d81bbf7c23dd3ae9528064 Mon Sep 17 00:00:00 2001 From: zwq Date: Fri, 11 Mar 2022 16:38:54 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=BA=93=E4=BD=8D=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicData/Warehouse/StorageBoxInfo.js | 18 ++++++- src/lang/i18n/en/module/basicData.js | 4 +- src/lang/i18n/zh/module/basicData.js | 4 +- src/router/index.js | 1 + .../QualityManager/scrap/ScrapInfo-add.vue | 6 +-- src/views/QualityManager/scrap/index.vue | 50 +++++++++++++----- .../Warehouse/ProcessStorageManagement.vue | 30 ++++------- .../ProcessStorageManagement-info.vue | 51 ++++++++++--------- .../components/processStorageLink.vue | 45 +++++++++++----- .../components/processStorageType.vue | 26 +++++----- .../Warehouse/components/testdata.js | 4 +- 11 files changed, 149 insertions(+), 90 deletions(-) diff --git a/src/api/basicData/Warehouse/StorageBoxInfo.js b/src/api/basicData/Warehouse/StorageBoxInfo.js index aff83f9..c7cc981 100644 --- a/src/api/basicData/Warehouse/StorageBoxInfo.js +++ b/src/api/basicData/Warehouse/StorageBoxInfo.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 16:00:14 * @LastEditors: zwq - * @LastEditTime: 2022-01-17 13:59:54 + * @LastEditTime: 2022-03-11 16:23:43 * @Description: */ import request from '@/utils/request' @@ -84,3 +84,19 @@ export function StorageBoxRackDelete(id) { // 删除存储箱上架单条数据 data: { id } }) } + +export function batchListAdd(data) { // 新增工序库位关联 + return request({ + url: '/api/wms/processlocation/batchList', + method: 'post', + data + }) +} + +export function locationByProcessList(data) { // 工序库位列表获取 + return request({ + url: '/api/wms/processlocation/locationByProcess', + method: 'post', + data + }) +} diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js index ae4cedb..5678de2 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-11 08:28:27 + * @LastEditTime: 2022-03-11 10:55:37 * @Description: file content */ export default { @@ -255,7 +255,7 @@ export default { entryType: 'Manual/Automatic', automatic: 'automatic', manual: 'Manual', - workOrderId: 'workOrderId' + workOrderName: 'Work Order Name' }, productPool: { productName: 'Product Name', diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js index 14a5168..66b5b8e 100644 --- a/src/lang/i18n/zh/module/basicData.js +++ b/src/lang/i18n/zh/module/basicData.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-03-04 16:13:51 * @LastEditors: zwq - * @LastEditTime: 2022-03-11 08:28:40 + * @LastEditTime: 2022-03-11 10:55:25 */ export default { visual: { @@ -247,7 +247,7 @@ export default { entryType: '手动/自动', automatic: '自动', manual: '手动', - workOrderId: '工单名称' + workOrderName: '工单名称' }, processLocation: { sequence: '顺序', diff --git a/src/router/index.js b/src/router/index.js index ed1f480..2866192 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -281,6 +281,7 @@ export const constantRoutes = [ }, { path: '/StorageBoxRack', + hidden: true, component: () => import('@/views/basicData/Warehouse/StorageBoxRack'), name: 'StorageBoxRack', diff --git a/src/views/QualityManager/scrap/ScrapInfo-add.vue b/src/views/QualityManager/scrap/ScrapInfo-add.vue index aca8d97..6256350 100644 --- a/src/views/QualityManager/scrap/ScrapInfo-add.vue +++ b/src/views/QualityManager/scrap/ScrapInfo-add.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 16:37:56 * @LastEditors: zwq - * @LastEditTime: 2022-03-11 09:48:52 + * @LastEditTime: 2022-03-11 10:55:27 * @Description: -->