feat:【mall 商城】门店管理的迁移(antd 100%)

This commit is contained in:
YunaiV
2025-10-13 09:53:11 +08:00
parent 1a9037f6ab
commit 99c0945989
4 changed files with 82 additions and 44 deletions

View File

@@ -29,21 +29,18 @@ export namespace MallDeliveryPickUpStoreApi {
longitude: number; longitude: number;
/** 状态 */ /** 状态 */
status: number; status: number;
/** 绑定用户编号组数 */
verifyUserIds: number[];
/** 营业时间 用于fieldMappingTime */ /** 营业时间 用于fieldMappingTime */
rangeTime: any[]; rangeTime: any[];
/** 绑定用户编号组数 */
verifyUserIds?: number[];
verifyUsers?: any[];
} }
/** 绑定自提店员请求 */ /** 绑定自提店员请求 */
export interface BindStaffRequest { export interface DeliveryPickUpBindReqVO {
id?: number; id?: number;
/** 门店名称 */
name: string;
/** 门店编号 */
storeId: number;
/** 用户编号列表 */ /** 用户编号列表 */
userIds: number[]; verifyUserIds: number[];
} }
} }
@@ -89,8 +86,8 @@ export function deleteDeliveryPickUpStore(id: number) {
} }
/** 绑定自提店员 */ /** 绑定自提店员 */
export function bindStoreStaffId( export function bindDeliveryPickUpStore(
data: MallDeliveryPickUpStoreApi.BindStaffRequest, data: MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO,
) { ) {
return requestClient.post('/trade/delivery/pick-up-store/bind', data); return requestClient.post('/trade/delivery/pick-up-store/bind', data);
} }

View File

@@ -119,16 +119,6 @@ export function useFormSchema(): VbenFormSchema[] {
placeholder: '请输入门店纬度', placeholder: '请输入门店纬度',
}, },
}, },
// TODO @xingyu缺少地图
{
component: 'Input',
fieldName: 'getGeo',
label: '获取经纬度',
formItemClass: 'col-span-2',
componentProps: {
placeholder: '点击获取经纬度',
},
},
]; ];
} }
@@ -165,24 +155,6 @@ export function useBindFormSchema(): VbenFormSchema[] {
placeholder: '请选择门店店员', placeholder: '请选择门店店员',
}, },
}, },
{
component: 'Select',
fieldName: 'verifyUsers',
label: '店员列表',
rules: 'required',
componentProps: {
options: [],
mode: 'tags',
placeholder: '店员列表',
},
dependencies: {
triggerFields: ['verifyUserIds'],
trigger(values, form) {
form.setFieldValue('verifyUsers', values.verifyUserIds);
},
disabled: true,
},
},
]; ];
} }

View File

