From 7985991ca78cc61a96e26b362fad640f39d09c42 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Fri, 21 Jun 2024 14:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=93=E5=BA=93=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/baseinfo/goodsShelves/goodsShelves.js | 8 ++--- src/api/baseinfo/warehouse/warehouse.js | 10 +++--- .../baseinfo/warehouseArea/warehouseArea.js | 10 +++--- .../warehouseAreaType/warehouseAreaType.js | 10 +++--- .../goodsShelves/goodsShelvesAdd.vue | 35 ++++++++++++------- .../baseInfo/warehouses/warehouse/index.vue | 3 ++ .../warehouses/warehouse/warehouseAdd.vue | 12 +++++-- .../warehouses/warehouseArea/index.vue | 3 ++ .../warehouseArea/warehouseAreaAdd.vue | 19 +++++++--- .../warehouses/warehouseAreaType/index.vue | 3 ++ .../warehouseAreaTypeAdd.vue | 11 ++++++ 11 files changed, 86 insertions(+), 38 deletions(-) diff --git a/src/api/baseinfo/goodsShelves/goodsShelves.js b/src/api/baseinfo/goodsShelves/goodsShelves.js index 1c8bb37..de738e2 100644 --- a/src/api/baseinfo/goodsShelves/goodsShelves.js +++ b/src/api/baseinfo/goodsShelves/goodsShelves.js @@ -5,7 +5,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/wmswarehouserack/listPage', + url: '/wms/apiadmin/warehouserack/listPage', method: 'post', data: params, }) @@ -15,7 +15,7 @@ export default { // 修改是否可用状态 updateIsEnable: function(sid,isEnable) { return request({ - url: '/wms/apiadmin/base/wmswarehouserack/updateIsEnable/'+sid+"/"+isEnable + url: '/wms/apiadmin/warehouserack/updateIsEnable/'+sid+"/"+isEnable }); }, @@ -23,7 +23,7 @@ export default { // 新增、保存 saveGoodsShelves: function(data) { return request({ - url: '/wms/apiadmin/base/wmswarehouserack/saveOrUpdate', + url: '/wms/apiadmin/warehouserack/saveOrUpdate', method: 'post', data: data }); @@ -32,7 +32,7 @@ export default { // 初始化 initGoodsShelves: function(data) { return request({ - url: '/wms/apiadmin/base/wmswarehouserack/initialization/' + data, + url: '/wms/apiadmin/warehouserack/initialization/' + data, method: 'get' }); }, diff --git a/src/api/baseinfo/warehouse/warehouse.js b/src/api/baseinfo/warehouse/warehouse.js index bbf32cd..ea1a719 100644 --- a/src/api/baseinfo/warehouse/warehouse.js +++ b/src/api/baseinfo/warehouse/warehouse.js @@ -5,7 +5,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/listPage', + url: '/wms/apiadmin/warehouseinfo/listPage', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -14,7 +14,7 @@ export default { // 仓库查询 getAllWarehouse: function(params) { return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', + url: '/wms/apiadmin/warehouseinfo/listAll', method: 'post', data: params, headers: { @@ -27,7 +27,7 @@ export default { // 修改是否可用状态 updateIsEnable: function(sid,isEnable) { return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/updateStatus/'+sid+"/"+isEnable + url: '/wms/apiadmin/warehouseinfo/updateStatus/'+sid+"/"+isEnable }); }, @@ -35,7 +35,7 @@ export default { // 新增、保存 saveWarehouse: function(data) { return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/saveOrUpdate', + url: '/wms/apiadmin/warehouseinfo/saveOrUpdate', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -45,7 +45,7 @@ export default { // 初始化 initWarehouse: function(data) { return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/initialization/' + data, + url: '/wms/apiadmin/warehouseinfo/initialization/' + data, method: 'get' }); }, diff --git a/src/api/baseinfo/warehouseArea/warehouseArea.js b/src/api/baseinfo/warehouseArea/warehouseArea.js index f6fb1c5..fd08dac 100644 --- a/src/api/baseinfo/warehouseArea/warehouseArea.js +++ b/src/api/baseinfo/warehouseArea/warehouseArea.js @@ -5,7 +5,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/wmswarehousearea/listPage', + url: '/wms/apiadmin/warehousearea/listPage', method: 'post', data: params, }) @@ -14,7 +14,7 @@ export default { // 库区查询 getAllWarehousearea: function(params) { return request({ - url: '/wms/apiadmin/base/wmswarehousearea/listAll', + url: '/wms/apiadmin/warehousearea/listAll', method: 'post', data: params, headers: { @@ -27,7 +27,7 @@ export default { // 修改是否可用状态 updateIsEnable: function(sid,isEnable) { return request({ - url: '/wms/apiadmin/base/wmswarehousearea/updateIsEnable/'+sid+"/"+isEnable + url: '/wms/apiadmin/warehousearea/updateIsEnable/'+sid+"/"+isEnable }); }, @@ -35,7 +35,7 @@ export default { // 新增、保存 saveWarehousearea: function(data) { return request({ - url: '/wms/apiadmin/base/wmswarehousearea/saveOrUpdate', + url: '/wms/apiadmin/warehousearea/saveOrUpdate', method: 'post', data: data }); @@ -44,7 +44,7 @@ export default { // 初始化 initWarehousearea: function(data) { return request({ - url: '/wms/apiadmin/base/wmswarehousearea/initialization/' + data, + url: '/wms/apiadmin/warehousearea/initialization/' + data, method: 'get' }); }, diff --git a/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js b/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js index 7dc5860..61dba33 100644 --- a/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js +++ b/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js @@ -6,7 +6,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/wmswarehouseareatype/listPage', + url: '/wms/apiadmin/warehouseareatype/listPage', method: 'post', data: params, }) @@ -15,7 +15,7 @@ export default { // 库去类型查询 getAllWarehouseareatype: function(params) { return request({ - url: '/wms/apiadmin/base/wmswarehouseareatype/listAll', + url: '/wms/apiadmin/warehouseareatype/listAll', method: 'post', data: params, headers: { @@ -29,7 +29,7 @@ export default { // 修改是否可用状态 updateIsEnable: function(sid,isEnable) { return request({ - url: '/wms/apiadmin/base/wmswarehouseareatype/updateIsEnable/'+sid+"/"+isEnable + url: '/wms/apiadmin/warehouseareatype/updateIsEnable/'+sid+"/"+isEnable }); }, @@ -37,7 +37,7 @@ export default { // 新增、保存 saveWarehousearea: function(data) { return request({ - url: '/wms/apiadmin/base/wmswarehouseareatype/saveOrUpdate', + url: '/wms/apiadmin/warehouseareatype/saveOrUpdate', method: 'post', data: data }); @@ -46,7 +46,7 @@ export default { // 初始化 initWarehousearea: function(data) { return request({ - url: '/wms/apiadmin/base/wmswarehouseareatype/initialization/' + data, + url: '/wms/apiadmin/warehouseareatype/initialization/' + data, method: 'get' }); }, diff --git a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue index 63d56ac..b3c8ee5 100644 --- a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue +++ b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue @@ -69,6 +69,10 @@ locationName: '', locationSid: '', remarks: '', + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), }, warehouseList: [], @@ -80,12 +84,14 @@ }, methods: { initData() { - - req2.getAllWarehouse().then(resp => { + var parpams = { + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + } + req2.getAllWarehouse(parpams).then(resp => { this.warehouseList = resp.data }) - req3.getAllWarehousearea().then(resp => { + req3.getAllWarehousearea(parpams).then(resp => { this.warehouseAreaList = resp.data }) @@ -111,19 +117,22 @@ handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') this.formobj = { - sid: '', - rackName: '', - rackCode: '', - warehouseName: '', - warehouseSid: '', - locationName: '', - locationSid: '', - remarks: '', + sid: '', + rackName: '', + rackCode: '', + warehouseName: '', + warehouseSid: '', + locationName: '', + locationSid: '', + remarks: '', + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') }, - showAdd() { - }, + showAdd() {}, showEdit(row) { req.initGoodsShelves(row.sid) .then(resp => { diff --git a/src/views/baseInfo/warehouses/warehouse/index.vue b/src/views/baseInfo/warehouses/warehouse/index.vue index c70b92f..fa61c8b 100644 --- a/src/views/baseInfo/warehouses/warehouse/index.vue +++ b/src/views/baseInfo/warehouses/warehouse/index.vue @@ -159,6 +159,9 @@ }, loadList() { this.tableLoading = true + this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') + this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.queryParams.params.menuUrl = this.$route.path req.listPage(this.queryParams).then((resp) => { this.tableLoading = false if (resp.success) { diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue index e28f4f0..d1d99db 100644 --- a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue +++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue @@ -104,7 +104,11 @@ squareMeter: '', sortNo: '', remarks: '', - warehouseType: "0" + warehouseType: "0", + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), }, } }, @@ -147,7 +151,11 @@ squareMeter: '', sortNo: '', remarks: '', - warehouseType: "0" + warehouseType: "0", + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') }, diff --git a/src/views/baseInfo/warehouses/warehouseArea/index.vue b/src/views/baseInfo/warehouses/warehouseArea/index.vue index ba02346..9108ff1 100644 --- a/src/views/baseInfo/warehouses/warehouseArea/index.vue +++ b/src/views/baseInfo/warehouses/warehouseArea/index.vue @@ -158,6 +158,9 @@ }, loadList() { this.tableLoading = true + this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') + this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.queryParams.params.menuUrl = this.$route.path req.listPage(this.queryParams).then((resp) => { this.tableLoading = false if (resp.success) { diff --git a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue index e07dcf9..e69351d 100644 --- a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue +++ b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue @@ -80,7 +80,11 @@ warehouseName: '', warehouseSid: '', areaTypeSid: "", - areaTypeName: "" + areaTypeName: "", + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), }, warehouseList: [], @@ -92,11 +96,14 @@ }, methods: { initData() { - req2.getAllWarehouse().then(resp => { + var parpams = { + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + } + req2.getAllWarehouse(parpams).then(resp => { this.warehouseList = resp.data }) - req3.getAllWarehouseareatype().then(resp => { + req3.getAllWarehouseareatype(parpams).then(resp => { this.warehouseTypeList = resp.data }) @@ -129,7 +136,11 @@ unit: '', remarks: '', areaTypeSid: "", - areaTypeName: "" + areaTypeName: "", + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') diff --git a/src/views/baseInfo/warehouses/warehouseAreaType/index.vue b/src/views/baseInfo/warehouses/warehouseAreaType/index.vue index 651bf28..7eeb11f 100644 --- a/src/views/baseInfo/warehouses/warehouseAreaType/index.vue +++ b/src/views/baseInfo/warehouses/warehouseAreaType/index.vue @@ -155,6 +155,9 @@ }, loadList() { this.tableLoading = true + this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') + this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.queryParams.params.menuUrl = this.$route.path req.listPage(this.queryParams).then((resp) => { this.tableLoading = false if (resp.success) { diff --git a/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue b/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue index 9287775..6da8be5 100644 --- a/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue +++ b/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue @@ -44,6 +44,11 @@ sid: '', warehouseAreaTypeName: '', remarks: '', + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), + }, } @@ -71,7 +76,13 @@ if (isreload === 'true') this.$emit('reloadlist') this.formobj = { sid: '', + warehouseAreaTypeName: '', remarks: '', + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), + } this.$emit('doback') },