diff --git a/apps/web-ele/src/api/mall/trade/order/index.ts b/apps/web-ele/src/api/mall/trade/order/index.ts index a9d7d1884..e0229783b 100644 --- a/apps/web-ele/src/api/mall/trade/order/index.ts +++ b/apps/web-ele/src/api/mall/trade/order/index.ts @@ -49,6 +49,7 @@ export namespace MallOrderApi { afterSaleStatus?: null | number; /** 属性数组 */ properties?: ProductProperty[]; + price?: number; } /** 订单日志 */ @@ -248,7 +249,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-ele/src/views/mall/trade/delivery/pickUpOrder/data.ts b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/data.ts index dfb84fbf4..3034ca17e 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/data.ts +++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/data.ts @@ -4,15 +4,24 @@ import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickU import { ref } from 'vue'; -import { DeliveryTypeEnum, DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE } from '@vben/constants'; +import { useUserStore } from '@vben/stores'; import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore'; import { getRangePickerDefaultProps } from '#/utils'; +// TODO @芋艿：统一风格； +const userStore = useUserStore(); const pickUpStoreList = ref([]); +/** 自提门店列表 */ getSimpleDeliveryPickUpStoreList().then((res) => { pickUpStoreList.value = res; + // 移除自己无法核销的门店 + const userId = userStore?.userInfo?.id; + pickUpStoreList.value = pickUpStoreList.value.filter((item) => + item.verifyUserIds?.includes(userId), + ); }); /** 列表的搜索表单 */ @@ -28,18 +37,53 @@ export function useGridFormSchema(): VbenFormSchema[] { }, }, { - fieldName: 'pickUpStoreId', + fieldName: 'pickUpStoreIds', label: '自提门店', - component: 'ApiSelect', + component: 'Select', componentProps: { - api: getSimpleDeliveryPickUpStoreList, - labelField: 'name', - valueField: 'id', + options: pickUpStoreList, + props: { + label: 'name', + value: 'id', + }, + placeholder: '请选择自提门店', }, - dependencies: { - triggerFields: ['deliveryType'], - trigger: (values) => - values.deliveryType === DeliveryTypeEnum.PICK_UP.type, + defaultValue: pickUpStoreList.value[0]?.id, + }, + { + fieldName: 'no', + label: '订单号', + component: 'Input', + componentProps: { + placeholder: '请输入订单号', + clearable: true, + }, + }, + { + fieldName: 'userId', + label: '用户 UID', + component: 'Input', + componentProps: { + placeholder: '请输入用户 UID', + clearable: true, + }, + }, + { + fieldName: 'userNickname', + label: '用户昵称', + component: 'Input', + componentProps: { + placeholder: '请输入用户昵称', + clearable: true, + }, + }, + { + fieldName: 'userMobile', + label: '用户电话', + component: 'Input', + componentProps: { + placeholder: '请输入用户电话', + clearable: true, }, }, ]; @@ -67,17 +111,13 @@ export function useGridColumns(): VxeGridPropTypes.Columns { { field: 'spuName', title: '商品信息', - minWidth: 100, - formatter: ({ row }) => { - if (row.items.length > 1) { - return row.items.map((item: any) => item.spuName).join(','); - } - }, + minWidth: 300, + slots: { default: 'spuName' }, }, { field: 'payPrice', title: '实付金额(元)', - formatter: 'formatFenToYuanAmount', + formatter: 'formatAmount2', minWidth: 180, }, { @@ -90,9 +130,10 @@ export function useGridColumns(): VxeGridPropTypes.Columns { title: '核销门店', minWidth: 160, formatter: ({ row }) => { - return pickUpStoreList.value.find( - (item) => item.id === row.pickUpStoreId, - )?.name; + return ( + pickUpStoreList.value.find((item) => item.id === row.pickUpStoreId) + ?.name || '' + ); }, }, { diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue index fe23b0968..a3c600c51 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue +++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue @@ -2,19 +2,27 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MallOrderApi } from '#/api/mall/trade/order'; -import { h, onMounted, ref } from 'vue'; +import { h, ref } from 'vue'; import { Page, prompt } from '@vben/common-ui'; -import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@vben/constants'; +import { DeliveryTypeEnum } from '@vben/constants'; +import { $t } from '@vben/locales'; import { fenToYuan } from '@vben/utils'; -import { ElCard, ElInput, ElMessage } from 'element-plus'; +import { + ElCard, + ElImage, + ElInput, + ElLoading, + ElMessage, + ElTag, +} from 'element-plus'; import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { - getOrderByPickUpVerifyCode, getOrderPage, getOrderSummary, + pickUpOrderByVerifyCode, } from '#/api/mall/trade/order'; import { SummaryCard } from '#/components/summary-card'; @@ -22,15 +30,22 @@ import { useGridColumns, useGridFormSchema } from './data'; const summary = ref(); +/** 刷新表格 */ +function handleRefresh() { + gridApi.query(); +} + +/** 获取订单统计数据 */ 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) { + // 如果没有传核销码，则弹窗输入 + // TODO @AI：不太对 if (!pickUpVerifyCode) { await prompt({ component: () => { @@ -48,13 +63,17 @@ async function handlePickup(pickUpVerifyCode?: string) { if (!pickUpVerifyCode) { return; } - const data = await getOrderByPickUpVerifyCode(pickUpVerifyCode); - if (data?.deliveryType !== DeliveryTypeEnum.PICK_UP.type) { - ElMessage.error('未查询到订单'); - return; - } - if (data?.status !== TradeOrderStatusEnum.UNDELIVERED.status) { - ElMessage.error('订单不是待核销状态'); + + // 执行核销 + const loadingInstance = ElLoading.service({ + text: '订单核销中 ...', + }); + try { + await pickUpOrderByVerifyCode(pickUpVerifyCode); + ElMessage.success($t('ui.actionMessage.operationSuccess')); + handleRefresh(); + } finally { + loadingInstance.close(); } } @@ -80,7 +99,7 @@ async function connectToSerialPort() { return; } - // 获取用户之前授予该网站访问权限的所有串口。 + // 获取用户之前授予该网站访问权限的所有串口 ports.value = await (navigator.serial as any).getPorts(); // 等待串口打开 @@ -92,7 +111,7 @@ async function connectToSerialPort() { ElMessage.success('成功连接扫码枪'); serialPort.value = true; - readData(); + await readData(); } catch (error) { // 处理连接串口出错的情况 console.error('Error connecting to serial port:', error); @@ -120,7 +139,7 @@ async function readData() { data = ''; // 清空下次读取不会叠加 console.warn(`二维码数据:${codeData}`); // 处理拿到数据逻辑 - handlePickup(codeData); + await handlePickup(codeData); } } } @@ -143,12 +162,16 @@ const [Grid, gridApi] = useVbenVxeGrid({ schema: useGridFormSchema(), }, gridOptions: { + cellConfig: { + height: 100, + }, columns: useGridColumns(), height: 'auto', keepSource: true, proxyConfig: { ajax: { query: async ({ page }, formValues) => { + await getOrderSum(); return await getOrderPage({ pageNo: page.currentPage, pageSize: page.pageSize, @@ -160,6 +183,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, rowConfig: { keyField: 'id', + isHover: true, }, toolbarConfig: { refresh: true, @@ -167,15 +191,11 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, } as VxeTableGridOptions, }); - -onMounted(() => { - getOrderSum(); -});