@@ -1,7 +1,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore'; import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore';
import { computed, ref } from 'vue'; import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui'; import { useVbenModal } from '@vben/common-ui';
@@ -9,7 +9,7 @@ import { message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import { import {
bindStoreStaffId, bindDeliveryPickUpStore,
getDeliveryPickUpStore, getDeliveryPickUpStore,
} from '#/api/mall/trade/delivery/pickUpStore'; } from '#/api/mall/trade/delivery/pickUpStore';
import { $t } from '#/locales'; import { $t } from '#/locales';
@@ -41,9 +41,9 @@ const [Modal, modalApi] = useVbenModal({
modalApi.lock(); modalApi.lock();
// 提交表单 // 提交表单
const data = const data =
(await formApi.getValues()) as MallDeliveryPickUpStoreApi.BindStaffRequest; (await formApi.getValues()) as MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO;
try { try {
await bindStoreStaffId(data); await bindDeliveryPickUpStore(data);
// 关闭并提示 // 关闭并提示
await modalApi.close(); await modalApi.close();
emit('success'); emit('success');
@@ -59,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
} }
// 加载数据 // 加载数据
const data = const data =
modalApi.getData<MallDeliveryPickUpStoreApi.BindStaffRequest>(); modalApi.getData<MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO>();
if (!data || !data.id) { if (!data || !data.id) {
return; return;
} }
@@ -67,6 +67,9 @@ const [Modal, modalApi] = useVbenModal({
try { try {
formData.value = await getDeliveryPickUpStore(data.id); formData.value = await getDeliveryPickUpStore(data.id);
// 设置到 values // 设置到 values
formData.value.verifyUserIds = formData.value.verifyUsers?.map(
(item: any) => item.id,
);
await formApi.setValues(formData.value); await formApi.setValues(formData.value);
} finally { } finally {
modalApi.unlock(); modalApi.unlock();

View File

@@ -5,10 +5,11 @@ import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui'; import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue'; import { Button, message } from 'ant-design-vue';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { useVbenForm } from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import { getTradeConfig } from '#/api/mall/trade/config';
import { import {
createDeliveryPickUpStore, createDeliveryPickUpStore,
getDeliveryPickUpStore, getDeliveryPickUpStore,
@@ -26,6 +27,50 @@ const getTitle = computed(() => {
: $t('ui.actionTitle.create', ['门店']); : $t('ui.actionTitle.create', ['门店']);
}); });
const mapVisible = ref(false); // 是否显示地图弹窗
const tencentLbsUrl = ref(''); // 腾讯位置服务 url
/** 获取经纬度相关方法 */
function selectAddress(loc: any) {
if (loc.latlng?.lat) {
formApi.setFieldValue('latitude', loc.latlng.lat);
}
if (loc.latlng?.lng) {
formApi.setFieldValue('longitude', loc.latlng.lng);
}
mapVisible.value = false;
}
/** 初始化腾讯地图 */
async function initTencentLbsMap() {
// 从配置中获取腾讯地图的 key
const data = await getTradeConfig();
const key = data.tencentLbsKey;
if (!key) {
message.warning('请先配置腾讯位置服务的 key');
return;
}
// 设置 url
if (!window) {
return;
}
(window as any).selectAddress = selectAddress;
window.addEventListener(
'message',
(event) => {
// 接收位置信息,用户选择确认位置点后选点组件会触发该事件,回传用户的位置信息
const loc = event.data;
if (loc && loc.module === 'locationPicker') {
// 防止其他应用也会向该页面 post 信息,需判断 module 是否为 'locationPicker'
(window.parent as any).selectAddress(loc);
}
},
false,
);
tencentLbsUrl.value = `https://apis.map.qq.com/tools/locpicker?type=1&key=${key}&referer=myapp`;
}
const [Form, formApi] = useVbenForm({ const [Form, formApi] = useVbenForm({
commonConfig: { commonConfig: {
componentProps: { componentProps: {
@@ -70,6 +115,8 @@ const [Modal, modalApi] = useVbenModal({
// 加载数据 // 加载数据
const data = modalApi.getData<MallDeliveryPickUpStoreApi.PickUpStore>(); const data = modalApi.getData<MallDeliveryPickUpStoreApi.PickUpStore>();
if (!data || !data.id) { if (!data || !data.id) {
// 初始化地图
await initTencentLbsMap();
return; return;
} }
modalApi.lock(); modalApi.lock();
@@ -83,6 +130,8 @@ const [Modal, modalApi] = useVbenModal({
await formApi.setValues(formData.value); await formApi.setValues(formData.value);
} finally { } finally {
modalApi.unlock(); modalApi.unlock();
// 初始化地图
await initTencentLbsMap();
} }
}, },
}); });
@@ -91,5 +140,22 @@ const [Modal, modalApi] = useVbenModal({
<template> <template>
<Modal :title="getTitle" class="w-2/5"> <Modal :title="getTitle" class="w-2/5">
<Form class="mx-4" /> <Form class="mx-4" />
<template #prepend-footer>
<Button @click="mapVisible = true"> 获取经纬度 </Button>
</template>
</Modal> </Modal>
<!-- 地图弹窗 -->
<a-modal
v-model:open="mapVisible"
title="获取经纬度"
:width="800"
:footer="null"
>
<iframe
v-if="mapVisible && tencentLbsUrl"
:src="tencentLbsUrl"
class="h-[600px] w-full border-0"
></iframe>
</a-modal>
</template> </template>