From 6b6eb66145b0cdb4c38c97053631858496f77cd1 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Wed, 9 Mar 2022 15:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0-=E4=BB=93=E5=BA=93-=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/i18n/en/module/basicData.js          |  5 +-
 src/lang/i18n/zh/module/basicData.js          |  5 +-
 .../components/processStorageLink.vue         |  9 ++--
 .../components/processStorageType.vue         | 50 ++++++++++++++++---
 4 files changed, 52 insertions(+), 17 deletions(-)

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:
 -->
 <template>
   <el-dialog
-    :title="$t('module.basicData.Warehouse.SelectStorageType') | i18nFilter"
+    :title="$t('module.basicData.Warehouse.LocationStorageSetting') | i18nFilter"
     :visible.sync="visible"
   >
-    <el-radio v-model="storageType" :label="1">Working Port</el-radio>
-    <el-radio v-model="storageType" :label="2">Buffer Port</el-radio>
-    <el-radio v-model="storageType" :label="3">Exception Port</el-radio>
+    <el-form
+      ref="dataForm"
+      :model="dataForm"
+      size="medium"
+      label-width="110px"
+      label-position="left"
+    >
+      <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="storageType">
+        <el-radio v-model="dataForm.storageType" :label="1">Working Port</el-radio>
+        <el-radio v-model="dataForm.storageType" :label="2">Buffer Port</el-radio>
+        <el-radio v-model="dataForm.storageType" :label="3">Exception Port</el-radio>
+      </el-form-item>
+      <el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageBoxName">
+        <el-select v-model="dataForm.storageBoxName" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable>
+          <el-option
+            v-for="item in storageBoxArr"
+            :key="item.id"
+            :label="item.storageBoxName"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
       <el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
@@ -21,24 +41,40 @@
 </template>
 
 <script>
+import { storageBoxList } from '@/api/basicData/Cache/storageBox'
 
 export default {
   data() {
     return {
       visible: false,
       storageId: '',
-      storageType: 1
+      dataForm: {
+        storageType: 1,
+        storageBoxName: ''
+      },
+      storageBoxArr: []
     }
   },
   methods: {
     init(id) {
       this.storageId = id
+      const listQuery = {
+        current: 1,
+        size: 999
+      }
+      storageBoxList(listQuery).then(response => {
+        if (response.data.records) {
+          this.storageBoxArr = response.data.records
+        } else {
+          this.storageBoxArr.splice(0, this.list.length)
+        }
+      })
       this.visible = true
     },
     // 表单提交
     dataFormSubmit() {
       this.visible = false
-      this.$emit('refreshDataList', this.storageId, this.storageType)
+      this.$emit('refreshDataList', this.storageId, this.dataForm)
     }
   }
 }