From 4ba28bf8168da6b7793eadf526710db19974ac38 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 22 Jul 2024 08:55:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=8B=E8=AF=95=E9=81=87?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/baseinfo/goodsShelves/goodsShelves.js | 19 ++- src/api/baseinfo/warehouse/warehouse.js | 28 +++- .../baseinfo/warehouseArea/warehouseArea.js | 43 ++++-- .../warehouseAreaType/warehouseAreaType.js | 19 ++- .../baseInfo/supplier/supplier/supplier.vue | 6 +- .../goodsShelves/goodsShelvesAdd.vue | 35 ++++- .../warehouses/goodsShelves/index.vue | 70 +++++++++- .../baseInfo/warehouses/warehouse/index.vue | 73 +++++++++- .../warehouses/warehouse/warehouseAdd.vue | 22 ++- .../warehouses/warehouseArea/index.vue | 71 +++++++++- .../warehouseArea/warehouseAreaAdd.vue | 29 ++++ .../warehouses/warehouseAreaType/index.vue | 69 +++++++++- src/views/goods/category/categoryAdd.vue | 2 +- src/views/goods/goods/goodsAdd.vue | 126 +++++++++++++----- 14 files changed, 532 insertions(+), 80 deletions(-) diff --git a/src/api/baseinfo/goodsShelves/goodsShelves.js b/src/api/baseinfo/goodsShelves/goodsShelves.js index de738e2..4909581 100644 --- a/src/api/baseinfo/goodsShelves/goodsShelves.js +++ b/src/api/baseinfo/goodsShelves/goodsShelves.js @@ -13,10 +13,10 @@ export default { // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/wms/apiadmin/warehouserack/updateIsEnable/'+sid+"/"+isEnable - }); + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/wms/apiadmin/warehouserack/updateIsEnable/' + sid + "/" + isEnable + }); }, @@ -37,5 +37,16 @@ export default { }); }, + // 库位-- 删除 + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/warehouserack/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, } diff --git a/src/api/baseinfo/warehouse/warehouse.js b/src/api/baseinfo/warehouse/warehouse.js index ea1a719..91624ea 100644 --- a/src/api/baseinfo/warehouse/warehouse.js +++ b/src/api/baseinfo/warehouse/warehouse.js @@ -8,7 +8,9 @@ export default { url: '/wms/apiadmin/warehouseinfo/listPage', method: 'post', data: params, - headers: { 'Content-Type': 'application/json' } + headers: { + 'Content-Type': 'application/json' + } }) }, // 仓库查询 @@ -25,10 +27,10 @@ export default { // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/wms/apiadmin/warehouseinfo/updateStatus/'+sid+"/"+isEnable - }); + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/wms/apiadmin/warehouseinfo/updateStatus/' + sid + "/" + isEnable + }); }, @@ -38,7 +40,9 @@ export default { url: '/wms/apiadmin/warehouseinfo/saveOrUpdate', method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { + 'Content-Type': 'application/json' + } }); }, @@ -50,5 +54,17 @@ export default { }); }, + // 仓库-- 删除 + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/warehouseinfo/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + } diff --git a/src/api/baseinfo/warehouseArea/warehouseArea.js b/src/api/baseinfo/warehouseArea/warehouseArea.js index fd08dac..7a64e8b 100644 --- a/src/api/baseinfo/warehouseArea/warehouseArea.js +++ b/src/api/baseinfo/warehouseArea/warehouseArea.js @@ -15,20 +15,33 @@ export default { getAllWarehousearea: function(params) { return request({ url: '/wms/apiadmin/warehousearea/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, + // 根据仓库sid查询库区 + getAllWarehouseareaBysid: function(params) { + return request({ + url: '/wms/apiadmin//warehousearea/selectAll', + method: 'get', + params: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/wms/apiadmin/warehousearea/updateIsEnable/'+sid+"/"+isEnable - }); + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/wms/apiadmin/warehousearea/updateIsEnable/' + sid + "/" + isEnable + }); }, @@ -49,5 +62,17 @@ export default { }); }, + // 库区-- 删除 + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/warehousearea/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + } diff --git a/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js b/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js index 61dba33..a608d20 100644 --- a/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js +++ b/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js @@ -27,10 +27,10 @@ export default { // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/wms/apiadmin/warehouseareatype/updateIsEnable/'+sid+"/"+isEnable - }); + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/wms/apiadmin/warehouseareatype/updateIsEnable/' + sid + "/" + isEnable + }); }, @@ -51,6 +51,17 @@ export default { }); }, + // 库区类型-- 删除 + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/warehouseareatype/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, } diff --git a/src/views/baseInfo/supplier/supplier/supplier.vue b/src/views/baseInfo/supplier/supplier/supplier.vue index 2aeedc8..1d3522c 100644 --- a/src/views/baseInfo/supplier/supplier/supplier.vue +++ b/src/views/baseInfo/supplier/supplier/supplier.vue @@ -9,10 +9,10 @@ {{ searchxianshitit }}
- + - + @@ -47,7 +47,7 @@ - + diff --git a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue index e3a3e9d..0358c19 100644 --- a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue +++ b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue @@ -89,14 +89,29 @@ this.warehouseList = resp.data }) - req3.getAllWarehousearea(parpams).then(resp => { - this.warehouseAreaList = resp.data - }) - }, saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) + + if (this.formobj.warehouseName == '' || this.formobj.warehouseSid == '') { + this.$message({ + showClose: true, + type: 'error', + message: '所属仓库不能为空' + }) + return + } + + if (this.formobj.locationName == '' || this.formobj.locationSid == '') { + this.$message({ + showClose: true, + type: 'error', + message: '所属仓区不能为空' + }) + return + } + req.saveGoodsShelves(this.formobj) .then(resp => { if (resp.success) { @@ -146,6 +161,18 @@ console.log('>>>>>>>>>selectWarehouseChange', choose) this.formobj.warehouseSid = choose[0].sid this.formobj.warehouseName = choose[0].warehouseName + + this.formobj.locationSid = '' + this.formobj.locationName = '' + + var params = { + ckSid: choose[0].sid + } + + req3.getAllWarehouseareaBysid(params).then(resp => { + this.warehouseAreaList = resp.data + }) + }, selectWarehouseAreaChange(val) { const choose = this.warehouseAreaList.filter((item) => item.sid == val) diff --git a/src/views/baseInfo/warehouses/goodsShelves/index.vue b/src/views/baseInfo/warehouses/goodsShelves/index.vue index df04058..8bc6fca 100644 --- a/src/views/baseInfo/warehouses/goodsShelves/index.vue +++ b/src/views/baseInfo/warehouses/goodsShelves/index.vue @@ -27,10 +27,11 @@
- - + + - +