diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js index 3f2d830..af28a1d 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-09 14:24:45 + * @LastEditTime: 2022-03-09 15:14:15 * @Description: file content */ export default { @@ -320,6 +320,7 @@ export default { LocationCode: 'Location Code', PerformTaskManual: 'Perform Task Manual', processStorageLink: 'Process Storage Link', - SelectStorageType: 'Select Storage Type' + SelectStorageType: 'Select Storage Type', + LocationStorageSetting: 'Location Storage Setting' } } diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js index 26aff57..2646129 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-09 14:24:03 + * @LastEditTime: 2022-03-09 15:14:07 */ export default { visual: { @@ -334,6 +334,7 @@ export default { LocationCode: '库位编码', PerformTaskManual: '手动执行任务', processStorageLink: '工序关联库位', - SelectStorageType: '选择库位类型' + SelectStorageType: '选择库位类型', + LocationStorageSetting: '库位存储箱设置' } } diff --git a/src/views/basicData/Warehouse/components/processStorageLink.vue b/src/views/basicData/Warehouse/components/processStorageLink.vue index 2f03fa1..21a0f88 100644 --- a/src/views/basicData/Warehouse/components/processStorageLink.vue +++ b/src/views/basicData/Warehouse/components/processStorageLink.vue @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-03-03 09:16:10 * @LastEditors: zwq - * @LastEditTime: 2022-03-09 14:30:59 + * @LastEditTime: 2022-03-09 15:17:46 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue --> @@ -355,11 +355,8 @@ export default { } } }, - setStorageList(id, type) { - const obj = { - id, - type - } + setStorageList(id, dataForm) { + const obj = Object.assign({ id }, dataForm) this.selectStorageList.push(obj) }, handleChange(v) { diff --git a/src/views/basicData/Warehouse/components/processStorageType.vue b/src/views/basicData/Warehouse/components/processStorageType.vue index 2937746..fc52776 100644 --- a/src/views/basicData/Warehouse/components/processStorageType.vue +++ b/src/views/basicData/Warehouse/components/processStorageType.vue @@ -2,17 +2,37 @@ * @Author: zwq * @Date: 2020-12-29 16:37:56 * @LastEditors: zwq - * @LastEditTime: 2022-03-09 11:18:51 + * @LastEditTime: 2022-03-09 15:14:20 * @Description: -->