diff --git a/src/api/psi/warehouse.ts b/src/api/psi/warehouse.ts index 4893538fa..345449746 100644 --- a/src/api/psi/warehouse.ts +++ b/src/api/psi/warehouse.ts @@ -1,26 +1,26 @@ import request from '@/utils/request' // 仓库信息列表 -export function apiPsiWarehouseLists(params: any) { +export function apiWarehouseLists(params: any) { return request.get({ url: '/warehouse/warehouse/lists', params }, { urlPrefix: 'psi' }) } // 添加仓库信息 -export function apiPsiWarehouseAdd(params: any) { +export function apiWarehouseAdd(params: any) { return request.post({ url: '/warehouse/warehouse/add', params }, { urlPrefix: 'psi' }) } // 编辑仓库信息 -export function apiPsiWarehouseEdit(params: any) { +export function apiWarehouseEdit(params: any) { return request.post({ url: '/warehouse/warehouse/edit', params }, { urlPrefix: 'psi' }) } // 删除仓库信息 -export function apiPsiWarehouseDelete(params: any) { +export function apiWarehouseDelete(params: any) { return request.post({ url: '/warehouse/warehouse/delete', params }, { urlPrefix: 'psi' }) } // 仓库信息详情 -export function apiPsiWarehouseDetail(params: any) { +export function apiWarehouseDetail(params: any) { return request.get({ url: '/warehouse/warehouse/detail', params }, { urlPrefix: 'psi' }) } diff --git a/src/api/psi/warehouse_order.ts b/src/api/psi/warehouse_order.ts index 415d8a5e3..945fb735a 100644 --- a/src/api/psi/warehouse_order.ts +++ b/src/api/psi/warehouse_order.ts @@ -1,26 +1,42 @@ import request from '@/utils/request' // 入库订单列表 -export function apiPsiWarehouseOrderLists(params: any) { +export function apiWarehouseOrderLists(params: any) { return request.get({ url: '/warehouseorder/lists', params }, { urlPrefix: 'psi' }) } // 添加入库订单 -export function apiPsiWarehouseOrderAdd(params: any) { +export function apiWarehouseOrderAdd(params: any) { return request.post({ url: '/warehouseorder/add', params }, { urlPrefix: 'psi' }) } // 编辑入库订单 -export function apiPsiWarehouseOrderEdit(params: any) { +export function apiWarehouseOrderEdit(params: any) { return request.post({ url: '/warehouseorder/edit', params }, { urlPrefix: 'psi' }) } // 删除入库订单 -export function apiPsiWarehouseOrderDelete(params: any) { +export function apiWarehouseOrderDelete(params: any) { return request.post({ url: '/warehouseorder/delete', params }, { urlPrefix: 'psi' }) } // 入库订单详情 -export function apiPsiWarehouseOrderDetail(params: any) { +export function apiWarehouseOrderDetail(params: any) { return request.get({ url: '/warehouseorder/detail', params }, { urlPrefix: 'psi' }) -} \ No newline at end of file +} +// 修改入库单回款金额 +export function apiWarehouseOrderUpdateAmount(params: any) { + return request.post({ url: '/warehouseorder/updateAmount', params }, { urlPrefix: 'psi' }) +} +// 导出商品仓储入库订单 +export function apiWarehouseOrderRentryExport(params: any) { + return request.post({ url: '/warehouse_order/warehouseorder/rentry_export', params }) +} +// 导出商品仓储出库订单 +export function apiWarehouseOrderExport(params: any) { + return request.post({ url: '/warehouse_order/warehouseorder/export', params }) +} +// 导出商品标签 +export function apiWarehouseOrderExportTags(params: any) { + return request.post({ url: '/warehouse_order/warehouseorder/export_tags', params }) +} diff --git a/src/api/psi/warehouse_product.ts b/src/api/psi/warehouse_product.ts index 24e06c680..095f2c743 100644 --- a/src/api/psi/warehouse_product.ts +++ b/src/api/psi/warehouse_product.ts @@ -1,26 +1,26 @@ import request from '@/utils/request' // 仓库商品入库信息列表 -export function apiPsiWarehouseProductLists(params: any) { +export function apiWarehouseProductLists(params: any) { return request.get({ url: '/warehouseproduct/lists', params }, { urlPrefix: 'psi' }) } // 添加仓库商品入库信息 -export function apiPsiWarehouseProductAdd(params: any) { +export function apiWarehouseProductAdd(params: any) { return request.post({ url: '/warehouseproduct/add', params }, { urlPrefix: 'psi' }) } // 编辑仓库商品入库信息 -export function apiPsiWarehouseProductEdit(params: any) { +export function apiWarehouseProductEdit(params: any) { return request.post({ url: '/warehouseproduct/edit', params }, { urlPrefix: 'psi' }) } // 删除仓库商品入库信息 -export function apiPsiWarehouseProductDelete(params: any) { +export function apiWarehouseProductDelete(params: any) { return request.post({ url: '/warehouseproduct/delete', params }, { urlPrefix: 'psi' }) } // 仓库商品入库信息详情 -export function apiPsiWarehouseProductDetail(params: any) { +export function apiWarehouseProductDetail(params: any) { return request.get({ url: '/warehouseproduct/detail', params }, { urlPrefix: 'psi' }) } \ No newline at end of file diff --git a/src/utils/enums.ts b/src/utils/enums.ts new file mode 100644 index 000000000..79f599d41 --- /dev/null +++ b/src/utils/enums.ts @@ -0,0 +1,15 @@ +const enums = { + orderType: [ + {label: '铺货订单', value: 1}, + {label: '摊贩订单', value: 2}, + {label: '一条龙订单', value: 3}, + {label: '线上订单', value: 4}, + {label: '仓库补货', value: 5}, + {label: '往期补单-出库', value: 6}, + {label: '采购订单', value: 7}, + {label: '其他订单', value: 8}, + {label: '往期补单-入库', value: 9}, + ], +} + +export default enums \ No newline at end of file diff --git a/src/views/psi/warehouse_order/details.vue b/src/views/psi/warehouse_order/details.vue index 49d7ce086..0f61803c1 100644 --- a/src/views/psi/warehouse_order/details.vue +++ b/src/views/psi/warehouse_order/details.vue @@ -1,153 +1,403 @@ - - - + + + \ No newline at end of file diff --git a/src/views/psi/warehouse_order/edit.vue b/src/views/psi/warehouse_order/edit.vue index e02722256..4d8851720 100644 --- a/src/views/psi/warehouse_order/edit.vue +++ b/src/views/psi/warehouse_order/edit.vue @@ -1,189 +1,93 @@ - - - + + + \ No newline at end of file diff --git a/src/views/psi/warehouse_order/editProduct.vue b/src/views/psi/warehouse_order/editProduct.vue new file mode 100644 index 000000000..21c918199 --- /dev/null +++ b/src/views/psi/warehouse_order/editProduct.vue @@ -0,0 +1,163 @@ + + + \ No newline at end of file diff --git a/src/views/psi/warehouse_order/index.vue b/src/views/psi/warehouse_order/index.vue index 2372bd005..fde17f6b7 100644 --- a/src/views/psi/warehouse_order/index.vue +++ b/src/views/psi/warehouse_order/index.vue @@ -1,188 +1,172 @@ - - - - + + + \ No newline at end of file diff --git a/src/views/psi/warehouse_product/edit.vue b/src/views/psi/warehouse_product/edit.vue index 2c4028bf4..3af0b8a13 100644 --- a/src/views/psi/warehouse_product/edit.vue +++ b/src/views/psi/warehouse_product/edit.vue @@ -1,238 +1,234 @@ - - - + + + \ No newline at end of file diff --git a/src/views/psi/warehouse_product/index.vue b/src/views/psi/warehouse_product/index.vue index 782dc963b..dce70467d 100644 --- a/src/views/psi/warehouse_product/index.vue +++ b/src/views/psi/warehouse_product/index.vue @@ -1,174 +1,160 @@ - - - - + + + \ No newline at end of file diff --git a/src/views/psi/warehouse_product/warehousing.vue b/src/views/psi/warehouse_product/warehousing.vue new file mode 100644 index 000000000..58285a0d3 --- /dev/null +++ b/src/views/psi/warehouse_product/warehousing.vue @@ -0,0 +1,213 @@ + + + \ No newline at end of file