From 3812ab5074f13caae4dfe8e8e940e10939b21610 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 5 Oct 2024 16:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=96=B0=E5=A2=9E=E9=A2=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增预订单购物车详情相关接口 - 新增采购信息设置和一键入库功能 - 修改预订单列表和详情页面,增加采购和出入库相关功能 - 优化预订单商品表格,增加是否需采购列 - 新增采购人员选择功能 --- .env.development | 2 +- src/api/beforehand_order.ts | 13 + src/api/beforehand_order_cart_info.ts | 14 + src/api/purchase_product_offer.ts | 7 + src/views/order/beforehand_order/add.vue | 2 +- .../beforehand_order/component/goodsOffer.vue | 252 ++++++++++++++++++ .../beforehand_order/component/outbound.vue | 143 ++++++++++ .../component/warehousing.vue | 51 ++++ src/views/order/beforehand_order/details.vue | 183 ++++++++++--- 9 files changed, 632 insertions(+), 35 deletions(-) create mode 100644 src/views/order/beforehand_order/component/goodsOffer.vue create mode 100644 src/views/order/beforehand_order/component/outbound.vue create mode 100644 src/views/order/beforehand_order/component/warehousing.vue diff --git a/.env.development b/.env.development index 522e48fce..1c94c0ca7 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,6 @@ VITE_NOW_TYPE = 'dist' # VITE_APP_BASE_URL='http://192.168.1.10:8546' # VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn' # VITE_APP_BASE_URL='https://multi-store.lihaink.cn' -VITE_APP_BASE_URL='http://192.168.1.22:8545' +VITE_APP_BASE_URL='http://192.168.1.7:8545' # VITE_APP_BASE_URL='https://ceshi-multi-store.lihaink.cn' diff --git a/src/api/beforehand_order.ts b/src/api/beforehand_order.ts index 78104d0ff..dd9074d25 100644 --- a/src/api/beforehand_order.ts +++ b/src/api/beforehand_order.ts @@ -14,6 +14,10 @@ export function apiBeforehandOrderAdd(params: any) { export function apiBeforehandOrderEdit(params: any) { return request.post({ url: '/beforehand_order/beforehandorder/edit', params }) } +// 一键入库 +export function apiBeforehandOrderCreateOutboundOrder(params: any) { + return request.post({ url: '/beforehand_order/beforehandorder/createOutboundOrder', params }) +} // 删除预订单表 export function apiBeforehandOrderDelete(params: any) { @@ -24,3 +28,12 @@ export function apiBeforehandOrderDelete(params: any) { export function apiBeforehandOrderDetail(params: any) { return request.get({ url: '/beforehand_order/beforehandorder/detail', params }) } + +// 入库列表 +export function apiBeforehandOrderWarehousingLists(params: any) { + return request.get({ url: '/beforehand_order/beforehandorder/warehousing_lists', params }) +} +// 出库列表 +export function apiBeforehandOrderOutboundLists(params: any) { + return request.get({ url: '/beforehand_order/beforehandorder/outbound_lists', params }) +} diff --git a/src/api/beforehand_order_cart_info.ts b/src/api/beforehand_order_cart_info.ts index fd7218e37..ff717903d 100644 --- a/src/api/beforehand_order_cart_info.ts +++ b/src/api/beforehand_order_cart_info.ts @@ -28,6 +28,20 @@ export function apiBeforehandOrderCartInfoDelete(params: any) { params }) } +// 编辑预订单购物详情无需采购 +export function apiBeforehandOrderCartInfoProcurementStatus(params: any) { + return request.post({ + url: '/beforehand_order_cart_info/beforehandordercartinfo/procurement_status', + params + }) +} +// 一键入库 +export function apiBeforehandOrderCartInfoOneClickStorage(params: any) { + return request.post({ + url: '/beforehand_order_cart_info/beforehandordercartinfo/one_click_storage', + params + }) +} // 预订单购物详情表详情 export function apiBeforehandOrderCartInfoDetail(params: any) { diff --git a/src/api/purchase_product_offer.ts b/src/api/purchase_product_offer.ts index 9e33a0a9c..3c91a882f 100644 --- a/src/api/purchase_product_offer.ts +++ b/src/api/purchase_product_offer.ts @@ -19,6 +19,13 @@ export function apiPurchaseProductOfferEdit(params: any) { export function apiPurchaseProductOfferDelete(params: any) { return request.post({ url: '/purchase_product_offer/purchaseproductoffer/delete', params }) } +// 设置采购信息 +export function apiPurchaseProductOfferSetProcureInfo(params: any) { + return request.post({ + url: '/purchase_product_offer/purchaseproductoffer/setProcureInfo', + params + }) +} // 采购供应链商品详情 export function apiPurchaseProductOfferDetail(params: any) { diff --git a/src/views/order/beforehand_order/add.vue b/src/views/order/beforehand_order/add.vue index 06141d57f..f9765c721 100644 --- a/src/views/order/beforehand_order/add.vue +++ b/src/views/order/beforehand_order/add.vue @@ -1,6 +1,6 @@ - 商品入库操作 + 预定单添加 diff --git a/src/views/order/beforehand_order/component/goodsOffer.vue b/src/views/order/beforehand_order/component/goodsOffer.vue new file mode 100644 index 000000000..b3c49de4f --- /dev/null +++ b/src/views/order/beforehand_order/component/goodsOffer.vue @@ -0,0 +1,252 @@ + + + 一键入库 + + + + + + + + + + + + + + + + + + + + + + + + 设置采购信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/order/beforehand_order/component/outbound.vue b/src/views/order/beforehand_order/component/outbound.vue new file mode 100644 index 000000000..4717963e6 --- /dev/null +++ b/src/views/order/beforehand_order/component/outbound.vue @@ -0,0 +1,143 @@ + + + 一键出库 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/order/beforehand_order/component/warehousing.vue b/src/views/order/beforehand_order/component/warehousing.vue new file mode 100644 index 000000000..83bed075b --- /dev/null +++ b/src/views/order/beforehand_order/component/warehousing.vue @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/order/beforehand_order/details.vue b/src/views/order/beforehand_order/details.vue index 631f552af..7c1cc3451 100644 --- a/src/views/order/beforehand_order/details.vue +++ b/src/views/order/beforehand_order/details.vue @@ -19,7 +19,12 @@ 追加 - + @@ -40,13 +45,50 @@ - + + + + + + 否 + 是 + + + {{ row.is_buyer_name }} + + + - - - + + + + + + + + + @@ -168,7 +216,7 @@ @@ -180,15 +228,52 @@ > + + + + + + + + + + + + + + +