From e1cb380fdcf87fd84228c5f9b2fe2b88c861ce3b Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 13 Oct 2025 19:50:28 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90mall=20=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E3=80=91=E9=97=A8=E5=BA=97=E8=87=AA=E6=8F=90=E5=BE=85=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E9=83=A8=E5=88=86=E7=9A=84=E6=A2=B3=E7=90=86=EF=BC=88?= =?UTF-8?q?antd=201%=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/mall/trade/order/index.ts | 2 +- .../mall/trade/delivery/pickUpOrder/index.vue | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/web-antd/src/api/mall/trade/order/index.ts b/apps/web-antd/src/api/mall/trade/order/index.ts index 6017fa5f5..fe7d07bc7 100644 --- a/apps/web-antd/src/api/mall/trade/order/index.ts +++ b/apps/web-antd/src/api/mall/trade/order/index.ts @@ -239,7 +239,7 @@ export function getOrderPage(params: PageParam) { } /** 查询交易订单统计 */ -export function getOrderSummary(params: PageParam) { +export function getOrderSummary(params: any) { return requestClient.get('/trade/order/summary', { params, }); diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue index e69a65389..b6c96185d 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue @@ -22,14 +22,14 @@ import { useGridColumns, useGridFormSchema } from './data'; const summary = ref(); +/** 获取订单统计数据 */ async function getOrderSum() { const query = await gridApi.formApi.getValues(); query.deliveryType = DeliveryTypeEnum.PICK_UP.type; - const res = await getOrderSummary(query as any); - summary.value = res; + summary.value = await getOrderSummary(query); } -/** 核销 */ +/** 核销订单 */ async function handlePickup(pickUpVerifyCode?: string) { if (!pickUpVerifyCode) { await prompt({ @@ -64,6 +64,7 @@ const reader = ref(''); const serialPort = ref(false); // 是否连接扫码枪 /** 连接扫码枪 */ +// TODO @AI:晚点搞! async function connectToSerialPort() { try { // 判断浏览器支持串口通信 @@ -140,6 +141,8 @@ async function cutPort() { const [Grid, gridApi] = useVbenVxeGrid({ formOptions: { + // TODO @AI:需要移除自己不能门店自提的店铺; + // TODO @AI:默认选中第一个! schema: useGridFormSchema(), }, gridOptions: { @@ -149,6 +152,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ proxyConfig: { ajax: { query: async ({ page }, formValues) => { + // TODO @AI:有个“聚合搜索”,可以拆解成多个表单; return await getOrderPage({ pageNo: page.currentPage, pageSize: page.pageSize, @@ -160,6 +164,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, rowConfig: { keyField: 'id', + isHover: true, }, toolbarConfig: { refresh: true, @@ -175,7 +180,7 @@ onMounted(() => {