diff --git a/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js b/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js index 58a9afa20e..db61db7ab6 100644 --- a/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js +++ b/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js @@ -1,7 +1,6 @@ import request from '@/utils/request' export default { - // 查询分页列表 listPage: function(params) { return request({ @@ -23,10 +22,8 @@ export default { headers: { 'Content-Type': 'application/json' } - }); + }) }, - - // 选择厂家 choiceManufacturer: function(params) { return request({ @@ -38,7 +35,6 @@ export default { } }) }, - // 查询所有仓库 getWarehouses: function(params) { return request({ @@ -50,8 +46,7 @@ export default { } }) }, - - // 根据仓库查询库位 + // 根据仓库查询库区 getWarehouseareas: function(data) { return request({ url: '/wms/apiadmin/base/wmswarehousearea/selectAll', @@ -60,9 +55,14 @@ export default { headers: { 'Content-Type': 'application/json' } - }); + }) }, - - - + // 根据库区查询库位 + getAllRackByKQSid: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid', + method: 'get', + params: data + }) + } } diff --git a/yxt-as-ui/src/api/storage/oldPartsInvertory.js b/yxt-as-ui/src/api/storage/oldPartsInvertory.js index 0f33138e17..406b2c6b72 100644 --- a/yxt-as-ui/src/api/storage/oldPartsInvertory.js +++ b/yxt-as-ui/src/api/storage/oldPartsInvertory.js @@ -1,72 +1,71 @@ import request from '@/utils/request' export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/oldPageList', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 获取旧件出入库记录详情 - init: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/getDetailsList?sid=' + data, - method: 'get' - }) - }, - deleteBySids: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/delBySids', - method: 'DELETE', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 导出报表 - exportExcel: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/excelList', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 根据仓库查询库区 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - params: data - }) - }, - // 根据库区查询库位 - getAllRackByKQSid: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid', - method: 'get', - params: data - }) - }, + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/WmsOldInventory/oldPageList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 获取旧件出入库记录详情 + init: function(data) { + return request({ + url: '/wms/apiadmin/WmsOldInventory/getDetailsList?sid=' + data, + method: 'get' + }) + }, + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/WmsOldInventory/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 导出报表 + exportExcel: function(data) { + return request({ + url: '/wms/apiadmin/WmsOldInventory/excelList', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 查询所有仓库 + getWarehouses: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 根据仓库查询库区 + getWarehouseareas: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/selectAll', + method: 'get', + params: data + }) + }, + // 根据库区查询库位 + getAllRackByKQSid: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid', + method: 'get', + params: data + }) + } } diff --git a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue index 9db9aa998a..11b31f9856 100644 --- a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue +++ b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue @@ -180,6 +180,7 @@ export default { selectionList: [], manufacturerList: [], warehouseList: [], + warehouseAreaList: [], warehouseRackCodeList: [], busTypeList: [], billStateList: [