diff --git a/.env.development b/.env.development index 522e48fc..1c94c0ca 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 78104d0f..dd9074d2 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 fd7218e3..ff717903 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 9e33a0a9..3c91a882 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 06141d57..f9765c72 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 00000000..b3c49de4 --- /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 00000000..4717963e --- /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 00000000..83bed075 --- /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 631f552a..7c1cc345 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 @@ > + + + + + + + + + + + + + + +