From 95ac5b5263adef09a151c6b50e796241dacfc8be Mon Sep 17 00:00:00 2001 From: lewis <604446095@qq.com> Date: Wed, 12 Mar 2025 10:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E5=87=BA=E5=BA=93=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/psi/outbound_order.ts | 29 +- src/api/psi/outbound_product.ts | 10 +- src/api/store_product.ts | 7 + src/components/productPop/index.vue | 237 +++++---- src/views/psi/outbound_order/details.vue | 471 +++++++++++------ src/views/psi/outbound_order/edit.vue | 258 ++++------ src/views/psi/outbound_order/editProduct.vue | 131 +++++ src/views/psi/outbound_order/import.vue | 197 ++++++++ src/views/psi/outbound_order/index.vue | 370 +++++++------- src/views/psi/outbound_product/details.vue | 6 +- src/views/psi/outbound_product/edit.vue | 472 +++++++++--------- src/views/psi/outbound_product/index.vue | 366 +++++++------- .../psi/outbound_product/warehousing.vue | 213 ++++++++ src/views/psi/warehouse_product/index.vue | 147 +++--- 14 files changed, 1829 insertions(+), 1085 deletions(-) create mode 100644 src/views/psi/outbound_order/editProduct.vue create mode 100644 src/views/psi/outbound_order/import.vue create mode 100644 src/views/psi/outbound_product/warehousing.vue diff --git a/src/api/psi/outbound_order.ts b/src/api/psi/outbound_order.ts index 9ca2a5c52..193bbfe1d 100644 --- a/src/api/psi/outbound_order.ts +++ b/src/api/psi/outbound_order.ts @@ -1,26 +1,43 @@ import request from '@/utils/request' // 出库订单列表 -export function apiPsiOutboundOrderLists(params: any) { +export function apiOutboundOrderLists(params: any) { return request.get({ url: '/outboundorder/lists', params }, { urlPrefix: 'psi' }) } // 添加出库订单 -export function apiPsiOutboundOrderAdd(params: any) { +export function apiOutboundOrderAdd(params: any) { return request.post({ url: '/outboundorder/add', params }, { urlPrefix: 'psi' }) } // 编辑出库订单 -export function apiPsiOutboundOrderEdit(params: any) { +export function apiOutboundOrderEdit(params: any) { return request.post({ url: '/outboundorder/edit', params }, { urlPrefix: 'psi' }) } // 删除出库订单 -export function apiPsiOutboundOrderDelete(params: any) { +export function apiOutboundOrderDelete(params: any) { return request.post({ url: '/outboundorder/delete', params }, { urlPrefix: 'psi' }) } // 出库订单详情 -export function apiPsiOutboundOrderDetail(params: any) { +export function apiOutboundOrderDetail(params: any) { return request.get({ url: '/outboundorder/detail', params }, { urlPrefix: 'psi' }) -} \ No newline at end of file +} + +// 修改入库单回款金额 +export function apiOutboundOrderUpdateAmount(params: any) { + return request.post({ url: '/outboundorder/updateAmount', params }, { urlPrefix: 'psi' }) +} +// 导出商品仓储入库订单 +export function apiOutboundOrderRentryExport(params: any) { + return request.post({ url: '/outboundorder/rentry_export', params }) +} +// 导出商品仓储出库订单 +export function apiOutboundOrderExport(params: any) { + return request.post({ url: '/outboundorder/export', params }) +} +// 导出商品标签 +export function apiOutboundOrderExportTags(params: any) { + return request.post({ url: '/outboundorder/export_tags', params }) +} diff --git a/src/api/psi/outbound_product.ts b/src/api/psi/outbound_product.ts index 6eaa3eedf..5f490d5e5 100644 --- a/src/api/psi/outbound_product.ts +++ b/src/api/psi/outbound_product.ts @@ -1,26 +1,26 @@ import request from '@/utils/request' // 仓库商品出库信息列表 -export function apiPsiOutboundProductLists(params: any) { +export function apiOutboundProductLists(params: any) { return request.get({ url: '/outboundproduct/lists', params }, { urlPrefix: 'psi' }) } // 添加仓库商品出库信息 -export function apiPsiOutboundProductAdd(params: any) { +export function apiOutboundProductAdd(params: any) { return request.post({ url: '/outboundproduct/add', params }, { urlPrefix: 'psi' }) } // 编辑仓库商品出库信息 -export function apiPsiOutboundProductEdit(params: any) { +export function apiOutboundProductEdit(params: any) { return request.post({ url: '/outboundproduct/edit', params }, { urlPrefix: 'psi' }) } // 删除仓库商品出库信息 -export function apiPsiOutboundProductDelete(params: any) { +export function apiOutboundProductDelete(params: any) { return request.post({ url: '/outboundproduct/delete', params }, { urlPrefix: 'psi' }) } // 仓库商品出库信息详情 -export function apiPsiOutboundProductDetail(params: any) { +export function apiOutboundProductDetail(params: any) { return request.get({ url: '/outboundproduct/detail', params }, { urlPrefix: 'psi' }) } \ No newline at end of file diff --git a/src/api/store_product.ts b/src/api/store_product.ts index 9ac147ae4..bdd7f6ede 100644 --- a/src/api/store_product.ts +++ b/src/api/store_product.ts @@ -41,3 +41,10 @@ export function apiStoreProductImport(params: any) { export function apiStoreProductCopy(params: any) { return request.post({ url: '/store_product/storeproduct/copy', params }) } + +export function apiWarehouseProductStorageLists(params: any) { + return request.get({ url: '/store_product/storeproduct/lists', params }) +} +export function apiStoreBranchProductLists(params: any) { + return request.get({ url: '/store_product/storeproduct/lists', params }) +} \ No newline at end of file diff --git a/src/components/productPop/index.vue b/src/components/productPop/index.vue index 4b5329628..045752d93 100644 --- a/src/components/productPop/index.vue +++ b/src/components/productPop/index.vue @@ -1,137 +1,124 @@ + // watch(() => props.warehouse_id, (newValue, oldValue) => { + // if (newValue != oldValue) { + // queryParams.warehouse_id = newValue + // productList() + // } + // }); + watch([() => props.warehouse_id, () => props.store_id], ([newProp1, newProp2], [oldProp1, oldProp2]) => { + if (newProp1 !== oldProp1) { + queryParams.warehouse_id = newProp1 + productList() + } + if (newProp2 !== oldProp2) { + queryParams.store_id = newProp2 + productList() + } + }); + \ No newline at end of file diff --git a/src/views/psi/outbound_order/details.vue b/src/views/psi/outbound_order/details.vue index 192ba6593..f2e30094a 100644 --- a/src/views/psi/outbound_order/details.vue +++ b/src/views/psi/outbound_order/details.vue @@ -1,143 +1,328 @@ - - - + + + \ No newline at end of file diff --git a/src/views/psi/outbound_order/edit.vue b/src/views/psi/outbound_order/edit.vue index 5eeeb2904..4d8851720 100644 --- a/src/views/psi/outbound_order/edit.vue +++ b/src/views/psi/outbound_order/edit.vue @@ -1,165 +1,93 @@ - - - + + + \ No newline at end of file diff --git a/src/views/psi/outbound_order/editProduct.vue b/src/views/psi/outbound_order/editProduct.vue new file mode 100644 index 000000000..506f66b3c --- /dev/null +++ b/src/views/psi/outbound_order/editProduct.vue @@ -0,0 +1,131 @@ + + + \ No newline at end of file diff --git a/src/views/psi/outbound_order/import.vue b/src/views/psi/outbound_order/import.vue new file mode 100644 index 000000000..6d9a91f27 --- /dev/null +++ b/src/views/psi/outbound_order/import.vue @@ -0,0 +1,197 @@ + + + \ No newline at end of file diff --git a/src/views/psi/outbound_order/index.vue b/src/views/psi/outbound_order/index.vue index 3b90c7055..859554f40 100644 --- a/src/views/psi/outbound_order/index.vue +++ b/src/views/psi/outbound_order/index.vue @@ -1,168 +1,202 @@ - - - - + + + \ No newline at end of file diff --git a/src/views/psi/outbound_product/details.vue b/src/views/psi/outbound_product/details.vue index 8cdffc597..8de8b96ce 100644 --- a/src/views/psi/outbound_product/details.vue +++ b/src/views/psi/outbound_product/details.vue @@ -95,10 +95,10 @@ - + + + \ No newline at end of file diff --git a/src/views/psi/outbound_product/index.vue b/src/views/psi/outbound_product/index.vue index 36a93ad75..3245640e2 100644 --- a/src/views/psi/outbound_product/index.vue +++ b/src/views/psi/outbound_product/index.vue @@ -1,174 +1,192 @@ - - - - + + + \ No newline at end of file diff --git a/src/views/psi/outbound_product/warehousing.vue b/src/views/psi/outbound_product/warehousing.vue new file mode 100644 index 000000000..58285a0d3 --- /dev/null +++ b/src/views/psi/outbound_product/warehousing.vue @@ -0,0 +1,213 @@ + + + \ 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 dce70467d..9bfad9d8e 100644 --- a/src/views/psi/warehouse_product/index.vue +++ b/src/views/psi/warehouse_product/index.vue @@ -2,34 +2,38 @@
- - + + + + - - + + + + - - + + + + - - + + - - - - - + + - - + + - - - - 查询 重置 @@ -37,50 +41,25 @@ - - - 新增 - - - 删除 -
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +
@@ -98,11 +77,46 @@ import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' + import moment from 'moment' + import { apiWarehouseLists } from '@/api/psi/warehouse' + import { apiSystemStoreLists } from '@/api/system_store' + import { apiSupplierLists } from '@/api/psi/supplier' const editRef = shallowRef>() // 是否显示编辑框 const showEdit = ref(false) + const warehouseList = ref([]) + const getWarehouseList = () => { + apiWarehouseLists({ page_size: 999 }).then(res => { + warehouseList.value = res.lists + }) + } + + const storeList = ref([]) + const getStoreList = () => { + apiSystemStoreLists({ page_size: 999 }).then(res => { + storeList.value = res.lists + }) + } + + const supplierLoading = ref(false) + const supplierList = ref([]) + const remoteMethodSupplier = (e = '') => { + supplierLoading.value = true + apiSupplierLists({ mer_name: e }) + .then((res) => { + supplierList.value = res.lists + setTimeout(() => { + supplierLoading.value = false + }, 300) + }) + .catch((err) => { + setTimeout(() => { + supplierLoading.value = false + }, 300) + }) + } // 查询条件 const queryParams = reactive({ @@ -110,12 +124,27 @@ supplier_id: '', store_id: '', order_type: '', - product_id: '', + product_name: '', + bar_code: '', oid: '', code: '', pay_type: '', status: '', + start_time: '', + end_time: '', }) + const startEndTime = ref([]) + + const changeStartEndTime = () => { + if (startEndTime.value[0] && startEndTime.value[1]) { + queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00' + queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59' + } else { + queryParams.start_time = '' + queryParams.end_time = '' + } + getLists() + } // 选中数据 const selectData = ref([]) @@ -156,5 +185,7 @@ getLists() } + getWarehouseList() + getStoreList() getLists() \ No newline at end of file