Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

.env.wyf

@@ -8,17 +8,17 @@ VITE_DEV=false
 # SCP 28040
 # WMS 28050
 # # 请求路径
-# VITE_BASE_URL='http://dev.ccwin-in.com:28040/api'
+VITE_BASE_URL='http://dev.ccwin-in.com:28050/api'
 
-# # 上传路径
+# 上传路径
-# VITE_UPLOAD_URL='http://dev.ccwin-in.com:28040/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://dev.ccwin-in.com:28050/admin-api/infra/file/upload'
 
 
-# # 请求路径
+# # # 请求路径
-VITE_BASE_URL='http://192.168.1.196:12080'
+# VITE_BASE_URL='http://192.168.1.196:12080'
 
-# 上传路径
+# # 上传路径
-VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload'
+# VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload'
 
 # # 请求路径
 # VITE_BASE_URL='http://192.168.1.35:12080'

package.json

@@ -6,7 +6,6 @@
   "private": false,
   "scripts": {
     "dev": "vite",
-    "wyf": "vite --mode wyf",
     "test": "vite build --mode test",
     "prod": "vite build --mode prod",
     "preview": "vite preview",

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -277,7 +277,7 @@ const options = reactive({
   // 仓库和库区下拉列表
   warehouseAreaOptions: [
     {value: 'WarehouseCode', label: '仓库' },
-    {value: 'Area', label: '库区' }
+    {value: 'AreaCode', label: '库区' }
   ],
   // 供应商范围下拉框列表
   WarehouseCodeRangeOptions: formatRangeOptions('IN', 'NOT IN'),
@@ -347,8 +347,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' || item['ParamCode'] == 'Area') || ''
+        warehouseCodeObj.value = formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode' || item['ParamCode'] == 'AreaCode') || ''
-  WarehouseCodeOrArea.value= formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode') ? 'WarehouseCode' : 'Area'
+  WarehouseCodeOrArea.value= formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode') ? 'WarehouseCode' : 'AreaCode'
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -485,7 +485,7 @@ const searchWarehouse = () => {
       '请选择库区',
       Area.allSchemas,
       AreaApi.getAreaPage,
-      'Area',
+      'AreaCode',
       'code',
       true,
       undefined,
@@ -546,10 +546,10 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
       warehouseCodeObj.value.Value = val.map(item => (item['code'])).join(',')
       // formData.value.configuration['DockCode']=''
     }
-  }else if (formField=='Area') {
+  }else if (formField=='AreaCode') {
-    let Area = formData.value.condition.find(item => item['ParamCode'] == 'Area')
+    let AreaCode = formData.value.condition.find(item => item['ParamCode'] == 'AreaCode')
-    if(Area){
+    if(AreaCode){
-      Area.Value = val.map(item=>(item['code'])).join(',')
+      AreaCode.Value = val.map(item=>(item['code'])).join(',')
     }
   }  else if (formField=='SupplierCode') {
     let SupplierCode = formData.value.condition.find(item => item['ParamCode'] == 'SupplierCode')
@@ -669,12 +669,12 @@ const changeWarehouseArea = (e) => {
         // formData.value.configuration.DockCode=''
         // formData.value.configuration.Receiver=''
         // formData.value.configuration.PhoneNumber=''
-  } else if (e == 'Area') {
+  } else if (e == 'AreaCode') {
     // getFormSupplierList()
   }
 }
   //  {value: 'WarehouseCode', label: '仓库' },
-  //   {value: 'Area', label: '库区' }
+  //   {value: 'AreaCode', label: '库区' }
 </script>
 <style scoped lang="scss">
 .item {