From ff8cd3980ad78dde4d83cdea9757f58e8d5f31b3 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 11 Nov 2024 16:56:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.wyf | 64 ---------------------------------------------------- package.json | 2 -- 2 files changed, 66 deletions(-) delete mode 100644 .env.wyf diff --git a/.env.wyf b/.env.wyf deleted file mode 100644 index 99bad36e9..000000000 --- a/.env.wyf +++ /dev/null @@ -1,64 +0,0 @@ -# 开发环境 -NODE_ENV=development - -VITE_DEV=false - - - -# SCP 28040 -# WMS 28050 -# # 请求路径 -# VITE_BASE_URL='http://dev.ccwin-in.com:28040/api' - -# # 上传路径 -# VITE_UPLOAD_URL='http://dev.ccwin-in.com:28040/admin-api/infra/file/upload' - - -# # 请求路径 -VITE_BASE_URL='http://192.168.1.196:12080' - -# 上传路径 -VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload' - -# # 请求路径 -# VITE_BASE_URL='http://192.168.1.35:12080' - -# # 上传路径 -# VITE_UPLOAD_URL='http://192.168.1.35:12080/admin-api/infra/file/upload' - - -# 接口前缀 -VITE_API_BASEPATH=/dev-api - -# 接口地址 -VITE_API_URL=/admin-api - -# 打包路径 -VITE_BASE_PATH=/ - -# 是否删除debugger -VITE_DROP_DEBUGGER=true - -# 是否删除console.log -VITE_DROP_CONSOLE=false - -# 是否sourcemap -VITE_SOURCEMAP=false - -# 输出路径 -VITE_OUT_DIR=dist - -# 自定义接口路径 -VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' - -# 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://localhost:12080' - -# 租户配置 -VITE_TENANT='["英泰"]' - -# 查看质检报告环境 -VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' - -# 是否需要验证码 -VITE_NEED_CODE = false diff --git a/package.json b/package.json index be8467242..03129b88d 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,7 @@ "private": false, "scripts": { "dev": "vite", - "wyf": "vite --mode wyf", "test": "vite build --mode test", - "test-scp": "vite build --mode test-scp", "prod": "vite build --mode prod", "preview": "vite preview", "lint": "eslint --fix --ext .js,.vue src" From 7a8d36582d433af4f6caf5273ac806dee7d53e5e Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 12 Nov 2024 09:24:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.wyf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.env.wyf b/.env.wyf index 99bad36e9..323d8245a 100644 --- a/.env.wyf +++ b/.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' From fd8d82a4615f030764c9b61f1d06fc0c2ee2a47c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 12 Nov 2024 09:56:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AD=96=E7=95=A5Area?= =?UTF-8?q?=E6=94=B9=E6=88=90AreaCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplieDeliveryStrategy/AddForm.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index b5520565a..0fae5ae31 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/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') || '' - WarehouseCodeOrArea.value= formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode') ? 'WarehouseCode' : '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' : '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') { - let Area = formData.value.condition.find(item => item['ParamCode'] == 'Area') - if(Area){ - Area.Value = val.map(item=>(item['code'])).join(',') + }else if (formField=='AreaCode') { + let AreaCode = formData.value.condition.find(item => item['ParamCode'] == 'AreaCode') + if(AreaCode){ + 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: '库区' }