From eed4353108e89cfc0c332783e7fc9090ae2d5c5c Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Mon, 18 Nov 2024 09:01:12 +0800
Subject: [PATCH] =?UTF-8?q?YT-1005=E3=80=90=E4=B8=8A=E6=9E=B6=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E3=80=91=E3=80=90=E5=8F=91=E6=96=99=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E5=8F=91=E8=B4=A7=E7=AD=96=E7=95=A5=E3=80=91?=
 =?UTF-8?q?=E7=9A=84=E8=A7=84=E5=88=99=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20=E2=80=9C=E4=BB=8E=E2=80=9D=20=E5=92=8C=20=E2=80=9C=E5=88=B0?=
 =?UTF-8?q?=E2=80=9D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/deliverStrategy/AddForm.vue      |  8 ++---
 .../strategy/downShelfStrategy/AddForm.vue    |  8 ++---
 .../strategy/upShelfStrategy/AddForm.vue      | 34 +++++++++++--------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
index eab47e110..8fa8ae8a9 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
@@ -262,7 +262,7 @@
 
 
                 <!-- 仓库 -->
-                <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse">
+                <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择从仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -271,7 +271,7 @@
                   </el-input>
 
                   <!-- 库区 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse">
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择从库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -281,7 +281,7 @@
 
                   
                   <!-- 库位组 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择从库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -290,7 +290,7 @@
                   </el-input>
 
                   <!-- 库位 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择从库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 14d13770a..0435b7bcb 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -375,7 +375,7 @@
 
 
                 <!-- 仓库 -->
-                <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse">
+                <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择从仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -384,7 +384,7 @@
                   </el-input>
 
                   <!-- 库区 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse">
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择从库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -394,7 +394,7 @@
 
                   
                   <!-- 库位组 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择从库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -403,7 +403,7 @@
                   </el-input>
 
                   <!-- 库位 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择从库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 8ee94ee3b..9e5525a12 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -60,7 +60,7 @@
                    :disabled="formData.priority==0&&formType=='update'"
                 >
                   <el-option
-                    :label="cur.label"
+                    :label= "cur.label"
                     :value="cur.value"
                     v-for="(cur, index) in options.warehouseTypeOptions"
                     :key="'仓库'+cur.value"
@@ -80,7 +80,7 @@
                   />
                 </el-select>
                 <!-- 仓库 -->
-                <el-input style="flex:1" v-show="item.ParamCode == 'WarehouseCode'" placeholder="请选择仓库" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'WarehouseCode'})" :disabled="formData.priority==0&&formType=='update'">
+                <el-input style="flex:1" v-show="item.ParamCode == 'WarehouseCode'" placeholder="请选择从仓库" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'WarehouseCode'})" :disabled="formData.priority==0&&formType=='update'">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'condition',type:'WarehouseCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -89,7 +89,7 @@
                   </el-input>
 
                   <!-- 库区 -->
-                  <el-input style="flex:1" v-show="item.ParamCode == 'AreaCode'" placeholder="请选择库区" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'AreaCode'})">
+                  <el-input style="flex:1" v-show="item.ParamCode == 'AreaCode'" placeholder="请选择从库区" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'AreaCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'condition',type:'AreaCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -98,7 +98,7 @@
                   </el-input>
 
                   <!-- 库位组 -->
-                  <el-input style="flex:1" v-show="item.ParamCode == 'LocationGroupCode'" placeholder="请选择库位组" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'LocationGroupCode'})">
+                  <el-input style="flex:1" v-show="item.ParamCode == 'LocationGroupCode'" placeholder="请选择从库位组" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'LocationGroupCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'condition',type:'LocationGroupCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -107,7 +107,7 @@
                   </el-input>
 
                   <!-- 库位 -->
-                  <el-input style="flex:1" v-show="item.ParamCode == 'LocationCode'" placeholder="请选择库位" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'LocationCode'})">
+                  <el-input style="flex:1" v-show="item.ParamCode == 'LocationCode'" placeholder="请选择从库位" v-model="item.Value" @blur="blurWarehouse({module:'condition',type:'LocationCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'condition',type:'LocationCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -420,7 +420,7 @@
                   <el-option
                     :label="cur.label"
                     :value="cur.value"
-                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    v-for="(cur, index) in options.warehouseTypeOptions2"
                     :key="'仓库'+cur.value"
                   />
                 </el-select>
@@ -437,7 +437,7 @@
                   
 
                   <!-- 仓库 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse({module:'config',type:'WarehouseCode'})">
+                  <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择到仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse({module:'config',type:'WarehouseCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'config',type:'WarehouseCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -446,7 +446,7 @@
                   </el-input>
 
                   <!-- 库区 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse({module:'config',type:'AreaCode'})">
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择到库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse({module:'config',type:'AreaCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'config',type:'AreaCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -455,7 +455,7 @@
                   </el-input>
 
                   <!-- 库位组 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse({module:'config',type:'LocationGroupCode'})">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择到库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse({module:'config',type:'LocationGroupCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'config',type:'LocationGroupCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -464,7 +464,7 @@
                   </el-input>
 
                   <!-- 库位 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse({module:'config',type:'LocationCode'})">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择到库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse({module:'config',type:'LocationCode'})">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse({module:'config',type:'LocationCode'})">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -844,10 +844,16 @@ const options = reactive({
   ],
 
   warehouseTypeOptions: [
-    { value: 'WarehouseCode', label: '仓库' },
-    { value: 'AreaCode', label: '库区' },
-    { value: 'LocationGroupCode', label: '库位组' },
-    { value: 'LocationCode', label: '库位' }
+    { value: 'WarehouseCode', label: '从仓库' },
+    { value: 'AreaCode', label: '从库区' },
+    { value: 'LocationGroupCode', label: '从库位组' },
+    { value: 'LocationCode', label: '从库位' }
+  ],
+  warehouseTypeOptions2: [
+    { value: 'WarehouseCode', label: '到仓库' },
+    { value: 'AreaCode', label: '到库区' },
+    { value: 'LocationGroupCode', label: '到库位组' },
+    { value: 'LocationCode', label: '到库位' }
   ],
   //仓库列表
   warehouseList: [],