From d68100a57e8992319fab09af1ce6dd1804c5fc24 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 3 Jun 2024 17:52:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=B0=E8=B4=A7=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E3=80=81=E6=94=B6=E8=B4=A7=E5=8D=95=E3=80=81=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Common/dictcommons.js | 34 + src/api/baseinfo/warehouse/warehouse.js | 7 +- .../baseinfo/warehouseArea/warehouseArea.js | 6 +- .../warehouseAreaType/warehouseAreaType.js | 9 +- src/api/goods/goods.js | 12 + src/api/inStorage/deliveryNotice.js | 59 + src/api/inStorage/receivingGoods.js | 104 ++ src/api/inStorage/upShelf.js | 44 + src/router/index.js | 30 + src/utils/index.js | 13 +- src/views/goods/goods/index.vue | 311 +++-- src/views/inStorage/deliveryNotice/index.vue | 448 +++++++ .../inStorage/deliveryNotice/receiptAdd.vue | 724 +++++++++++ .../inStorage/deliveryNotice/receiptInfo.vue | 171 +++ src/views/inStorage/receivingGoods/index.vue | 433 +++++++ .../receivingGoods/receivingGoodsAdd.vue | 1055 +++++++++++++++++ .../receivingGoods/receivingGoodsInfo.vue | 206 ++++ .../relation/chooseproducts.vue | 164 +++ .../receivingGoods/upShelfAddRecord.vue | 418 +++++++ src/views/inStorage/upShelf/index.vue | 352 ++++++ src/views/inStorage/upShelf/upShelfAdd.vue | 425 +++++++ src/views/inStorage/upShelf/upShelfInfo.vue | 161 +++ 22 files changed, 5007 insertions(+), 179 deletions(-) create mode 100644 src/api/inStorage/deliveryNotice.js create mode 100644 src/api/inStorage/receivingGoods.js create mode 100644 src/api/inStorage/upShelf.js create mode 100644 src/views/inStorage/deliveryNotice/index.vue create mode 100644 src/views/inStorage/deliveryNotice/receiptAdd.vue create mode 100644 src/views/inStorage/deliveryNotice/receiptInfo.vue create mode 100644 src/views/inStorage/receivingGoods/index.vue create mode 100644 src/views/inStorage/receivingGoods/receivingGoodsAdd.vue create mode 100644 src/views/inStorage/receivingGoods/receivingGoodsInfo.vue create mode 100644 src/views/inStorage/receivingGoods/relation/chooseproducts.vue create mode 100644 src/views/inStorage/receivingGoods/upShelfAddRecord.vue create mode 100644 src/views/inStorage/upShelf/index.vue create mode 100644 src/views/inStorage/upShelf/upShelfAdd.vue create mode 100644 src/views/inStorage/upShelf/upShelfInfo.vue diff --git a/src/api/Common/dictcommons.js b/src/api/Common/dictcommons.js index 91d3279..cc8a7c1 100644 --- a/src/api/Common/dictcommons.js +++ b/src/api/Common/dictcommons.js @@ -8,6 +8,15 @@ export function typeValues(data) { }) } +// 获取数据字典(根据分组) +export function getTypeValueList(data) { + return request({ + url: '/portal/v1/dictcommons/getTypeValueList', + method: 'get', + params: data + }) +} + // 根据当前登录人orgSidPath(全路径sid)查询分公司 export function getOrgSidByPath(data) { return request({ @@ -142,3 +151,28 @@ export function chooseproducts(params) { headers: { 'Content-Type': 'application/json' } }) } + +// 查询所有仓库 +export function getWarehouses(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + + +// 根据仓库查询库位 +export function getWarehouseareas(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/selectAll', + method: 'get', + params: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} diff --git a/src/api/baseinfo/warehouse/warehouse.js b/src/api/baseinfo/warehouse/warehouse.js index 390f74d..bbf32cd 100644 --- a/src/api/baseinfo/warehouse/warehouse.js +++ b/src/api/baseinfo/warehouse/warehouse.js @@ -11,12 +11,15 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, - // 仓库查询 getAllWarehouse: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', - method: 'get' + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, diff --git a/src/api/baseinfo/warehouseArea/warehouseArea.js b/src/api/baseinfo/warehouseArea/warehouseArea.js index afff3ce..f6fb1c5 100644 --- a/src/api/baseinfo/warehouseArea/warehouseArea.js +++ b/src/api/baseinfo/warehouseArea/warehouseArea.js @@ -15,7 +15,11 @@ export default { getAllWarehousearea: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehousearea/listAll', - method: 'get' + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, diff --git a/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js b/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js index 6ecf1e5..7dc5860 100644 --- a/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js +++ b/src/api/baseinfo/warehouseAreaType/warehouseAreaType.js @@ -12,15 +12,20 @@ export default { }) }, - // 库位查询 + // 库去类型查询 getAllWarehouseareatype: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehouseareatype/listAll', - method: 'get' + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, + // 修改是否可用状态 updateIsEnable: function(sid,isEnable) { return request({ diff --git a/src/api/goods/goods.js b/src/api/goods/goods.js index acb7196..2ddf2da 100644 --- a/src/api/goods/goods.js +++ b/src/api/goods/goods.js @@ -58,4 +58,16 @@ export default { }) }, + // 下载模板 + downloadExcel: function() { + return request({ + url: '/wms/apiadmin/base/basegoodsspu/download', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + headers: { + 'Content-Type': 'application/json' + } + }) + } + } diff --git a/src/api/inStorage/deliveryNotice.js b/src/api/inStorage/deliveryNotice.js new file mode 100644 index 0000000..fc11c91 --- /dev/null +++ b/src/api/inStorage/deliveryNotice.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/WmsAnsBill/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 详情初始化 + init: function(data) { + return request({ + url: '/wms/apiadmin/WmsAnsBill/details?sid=' + data, + method: 'get' + }); + }, + + // 收货初始化 + getInitDetails: function(data) { + return request({ + url: '/wms/apiadmin/inventory/WmsReceiptBill/getInitDetails?sourceSid=' + data, + method: 'get' + }); + }, + + + // 新增收货单 + save: function(data) { + return request({ + url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + // 确认收货单 + submit: function(data) { + return request({ + url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + +} diff --git a/src/api/inStorage/receivingGoods.js b/src/api/inStorage/receivingGoods.js new file mode 100644 index 0000000..89decb2 --- /dev/null +++ b/src/api/inStorage/receivingGoods.js @@ -0,0 +1,104 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/inventory/WmsReceiptBill/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 初始化 + init: function(data) { + return request({ + url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sid=' + data, + method: 'get' + }); + }, + + + // 新增、保存 + save: function(data) { + return request({ + url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + // 确认 + submit: function(data) { + return request({ + url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + + // 保存 上架单 + saveUpShelf: function(data) { + return request({ + url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + + // 查询所有商品 + getGoodsListPage: function(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + + + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/inventory/WmsReceiptBill/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + + + // 初始化新增上架单 + initUpshelf: function(params) { + return request({ + url: '/wms/apiadmin/WmsShelfBill/getInit?sid=' + params.sid + "&orgPath=" + params.orgPath + "&userSid=" + + params.userSid, + method: 'get', + headers: { + 'Content-Type': 'application/json' + } + }); + + }, + +} diff --git a/src/api/inStorage/upShelf.js b/src/api/inStorage/upShelf.js new file mode 100644 index 0000000..e13a9ad --- /dev/null +++ b/src/api/inStorage/upShelf.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +export default { + +// 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/WmsShelfBill/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + + // 初始化 + init: function(data) { + return request({ + url: '/wms/apiadmin/WmsShelfBill/details?sid='+data, + method: 'get' + }); + }, + + + // 新增、保存 + save: function(data) { + return request({ + url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }); + }, + + + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/WmsShelfBill/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + +} diff --git a/src/router/index.js b/src/router/index.js index 78f8e93..5320303 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -179,6 +179,36 @@ export const constantRoutes = [ ] }, + { + path: '/inStorage', + component: Layout, + redirect: '/inStorage', + meta: { + title: '入库管理' + }, + children: [ + { + path: '/deliveryNotice/index', + component: () => import('@/views/inStorage/deliveryNotice/index'), + name: 'DeliveryNotice', + meta: { title: '到货通知单', noCache: true } + }, + { + path: '/receivingGoods/index', + component: () => import('@/views/inStorage/receivingGoods/index'), + name: 'ReceivingGoods', + meta: { title: '收货单管理', noCache: true } + }, + { + path: '/upShelf/index', + component: () => import('@/views/inStorage/upShelf/index'), + name: 'UpShelf', + meta: { title: '上架单管理', noCache: true } + }, + + ] + }, + { path: '/system', component: Layout, diff --git a/src/utils/index.js b/src/utils/index.js index 40d3448..61a78ef 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -202,4 +202,15 @@ export function getBeforeDate(num, time) { day = d.getDate(); let s = year + "-" + (mon < 10 ? ('0' + mon) : mon) + "-" + (day < 10 ? ('0' + day) : day); return s; -} \ No newline at end of file +} + +/** + * 获取当前日期 + */ +export function getCurrentDate() { + let now = new Date(); + let year = now.getFullYear(); + let month = now.getMonth() + 1; + let day = now.getDate(); + return year + "-" + month + "-" + day; +} diff --git a/src/views/goods/goods/index.vue b/src/views/goods/goods/index.vue index f952e38..38aa86c 100644 --- a/src/views/goods/goods/index.vue +++ b/src/views/goods/goods/index.vue @@ -9,42 +9,9 @@