From 35403f6fabdf2af8c6ecb4b4c2bc9132f48d9f8d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 16 Jun 2023 09:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B5=81=E7=A8=8B=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BC=98=E5=8C=96=EF=BC=8C=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- src/api/basic/busType.js | 1 + src/api/system/invSubWarehouse.js | 11 +++++++++++ src/views/basic/business/stockOrder.vue | 9 ++------- src/views/purchase/purApply/purApplyEditDiaolog.vue | 9 +++++---- src/views/purchase/purOrder/purOrder.vue | 1 + src/views/purchase/purOrder/purOrderAudit.vue | 1 + src/views/purchase/purOrder/purOrderSearch.vue | 1 + 8 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.env.production b/.env.production index 15e46cb6..21ea9a52 100644 --- a/.env.production +++ b/.env.production @@ -25,13 +25,13 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' # 平潭正式 -VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # 漳州中医院 -# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js index d3d7af70..982a4d58 100644 --- a/src/api/basic/busType.js +++ b/src/api/basic/busType.js @@ -1,4 +1,5 @@ import axios from "@/utils/request"; + //获取数据 export function getBusTypeList(params) { return axios({ diff --git a/src/api/system/invSubWarehouse.js b/src/api/system/invSubWarehouse.js index 8c970ae7..094f492e 100644 --- a/src/api/system/invSubWarehouse.js +++ b/src/api/system/invSubWarehouse.js @@ -19,6 +19,16 @@ export function findInvByUser(query) { }); } + +export function filterGroupBySpuse(params) { + return axios({ + url: "/spms/inv/warehouse/filterGroupBySpuse", + method: "get", + params: params + }); +} + + //获取除了自己所有其他仓库 export function findByFrom(query) { return axios({ @@ -76,6 +86,7 @@ export function deleteSubWarehouse(data) { data: data }); } + //查询第三方系统和仓库数据关联信息 export function getSubThrsysDetail(params) { return axios({ diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index 838a4681..394f8f51 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -17,11 +17,6 @@ - - - - - @@ -227,7 +222,7 @@ export default { limit: 10, startTime: "", endTime: "", - inCodeStatus: 1, + inCodeStatus: 0, }, detailQuery: { orderIdFk: "", @@ -344,7 +339,7 @@ export default { limit: 10, startTime: "", endTime: "", - inCodeStatus: 1, + inCodeStatus: 0, }; this.getList(); diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue index 98b30516..bf8ce623 100644 --- a/src/views/purchase/purApply/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue @@ -61,7 +61,7 @@ - { this.subInvList = response.data || []; if (this.subInvList != null && this.subInvList.length == 1) { diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue index 5909929c..56bc8cf3 100644 --- a/src/views/purchase/purOrder/purOrder.vue +++ b/src/views/purchase/purOrder/purOrder.vue @@ -84,6 +84,7 @@ +