From 65409e19ed312bc4e9909c4c5f62361be4da8708 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 8 Oct 2024 11:37:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?= =?UTF-8?q?=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加订单转预订单功能 - 调整出库和入库订单表格布局 - 移除打印订单按钮 - 优化店订单列表界面 - 更新相关API调用 --- .env.development | 2 +- src/api/beforehand_order.ts | 7 ++ .../beforehand_order/component/outbound.vue | 10 +-- .../component/warehousing.vue | 17 ++--- src/views/order/beforehand_order/details.vue | 3 +- src/views/order/store_order/index.vue | 74 +++++++++++++++---- 6 files changed, 80 insertions(+), 33 deletions(-) diff --git a/.env.development b/.env.development index 1c94c0ca7..522e48fce 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.7:8545' +VITE_APP_BASE_URL='http://192.168.1.22: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 dd9074d25..649132c50 100644 --- a/src/api/beforehand_order.ts +++ b/src/api/beforehand_order.ts @@ -37,3 +37,10 @@ export function apiBeforehandOrderWarehousingLists(params: any) { export function apiBeforehandOrderOutboundLists(params: any) { return request.get({ url: '/beforehand_order/beforehandorder/outbound_lists', params }) } +// 订单转预订单 +export function apiPurchaseOrderTransferAdvanceOrder(params: any) { + return request.post({ + url: '/beforehand_order/beforehandorder/orderTransferAdvanceOrder', + params + }) +} diff --git a/src/views/order/beforehand_order/component/outbound.vue b/src/views/order/beforehand_order/component/outbound.vue index 7d19d2eea..f0ec1c2d6 100644 --- a/src/views/order/beforehand_order/component/outbound.vue +++ b/src/views/order/beforehand_order/component/outbound.vue @@ -12,13 +12,13 @@ /> - - + + - - - + + +
diff --git a/src/views/order/beforehand_order/component/warehousing.vue b/src/views/order/beforehand_order/component/warehousing.vue index 0ea0b546d..06e707468 100644 --- a/src/views/order/beforehand_order/component/warehousing.vue +++ b/src/views/order/beforehand_order/component/warehousing.vue @@ -2,12 +2,7 @@
- + - - + + - - - + + +
diff --git a/src/views/order/beforehand_order/details.vue b/src/views/order/beforehand_order/details.vue index 9b3a78b85..550f0835e 100644 --- a/src/views/order/beforehand_order/details.vue +++ b/src/views/order/beforehand_order/details.vue @@ -15,7 +15,7 @@
时间
{{ formData.create_time }}
- 打印订单 +
追加 @@ -86,6 +86,7 @@
{{ row.status_name }} + 无需采购
diff --git a/src/views/order/store_order/index.vue b/src/views/order/store_order/index.vue index f68861943..94f7ef91e 100644 --- a/src/views/order/store_order/index.vue +++ b/src/views/order/store_order/index.vue @@ -122,13 +122,17 @@
- - - + + - - - - + + + + - + - + - - - + + + @@ -236,6 +273,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order' +import { apiPurchaseOrderTransferAdvanceOrder } from '@/api/beforehand_order' import { timeFormat } from '@/utils/util' import { apiSystemStoreLists } from '@/api/system_store' import feedback from '@/utils/feedback' @@ -428,6 +466,12 @@ const remoteMethodUser = (e = '') => { }, 300) }) } +/** + * 订单转预购订单 + */ +const TransferAdvanceOrder = (data: any) => { + apiPurchaseOrderTransferAdvanceOrder(data) +} onMounted(() => { getLists() })