From 81936ddf8b7522a0a7bb9da8134d9b8460e404c0 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 8 Nov 2024 09:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=A1=E4=BB=B6=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BB=93=E5=BA=93=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=94=B9=E4=B8=BA=E5=BA=93=E5=8C=BA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=AC=A1=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E4=BB=93=E5=BA=93=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=A4=A7=E9=95=9C=E8=AE=A9=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=BA=93=E5=8C=BA=EF=BC=8C=E5=BA=94=E8=AE=A9=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/supplieDeliveryStrategy/AddForm.vue           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index ab06bb539..736bc1df7 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -305,6 +305,7 @@ const querySupplierParams = ref({
 })
 
 
+const WarehouseCodeOrArea = ref('WarehouseCode')
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
   formStrategyCode.value = strategyCode
@@ -343,7 +344,8 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         //     item.Value = item.Value.split(',')
         //   }
         // })
-        warehouseCodeObj.value = formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode') || ''
+        warehouseCodeObj.value = formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode' || item['ParamCode'] == 'Area') || ''
+  WarehouseCodeOrArea.value= formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode') ? 'WarehouseCode' : 'Area'
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -353,6 +355,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formLoading.value = false
     }
   } else {
+  WarehouseCodeOrArea.value='WarehouseCode'
 
     Butttondata.value = [
       defaultButtons.formSaveBtn(null), // 保存
@@ -448,6 +451,7 @@ const resetForm = () => {
       PutAway:'TRUE'
     }
   }
+
 }
 
 const searchTableRef = ref()
@@ -647,7 +651,6 @@ const blurDockCode = async () => {
 const OperatorChange = (e, item) => {
   item.ScreenOperator =  rangeOptions.find((item) =>item.value === e)?.screenValue
 }
-const WarehouseCodeOrArea = ref('WarehouseCode')
 // 选择客户还是承运商
 const changeWarehouseArea = (e) => {
   formData.value.condition[0].Value = ''