gxwebsoft/mp-10584
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(shop): 移除配送员模块并优化门店管理功能

Browse Source 
- 删除配送员相关API接口文件及模型定义
- 删除配送员管理页面组件及相关搜索功能
- 在门店模型中新增门店横幅、经纬度字段和状态字段
- 将门店经纬度合并为lngAndLat字段并优化地址选择组件
- 优化门店编辑页面布局和字段验证规则
- 在门店搜索组件中添加关键词搜索功能
- 调整快递公司页面宽度和标签栏显示逻辑
- 清理订单和社区页面中的冗余字段定义
This commit is contained in:
赵忠林
2026-01-30 16:20:55 +08:00
parent 055e53e06e
commit 4b04b6a670
18 changed files with 420 additions and 1151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/api/shop/shopRider/index.ts
View File

@@ -1,105 +0,0 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api';
import type { ShopRider, ShopRiderParam } from './model';
/**
* 分页查询配送员
*/
export async function pageShopRider(params: ShopRiderParam) {
const res = await request.get<ApiResult<PageResult<ShopRider>>>(
'/shop/shop-rider/page',
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询配送员列表
*/
export async function listShopRider(params?: ShopRiderParam) {
const res = await request.get<ApiResult<ShopRider[]>>(
'/shop/shop-rider',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加配送员
*/
export async function addShopRider(data: ShopRider) {
const res = await request.post<ApiResult<unknown>>(
'/shop/shop-rider',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改配送员
*/
export async function updateShopRider(data: ShopRider) {
const res = await request.put<ApiResult<unknown>>(
'/shop/shop-rider',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除配送员
*/
export async function removeShopRider(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
'/shop/shop-rider/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除配送员
*/
export async function removeBatchShopRider(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
'/shop/shop-rider/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询配送员
*/
export async function getShopRider(id: number) {
const res = await request.get<ApiResult<ShopRider>>(
'/shop/shop-rider/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}

61
src/api/shop/shopRider/model/index.ts
View File

@@ -1,61 +0,0 @@
import type { PageParam } from '@/api';
/**
* 配送员
*/
export interface ShopRider {
// 主键ID
id?: string;
// 配送点ID（shop_dealer.id）
dealerId?: number;
// 骑手编号（可选）
riderNo?: string;
// 姓名
realName?: string;
// 手机号
mobile?: string;
// 头像
avatar?: string;
// 身份证号（可选）
idCardNo?: string;
// 状态：1启用；0禁用
status?: number;
// 接单状态：0休息/下线；1在线；2忙碌
workStatus?: number;
// 是否开启自动派单：1是；0否
autoDispatchEnabled?: number;
// 派单优先级（同小区多骑手时可用，值越大越优先）
dispatchPriority?: number;
// 最大同时配送单数（0表示不限制）
maxOnhandOrders?: number;
// 是否计算工资(提成)：1计算；0不计算（如三方配送点可设0）
commissionCalcEnabled?: number;
// 水每桶提成金额（元/桶）
waterBucketUnitFee?: string;
// 其他商品提成方式：1按订单固定金额；2按订单金额比例；3按商品规则(另表)
otherGoodsCommissionType?: number;
// 其他商品提成值：固定金额(元)或比例(%)
otherGoodsCommissionValue?: string;
// 用户ID
userId?: number;
// 备注
comments?: string;
// 排序号
sortNumber?: number;
// 是否删除
isDelete?: number;
// 租户id
tenantId?: number;
// 创建时间
createTime?: string;
// 修改时间
updateTime?: string;
}
/**
* 配送员搜索条件
*/
export interface ShopRiderParam extends PageParam {
id?: number;
keywords?: string;
}

12
src/api/shop/shopStore/model/index.ts
View File

@@ -8,6 +8,8 @@ export interface ShopStore {
id?: number;
// 店铺名称
shopName?: string;
// 门店横幅/图片
shopBanner?: string;
// 门店地址
shopAddress?: string;
// 手机号码
@@ -16,18 +18,24 @@ export interface ShopStore {
email?: string;
// 门店经理
managerName?: string;
// 门店banner
shopBanner?: string;
// 所在省份
province?: string;
// 所在城市
city?: string;
// 所在辖区
region?: string;
// 经度
// 经度和纬度
lngAndLat?: string;
// 经度（部分接口可能拆分返回）
lng?: string;
// 纬度
// 纬度（部分接口可能拆分返回）
lat?: string;
// 用户ID
userId?: number;
// 状态
status?: number;
// 备注
comments?: string;
// 排序号

36
src/api/shop/shopStoreRider/model/index.ts
View File

@@ -6,11 +6,37 @@ import type { PageParam } from '@/api';
export interface ShopStoreRider {
// 主键ID
id?: string;
// 门店ID
storeId?: number;
// 配送员ID
riderId?: number;
// 操作员ID
// 配送点ID（shop_dealer.id）
dealerId?: number;
// 骑手编号（可选）
riderNo?: string;
// 姓名
realName?: string;
// 手机号
mobile?: string;
// 头像
avatar?: string;
// 身份证号（可选）
idCardNo?: string;
// 状态：1启用；0禁用
status?: number;
// 接单状态：0休息/下线；1在线；2忙碌
workStatus?: number;
// 是否开启自动派单：1是；0否
autoDispatchEnabled?: number;
// 派单优先级（同小区多骑手时可用，值越大越优先）
dispatchPriority?: number;
// 最大同时配送单数（0表示不限制）
maxOnhandOrders?: number;
// 是否计算工资(提成)：1计算；0不计算（如三方配送点可设0）
commissionCalcEnabled?: number;
// 水每桶提成金额（元/桶）
waterBucketUnitFee?: string;
// 其他商品提成方式：1按订单固定金额；2按订单金额比例；3按商品规则(另表)
otherGoodsCommissionType?: number;
// 其他商品提成值：固定金额(元)或比例(%)
otherGoodsCommissionValue?: string;
// 用户ID
userId?: number;
// 备注
comments?: string;

14
src/views/cms/cmsOrder/components/cmsOrderEdit.vue
View File

@@ -654,14 +654,12 @@
hasTakeGift: undefined,
checkBill: undefined,
isSettled: undefined,
version: undefined,
userId: undefined,
comments: undefined,
sortNumber: undefined,
deleted: undefined,
tenantId: undefined,
updateTime: undefined,
createTime: undefined,
version: undefined,
userId: undefined,
deleted: undefined,
tenantId: undefined,
updateTime: undefined,
createTime: undefined,
cmsOrderId: undefined,
cmsOrderName: '',
status: 0,

15
src/views/shop/shopCommunity/components/shopCommunityEdit.vue
View File

@@ -109,15 +109,12 @@
// 用户信息
const form = reactive<ShopCommunity>({
id: undefined,
name: undefined,
code: undefined,
address: undefined,
sortNumber: undefined,
comments: undefined,
status: undefined,
tenantId: undefined,
createTime: undefined,
shopCommunityId: undefined,
name: undefined,
code: undefined,
address: undefined,
tenantId: undefined,
createTime: undefined,
shopCommunityId: undefined,
shopCommunityName: '',
status: 0,
comments: '',

18
src/views/shop/shopExpress/components/shopExpressEdit.vue
View File

@@ -1,7 +1,7 @@
<!-- 编辑弹窗 -->
<template>
<ele-modal
:width="800"
:width="700"
:visible="visible"
:maskClosable="false"
:maxable="maxable"
@@ -14,7 +14,7 @@
ref="formRef"
:model="form"
:rules="rules"
:label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
:label-col="styleResponsive ? { md: 6, sm: 5, xs: 24 } : { flex: '90px' }"
:wrapper-col="
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
"
@@ -56,20 +56,6 @@
v-model:value="form.sortNumber"
/>
</a-form-item>
<a-form-item label="是否删除, 0否, 1是" name="deleted">
<a-input
allow-clear
placeholder="请输入是否删除, 0否, 1是"
v-model:value="form.deleted"
/>
</a-form-item>
<a-form-item label="修改时间" name="updateTime">
<a-input
allow-clear
placeholder="请输入修改时间"
v-model:value="form.updateTime"
/>
</a-form-item>
</a-form>
</ele-modal>
</template>

36
src/views/shop/shopExpress/index.vue
View File

@@ -123,24 +123,24 @@
key: 'expressName',
align: 'center'
},
{
title: '物流公司编码 (微信)',
dataIndex: 'wxCode',
key: 'wxCode',
align: 'center'
},
{
title: '物流公司编码 (快递100)',
dataIndex: 'kuaidi100Code',
key: 'kuaidi100Code',
align: 'center'
},
{
title: '物流公司编码 (快递鸟)',
dataIndex: 'kdniaoCode',
key: 'kdniaoCode',
align: 'center'
},
// {
// title: '物流公司编码 (微信)',
// dataIndex: 'wxCode',
// key: 'wxCode',
// align: 'center'
// },
// {
// title: '物流公司编码 (快递100)',
// dataIndex: 'kuaidi100Code',
// key: 'kuaidi100Code',
// align: 'center'
// },
// {
// title: '物流公司编码 (快递鸟)',
// dataIndex: 'kdniaoCode',
// key: 'kdniaoCode',
// align: 'center'
// },
{
title: '排序号',
dataIndex: 'sortNumber',

42
src/views/shop/shopRider/components/search.vue
View File

@@ -1,42 +0,0 @@
<!-- 搜索表单 -->
<template>
<a-space :size="10" style="flex-wrap: wrap">
<a-button type="primary" class="ele-btn-icon" @click="add">
<template #icon>
<PlusOutlined />
</template>
<span>添加</span>
</a-button>
</a-space>
</template>
<script lang="ts" setup>
import { PlusOutlined } from '@ant-design/icons-vue';
import type { GradeParam } from '@/api/user/grade/model';
import { watch } from 'vue';
const props = withDefaults(
defineProps<{
// 选中的角色
selection?: [];
}>(),
{}
);
const emit = defineEmits<{
(e: 'search', where?: GradeParam): void;
(e: 'add'): void;
(e: 'remove'): void;
(e: 'batchMove'): void;
}>();
// 新增
const add = () => {
emit('add');
};
watch(
() => props.selection,
() => {}
);
</script>

324
src/views/shop/shopRider/components/shopRiderEdit.vue
View File

@@ -1,324 +0,0 @@
<!-- 编辑弹窗 -->
<template>
<ele-modal
:width="800"
:visible="visible"
:maskClosable="false"
:maxable="maxable"
:title="isUpdate ? '编辑配送员' : '添加配送员'"
:body-style="{ paddingBottom: '28px' }"
@update:visible="updateVisible"
@ok="save"
>
<a-form
ref="formRef"
:model="form"
:rules="rules"
:label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
:wrapper-col="
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
"
>
<a-form-item label="配送点ID（shop_dealer.id）" name="dealerId">
<a-input
allow-clear
placeholder="请输入配送点ID（shop_dealer.id）"
v-model:value="form.dealerId"
/>
</a-form-item>
<a-form-item label="骑手编号（可选）" name="riderNo">
<a-input
allow-clear
placeholder="请输入骑手编号（可选）"
v-model:value="form.riderNo"
/>
</a-form-item>
<a-form-item label="姓名" name="realName">
<a-input
allow-clear
placeholder="请输入姓名"
v-model:value="form.realName"
/>
</a-form-item>
<a-form-item label="手机号" name="mobile">
<a-input
allow-clear
placeholder="请输入手机号"
v-model:value="form.mobile"
/>
</a-form-item>
<a-form-item label="头像" name="avatar">
<a-input
allow-clear
placeholder="请输入头像"
v-model:value="form.avatar"
/>
</a-form-item>
<a-form-item label="身份证号（可选）" name="idCardNo">
<a-input
allow-clear
placeholder="请输入身份证号（可选）"
v-model:value="form.idCardNo"
/>
</a-form-item>
<a-form-item label="状态：1启用；0禁用" name="status">
<a-radio-group v-model:value="form.status">
<a-radio :value="0">显示</a-radio>
<a-radio :value="1">隐藏</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="接单状态：0休息/下线；1在线；2忙碌" name="workStatus">
<a-input
allow-clear
placeholder="请输入接单状态：0休息/下线；1在线；2忙碌"
v-model:value="form.workStatus"
/>
</a-form-item>
<a-form-item label="是否开启自动派单：1是；0否" name="autoDispatchEnabled">
<a-input
allow-clear
placeholder="请输入是否开启自动派单：1是；0否"
v-model:value="form.autoDispatchEnabled"
/>
</a-form-item>
<a-form-item label="派单优先级（同小区多骑手时可用，值越大越优先）" name="dispatchPriority">
<a-input
allow-clear
placeholder="请输入派单优先级（同小区多骑手时可用，值越大越优先）"
v-model:value="form.dispatchPriority"
/>
</a-form-item>
<a-form-item label="最大同时配送单数（0表示不限制）" name="maxOnhandOrders">
<a-input
allow-clear
placeholder="请输入最大同时配送单数（0表示不限制）"
v-model:value="form.maxOnhandOrders"
/>
</a-form-item>
<a-form-item label="是否计算工资(提成)：1计算；0不计算（如三方配送点可设0）" name="commissionCalcEnabled">
<a-input
allow-clear
placeholder="请输入是否计算工资(提成)：1计算；0不计算（如三方配送点可设0）"
v-model:value="form.commissionCalcEnabled"
/>
</a-form-item>
<a-form-item label="水每桶提成金额（元/桶）" name="waterBucketUnitFee">
<a-input
allow-clear
placeholder="请输入水每桶提成金额（元/桶）"
v-model:value="form.waterBucketUnitFee"
/>
</a-form-item>
<a-form-item label="其他商品提成方式：1按订单固定金额；2按订单金额比例；3按商品规则(另表)" name="otherGoodsCommissionType">
<a-input
allow-clear
placeholder="请输入其他商品提成方式：1按订单固定金额；2按订单金额比例；3按商品规则(另表)"
v-model:value="form.otherGoodsCommissionType"
/>
</a-form-item>
<a-form-item label="其他商品提成值：固定金额(元)或比例(%)" name="otherGoodsCommissionValue">
<a-input
allow-clear
placeholder="请输入其他商品提成值：固定金额(元)或比例(%)"
v-model:value="form.otherGoodsCommissionValue"
/>
</a-form-item>
<a-form-item label="用户ID" name="userId">
<a-input
allow-clear
placeholder="请输入用户ID"
v-model:value="form.userId"
/>
</a-form-item>
<a-form-item label="备注" name="comments">
<a-textarea
:rows="4"
:maxlength="200"
placeholder="请输入描述"
v-model:value="form.comments"
/>
</a-form-item>
<a-form-item label="排序号" name="sortNumber">
<a-input-number
:min="0"
:max="9999"
class="ele-fluid"
placeholder="请输入排序号"
v-model:value="form.sortNumber"
/>
</a-form-item>
<a-form-item label="是否删除" name="isDelete">
<a-input
allow-clear
placeholder="请输入是否删除"
v-model:value="form.isDelete"
/>
</a-form-item>
<a-form-item label="修改时间" name="updateTime">
<a-input
allow-clear
placeholder="请输入修改时间"
v-model:value="form.updateTime"
/>
</a-form-item>
</a-form>
</ele-modal>
</template>
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addShopRider, updateShopRider } from '@/api/shop/shopRider';
import { ShopRider } from '@/api/shop/shopRider/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FormInstance } from 'ant-design-vue/es/form';
import { FileRecord } from '@/api/system/file/model';
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const { styleResponsive } = storeToRefs(themeStore);
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: ShopRider | null;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
// 提交状态
const loading = ref(false);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
const images = ref<ItemType[]>([]);
// 用户信息
const form = reactive<ShopRider>({
id: undefined,
dealerId: undefined,
riderNo: undefined,
realName: undefined,
mobile: undefined,
avatar: undefined,
idCardNo: undefined,
status: undefined,
workStatus: undefined,
autoDispatchEnabled: undefined,
dispatchPriority: undefined,
maxOnhandOrders: undefined,
commissionCalcEnabled: undefined,
waterBucketUnitFee: undefined,
otherGoodsCommissionType: undefined,
otherGoodsCommissionValue: undefined,
userId: undefined,
comments: undefined,
sortNumber: undefined,
isDelete: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
shopRiderId: undefined,
shopRiderName: '',
status: 0,
comments: '',
sortNumber: 100
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
shopRiderName: [
{
required: true,
type: 'string',
message: '请填写配送员名称',
trigger: 'blur'
}
]
});
const chooseImage = (data: FileRecord) => {
images.value.push({
uid: data.id,
url: data.path,
status: 'done'
});
form.image = data.path;
};
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
form.image = '';
};
const { resetFields } = useForm(form, rules);
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateShopRider : addShopRider;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {});
};
watch(
() => props.visible,
(visible) => {
if (visible) {
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
}
isUpdate.value = true;
} else {
isUpdate.value = false;
}
} else {
resetFields();
}
},
{ immediate: true }
);
</script>

338
src/views/shop/shopRider/index.vue
View File

@@ -1,338 +0,0 @@
<template>
<a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
<a-card :bordered="false" :body-style="{ padding: '16px' }">
<ele-pro-table
ref="tableRef"
row-key="id"
:columns="columns"
:datasource="datasource"
:customRow="customRow"
tool-class="ele-toolbar-form"
class="sys-org-table"
>
<template #toolbar>
<search
@search="reload"
:selection="selection"
@add="openEdit"
@remove="removeBatch"
@batchMove="openMove"
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'image'">
<a-image :src="record.image" :width="50" />
</template>
<template v-if="column.key === 'status'">
<a-tag v-if="record.status === 0" color="green">显示</a-tag>
<a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
</template>
<template v-if="column.key === 'action'">
<a-space>
<a @click="openEdit(record)">修改</a>
<a-divider type="vertical" />
<a-popconfirm
title="确定要删除此记录吗？"
@confirm="remove(record)"
>
<a class="ele-text-danger">删除</a>
</a-popconfirm>
</a-space>
</template>
</template>
</ele-pro-table>
</a-card>
<!-- 编辑弹窗 -->
<ShopRiderEdit v-model:visible="showEdit" :data="current" @done="reload" />
</a-page-header>
</template>
<script lang="ts" setup>
import { createVNode, ref, computed } from 'vue';
import { message, Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import type { EleProTable } from 'ele-admin-pro';
import { toDateString } from 'ele-admin-pro';
import type {
DatasourceFunction,
ColumnItem
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import {getPageTitle} from '@/utils/common';
import ShopRiderEdit from './components/shopRiderEdit.vue';
import { pageShopRider, removeShopRider, removeBatchShopRider } from '@/api/shop/shopRider';
import type { ShopRider, ShopRiderParam } from '@/api/shop/shopRider/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格选中数据
const selection = ref<ShopRider[]>([]);
// 当前编辑数据
const current = ref<ShopRider | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示批量移动弹窗
const showMove = ref(false);
// 加载状态
const loading = ref(true);
// 表格数据源
const datasource: DatasourceFunction = ({
page,
limit,
where,
orders,
filters
}) => {
if (filters) {
where.status = filters.status;
}
return pageShopRider({
...where,
...orders,
page,
limit
});
};
// 完整的列配置（包含所有字段）
const columns = ref<ColumnItem[]>([
{
title: '主键ID',
dataIndex: 'id',
key: 'id',
width: 90,
},
{
title: '配送点ID（shop_dealer.id）',
dataIndex: 'dealerId',
key: 'dealerId',
width: 120
},
{
title: '骑手编号（可选）',
dataIndex: 'riderNo',
key: 'riderNo',
ellipsis: true
},
{
title: '姓名',
dataIndex: 'realName',
key: 'realName',
ellipsis: true
},
{
title: '手机号',
dataIndex: 'mobile',
key: 'mobile',
ellipsis: true
},
{
title: '头像',
dataIndex: 'avatar',
key: 'avatar',
ellipsis: true
},
{
title: '身份证号（可选）',
dataIndex: 'idCardNo',
key: 'idCardNo',
ellipsis: true
},
{
title: '状态：1启用；0禁用',
dataIndex: 'status',
key: 'status',
width: 120
},
{
title: '接单状态：0休息/下线；1在线；2忙碌',
dataIndex: 'workStatus',
key: 'workStatus',
width: 120
},
{
title: '是否开启自动派单：1是；0否',
dataIndex: 'autoDispatchEnabled',
key: 'autoDispatchEnabled',
width: 120
},
{
title: '派单优先级（同小区多骑手时可用，值越大越优先）',
dataIndex: 'dispatchPriority',
key: 'dispatchPriority',
width: 120
},
{
title: '最大同时配送单数（0表示不限制）',
dataIndex: 'maxOnhandOrders',
key: 'maxOnhandOrders',
width: 120
},
{
title: '是否计算工资(提成)：1计算；0不计算（如三方配送点可设0）',
dataIndex: 'commissionCalcEnabled',
key: 'commissionCalcEnabled',
width: 120
},
{
title: '水每桶提成金额（元/桶）',
dataIndex: 'waterBucketUnitFee',
key: 'waterBucketUnitFee',
width: 120
},
{
title: '其他商品提成方式：1按订单固定金额；2按订单金额比例；3按商品规则(另表)',
dataIndex: 'otherGoodsCommissionType',
key: 'otherGoodsCommissionType',
width: 120
},
{
title: '其他商品提成值：固定金额(元)或比例(%)',
dataIndex: 'otherGoodsCommissionValue',
key: 'otherGoodsCommissionValue',
width: 120
},
{
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
width: 120
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
ellipsis: true
},
{
title: '排序号',
dataIndex: 'sortNumber',
key: 'sortNumber',
width: 120
},
{
title: '是否删除',
dataIndex: 'isDelete',
key: 'isDelete',
width: 120
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
width: 200,
align: 'center',
sorter: true,
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
{
title: '修改时间',
dataIndex: 'updateTime',
key: 'updateTime',
width: 200,
align: 'center',
sorter: true,
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
{
title: '操作',
key: 'action',
width: 180,
fixed: 'right',
align: 'center',
hideInSetting: true
}
]);
/* 搜索 */
const reload = (where?: ShopRiderParam) => {
selection.value = [];
tableRef?.value?.reload({ where: where });
};
/* 打开编辑弹窗 */
const openEdit = (row?: ShopRider) => {
current.value = row ?? null;
showEdit.value = true;
};
/* 打开批量移动弹窗 */
const openMove = () => {
showMove.value = true;
};
/* 删除单个 */
const remove = (row: ShopRider) => {
const hide = message.loading('请求中..', 0);
removeShopRider(row.id)
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
};
/* 批量删除 */
const removeBatch = () => {
if (!selection.value.length) {
message.error('请至少选择一条数据');
return;
}
Modal.confirm({
title: '提示',
content: '确定要删除选中的记录吗?',
icon: createVNode(ExclamationCircleOutlined),
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchShopRider(selection.value.map((d) => d.id))
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
}
});
};
/* 查询 */
const query = () => {
loading.value = true;
};
/* 自定义行属性 */
const customRow = (record: ShopRider) => {
return {
// 行点击事件
onClick: () => {
// console.log(record);
},
// 行双击事件
onDblclick: () => {
openEdit(record);
}
};
};
query();
</script>
<script lang="ts">
export default {
name: 'ShopRider'
};
</script>
<style lang="less" scoped></style>

23
src/views/shop/shopStore/components/search.vue
View File

@@ -7,13 +7,21 @@
</template>
<span>添加</span>
</a-button>
<a-input-search
allow-clear
placeholder="门店名称"
style="width: 240px"
v-model:value="where.keywords"
@search="reload"
/>
</a-space>
</template>
<script lang="ts" setup>
import { PlusOutlined } from '@ant-design/icons-vue';
import type { GradeParam } from '@/api/user/grade/model';
import { watch } from 'vue';
import useSearch from "@/utils/use-search";
import {ShopStoreParam} from "@/api/shop/shopStore/model";
const props = withDefaults(
defineProps<{
@@ -24,12 +32,23 @@
);
const emit = defineEmits<{
(e: 'search', where?: GradeParam): void;
(e: 'search', where?: ShopStoreParam): void;
(e: 'add'): void;
(e: 'remove'): void;
(e: 'batchMove'): void;
}>();
const reload = () => {
emit('search', where);
};
// 表单数据
const { where } = useSearch<ShopStoreParam>({
keywords: '',
userId: undefined
});
// 新增
const add = () => {
emit('add');

149
src/views/shop/shopStore/components/shopStoreEdit.vue
View File

@@ -5,6 +5,7 @@
:visible="visible"
:maskClosable="false"
:maxable="maxable"
:confirm-loading="loading"
:title="isUpdate ? '编辑门店' : '添加门店'"
:body-style="{ paddingBottom: '28px' }"
@update:visible="updateVisible"
@@ -26,11 +27,11 @@
v-model:value="form.shopName"
/>
</a-form-item>
<a-form-item label="门店地址" name="shopAddress">
<a-form-item label="门店经理" name="managerName">
<a-input
allow-clear
placeholder="请输入门店地址"
v-model:value="form.shopAddress"
placeholder="请输入门店经理"
v-model:value="form.managerName"
/>
</a-form-item>
<a-form-item label="手机号码" name="phone">
@@ -40,61 +41,29 @@
v-model:value="form.phone"
/>
</a-form-item>
<a-form-item label="邮箱" name="email">
<a-input
allow-clear
placeholder="请输入邮箱"
v-model:value="form.email"
<a-form-item label="省市区" name="region">
<RegionsSelect
v-model:value="regions"
valueField="label"
placeholder="请选择省/市/区"
/>
</a-form-item>
<a-form-item label="门店经理" name="managerName">
<a-form-item label="门店地址" name="shopAddress">
<a-input
allow-clear
placeholder="请输入门店经理"
v-model:value="form.managerName"
placeholder="请输入门店地址"
v-model:value="form.shopAddress"
/>
</a-form-item>
<a-form-item label="所在省份" name="province">
<a-input
allow-clear
placeholder="请输入所在省份"
v-model:value="form.province"
/>
</a-form-item>
<a-form-item label="所在城市" name="city">
<a-input
allow-clear
placeholder="请输入所在城市"
v-model:value="form.city"
/>
</a-form-item>
<a-form-item label="所在辖区" name="region">
<a-input
allow-clear
placeholder="请输入所在辖区"
v-model:value="form.region"
/>
</a-form-item>
<a-form-item label="经度" name="lng">
<a-input
allow-clear
placeholder="请输入经度"
v-model:value="form.lng"
/>
</a-form-item>
<a-form-item label="纬度" name="lat">
<a-input
allow-clear
placeholder="请输入纬度"
v-model:value="form.lat"
/>
</a-form-item>
<a-form-item label="用户ID" name="userId">
<a-input
allow-clear
placeholder="请输入用户ID"
v-model:value="form.userId"
/>
<a-form-item label="经纬度" name="lngAndLat">
<a-space>
<a-input
allow-clear
placeholder="请输入经纬度"
v-model:value="form.lngAndLat"
/>
<a-button type="primary" @click="openUrl(`https://lbs.qq.com/getPoint/`)">获取经纬度</a-button>
</a-space>
</a-form-item>
<a-form-item label="备注" name="comments">
<a-textarea
@@ -113,20 +82,6 @@
v-model:value="form.sortNumber"
/>
</a-form-item>
<a-form-item label="是否删除" name="isDelete">
<a-input
allow-clear
placeholder="请输入是否删除"
v-model:value="form.isDelete"
/>
</a-form-item>
<a-form-item label="修改时间" name="updateTime">
<a-input
allow-clear
placeholder="请输入修改时间"
v-model:value="form.updateTime"
/>
</a-form-item>
</a-form>
</ele-modal>
</template>
@@ -142,6 +97,8 @@
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FormInstance } from 'ant-design-vue/es/form';
import { FileRecord } from '@/api/system/file/model';
import {openUrl} from "@/utils/common";
import RegionsSelect from '@/components/RegionsSelect/index.vue';
// 是否是修改
const isUpdate = ref(false);
@@ -169,6 +126,7 @@
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
const images = ref<ItemType[]>([]);
const regions = ref<string[]>();
// 用户信息
const form = reactive<ShopStore>({
@@ -178,20 +136,16 @@
phone: undefined,
email: undefined,
managerName: undefined,
shopBanner: undefined,
province: undefined,
city: undefined,
region: undefined,
lng: undefined,
lat: undefined,
lngAndLat: undefined,
userId: undefined,
comments: undefined,
sortNumber: undefined,
isDelete: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
shopStoreId: undefined,
shopStoreName: '',
status: 0,
comments: '',
sortNumber: 100
@@ -204,13 +158,37 @@
// 表单验证规则
const rules = reactive({
shopStoreName: [
shopName: [
{
required: true,
type: 'string',
message: '请填写门店名称',
trigger: 'blur'
}
],
phone: [
{
required: true,
type: 'string',
message: '请填写手机号码',
trigger: 'blur'
}
],
region: [
{
required: true,
type: 'string',
message: '请选择省/市/区',
trigger: 'change'
}
],
shopAddress: [
{
required: true,
type: 'string',
message: '请填写门店地址',
trigger: 'blur'
}
]
});
@@ -220,16 +198,27 @@
url: data.path,
status: 'done'
});
form.image = data.path;
form.shopBanner = data.path;
};
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
form.image = '';
form.shopBanner = '';
};
const { resetFields } = useForm(form, rules);
// 级联选择回填到表单字段，保持提交参数仍然是 province/city/region
watch(
regions,
(val) => {
form.province = val?.[0];
form.city = val?.[1];
form.region = val?.[2];
},
{ immediate: true }
);
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
@@ -265,19 +254,25 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if(props.data.shopBanner){
images.value.push({
uid: uuid(),
url: props.data.image,
url: props.data.shopBanner,
status: 'done'
})
}
regions.value =
form.province && form.city && form.region
? [form.province, form.city, form.region]
: undefined;
isUpdate.value = true;
} else {
isUpdate.value = false;
regions.value = undefined;
}
} else {
resetFields();
regions.value = undefined;
}
},
{ immediate: true }

58
src/views/shop/shopStore/index.vue
View File

@@ -99,12 +99,6 @@
// 完整的列配置（包含所有字段）
const columns = ref<ColumnItem[]>([
{
title: '自增ID',
dataIndex: 'id',
key: 'id',
width: 90,
},
{
title: '店铺名称',
dataIndex: 'shopName',
@@ -117,18 +111,12 @@
key: 'shopAddress',
ellipsis: true
},
{
title: '手机号码',
dataIndex: 'phone',
key: 'phone',
ellipsis: true
},
{
title: '邮箱',
dataIndex: 'email',
key: 'email',
ellipsis: true
},
// {
// title: '手机号码',
// dataIndex: 'phone',
// key: 'phone',
// ellipsis: true
// },
{
title: '门店经理',
dataIndex: 'managerName',
@@ -165,30 +153,18 @@
key: 'lat',
ellipsis: true
},
{
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
width: 120
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
ellipsis: true
},
// {
// title: '门店备注',
// dataIndex: 'comments',
// key: 'comments',
// ellipsis: true
// },
{
title: '排序号',
dataIndex: 'sortNumber',
key: 'sortNumber',
width: 120
},
{
title: '是否删除',
dataIndex: 'isDelete',
key: 'isDelete',
width: 120
},
{
title: '创建时间',
dataIndex: 'createTime',
@@ -199,16 +175,6 @@
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
{
title: '修改时间',
dataIndex: 'updateTime',
key: 'updateTime',
width: 200,
align: 'center',
sorter: true,
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
{
title: '操作',
key: 'action',

134
src/views/shop/shopStoreRider/components/shopStoreRiderEdit.vue
View File

@@ -19,24 +19,114 @@
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
"
>
<a-form-item label="门店ID" name="storeId">
<a-form-item label="配送点ID（shop_dealer.id）" name="dealerId">
<a-input
allow-clear
placeholder="请输入门店ID"
v-model:value="form.storeId"
placeholder="请输入配送点ID（shop_dealer.id）"
v-model:value="form.dealerId"
/>
</a-form-item>
<a-form-item label="配送员ID" name="riderId">
<a-form-item label="骑手编号（可选）" name="riderNo">
<a-input
allow-clear
placeholder="请输入配送员ID"
v-model:value="form.riderId"
placeholder="请输入骑手编号（可选）"
v-model:value="form.riderNo"
/>
</a-form-item>
<a-form-item label="操作员ID" name="userId">
<a-form-item label="姓名" name="realName">
<a-input
allow-clear
placeholder="请输入操作员ID"
placeholder="请输入姓名"
v-model:value="form.realName"
/>
</a-form-item>
<a-form-item label="手机号" name="mobile">
<a-input
allow-clear
placeholder="请输入手机号"
v-model:value="form.mobile"
/>
</a-form-item>
<a-form-item label="头像" name="avatar">
<a-input
allow-clear
placeholder="请输入头像"
v-model:value="form.avatar"
/>
</a-form-item>
<a-form-item label="身份证号（可选）" name="idCardNo">
<a-input
allow-clear
placeholder="请输入身份证号（可选）"
v-model:value="form.idCardNo"
/>
</a-form-item>
<a-form-item label="状态：1启用；0禁用" name="status">
<a-radio-group v-model:value="form.status">
<a-radio :value="0">显示</a-radio>
<a-radio :value="1">隐藏</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="接单状态：0休息/下线；1在线；2忙碌" name="workStatus">
<a-input
allow-clear
placeholder="请输入接单状态：0休息/下线；1在线；2忙碌"
v-model:value="form.workStatus"
/>
</a-form-item>
<a-form-item label="是否开启自动派单：1是；0否" name="autoDispatchEnabled">
<a-input
allow-clear
placeholder="请输入是否开启自动派单：1是；0否"
v-model:value="form.autoDispatchEnabled"
/>
</a-form-item>
<a-form-item label="派单优先级（同小区多骑手时可用，值越大越优先）" name="dispatchPriority">
<a-input
allow-clear
placeholder="请输入派单优先级（同小区多骑手时可用，值越大越优先）"
v-model:value="form.dispatchPriority"
/>
</a-form-item>
<a-form-item label="最大同时配送单数（0表示不限制）" name="maxOnhandOrders">
<a-input
allow-clear
placeholder="请输入最大同时配送单数（0表示不限制）"
v-model:value="form.maxOnhandOrders"
/>
</a-form-item>
<a-form-item label="是否计算工资(提成)：1计算；0不计算（如三方配送点可设0）" name="commissionCalcEnabled">
<a-input
allow-clear
placeholder="请输入是否计算工资(提成)：1计算；0不计算（如三方配送点可设0）"
v-model:value="form.commissionCalcEnabled"
/>
</a-form-item>
<a-form-item label="水每桶提成金额（元/桶）" name="waterBucketUnitFee">
<a-input
allow-clear
placeholder="请输入水每桶提成金额（元/桶）"
v-model:value="form.waterBucketUnitFee"
/>
</a-form-item>
<a-form-item label="其他商品提成方式：1按订单固定金额；2按订单金额比例；3按商品规则(另表)" name="otherGoodsCommissionType">
<a-input
allow-clear
placeholder="请输入其他商品提成方式：1按订单固定金额；2按订单金额比例；3按商品规则(另表)"
v-model:value="form.otherGoodsCommissionType"
/>
</a-form-item>
<a-form-item label="其他商品提成值：固定金额(元)或比例(%)" name="otherGoodsCommissionValue">
<a-input
allow-clear
placeholder="请输入其他商品提成值：固定金额(元)或比例(%)"
v-model:value="form.otherGoodsCommissionValue"
/>
</a-form-item>
<a-form-item label="用户ID" name="userId">
<a-input
allow-clear
placeholder="请输入用户ID"
v-model:value="form.userId"
/>
</a-form-item>
@@ -117,15 +207,25 @@
// 用户信息
const form = reactive<ShopStoreRider>({
id: undefined,
storeId: undefined,
riderId: undefined,
userId: undefined,
comments: undefined,
sortNumber: undefined,
isDelete: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
dealerId: undefined,
riderNo: undefined,
realName: undefined,
mobile: undefined,
avatar: undefined,
idCardNo: undefined,
workStatus: undefined,
autoDispatchEnabled: undefined,
dispatchPriority: undefined,
maxOnhandOrders: undefined,
commissionCalcEnabled: undefined,
waterBucketUnitFee: undefined,
otherGoodsCommissionType: undefined,
otherGoodsCommissionValue: undefined,
userId: undefined,
isDelete: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
shopStoreRiderId: undefined,
shopStoreRiderName: '',
status: 0,

132
src/views/shop/shopStoreRider/index.vue
View File

@@ -100,47 +100,105 @@
// 完整的列配置（包含所有字段）
const columns = ref<ColumnItem[]>([
{
title: '主键ID',
dataIndex: 'id',
key: 'id',
width: 90,
},
{
title: '门店ID',
dataIndex: 'storeId',
key: 'storeId',
width: 120
},
{
title: '配送员ID',
dataIndex: 'riderId',
key: 'riderId',
width: 120
},
{
title: '操作员ID',
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
width: 120
width: 90
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
ellipsis: true
title: '选择配送点',
dataIndex: 'dealerId',
key: 'dealerId'
},
{
title: '排序号',
dataIndex: 'sortNumber',
key: 'sortNumber',
width: 120
title: '骑手编号',
dataIndex: 'riderNo',
key: 'riderNo'
},
{
title: '是否删除',
dataIndex: 'isDelete',
key: 'isDelete',
width: 120
title: '姓名',
dataIndex: 'realName',
key: 'realName'
},
{
title: '手机号',
dataIndex: 'mobile',
key: 'mobile'
},
{
title: '头像',
dataIndex: 'avatar',
key: 'avatar'
},
{
title: '身份证号',
dataIndex: 'idCardNo',
key: 'idCardNo'
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
align: 'center'
},
{
title: '接单状态',
dataIndex: 'workStatus',
key: 'workStatus',
align: 'center'
},
{
title: '自动派单',
dataIndex: 'autoDispatchEnabled',
key: 'autoDispatchEnabled',
align: 'center'
},
{
title: '派单优先级',
dataIndex: 'dispatchPriority',
key: 'dispatchPriority',
width: 90,
align: 'center'
},
// {
// title: '最大同时配送单数（0表示不限制）',
// dataIndex: 'maxOnhandOrders',
// key: 'maxOnhandOrders',
// width: 120
// },
// {
// title: '是否计算工资',
// dataIndex: 'commissionCalcEnabled',
// key: 'commissionCalcEnabled',
// width: 90
// },
// {
// title: '水每桶提成金额（元/桶）',
// dataIndex: 'waterBucketUnitFee',
// key: 'waterBucketUnitFee'
// },
// {
// title: '商品提成方式',
// dataIndex: 'otherGoodsCommissionType',
// key: 'otherGoodsCommissionType'
// },
// {
// title: '其他商品提成值：固定金额(元)或比例(%)',
// dataIndex: 'otherGoodsCommissionValue',
// key: 'otherGoodsCommissionValue'
// },
// {
// title: '备注',
// dataIndex: 'comments',
// key: 'comments',
// ellipsis: true
// },
// {
// title: '排序号',
// dataIndex: 'sortNumber',
// key: 'sortNumber',
// width: 120
// },
{
title: '创建时间',
dataIndex: 'createTime',
@@ -151,16 +209,6 @@
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
{
title: '修改时间',
dataIndex: 'updateTime',
key: 'updateTime',
width: 200,
align: 'center',
sorter: true,
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
{
title: '操作',
key: 'action',

36
src/views/shop/shopStoreUser/components/shopStoreUserEdit.vue
View File

@@ -19,18 +19,18 @@
styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
"
>
<a-form-item label="配送点ID（shop_dealer.id）" name="storeId">
<a-form-item label="选择门店" name="storeId">
<a-input
allow-clear
placeholder="请输入配送点ID（shop_dealer.id）"
placeholder="请选择门店"
v-model:value="form.storeId"
/>
</a-form-item>
<a-form-item label="用户ID" name="userId">
<a-input
allow-clear
placeholder="请输入用户ID"
<a-form-item label="选择用户" name="userId">
<SelectUser
:placeholder="`选择用户`"
v-model:value="form.userId"
@done="onToUser"
/>
</a-form-item>
<a-form-item label="备注" name="comments">
@@ -79,6 +79,7 @@
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FormInstance } from 'ant-design-vue/es/form';
import { FileRecord } from '@/api/system/file/model';
import {User} from "@/api/system/user/model";
// 是否是修改
const isUpdate = ref(false);
@@ -109,15 +110,13 @@
// 用户信息
const form = reactive<ShopStoreUser>({
id: undefined,
storeId: undefined,
userId: undefined,
comments: undefined,
sortNumber: undefined,
isDelete: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
id: undefined,
storeId: undefined,
userId: undefined,
isDelete: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
shopStoreUserId: undefined,
shopStoreUserName: '',
status: 0,
@@ -156,6 +155,13 @@
form.image = '';
};
const onToUser = (item: User) => {
form.userId = item.userId;
form.realName = item.realName;
// form.toUserId = item.userId;
// form.toUserName = item.nickname;
};
const { resetFields } = useForm(form, rules);
/* 保存编辑 */

38
src/views/shop/shopStoreUser/index.vue
View File

@@ -100,21 +100,27 @@
// 完整的列配置（包含所有字段）
const columns = ref<ColumnItem[]>([
{
title: '主键ID',
dataIndex: 'id',
key: 'id',
width: 90,
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
width: 120
},
{
title: '配送点ID（shop_dealer.id）',
title: '所属门店',
dataIndex: 'storeId',
key: 'storeId',
width: 120
},
{
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
title: '姓名',
dataIndex: 'name',
key: 'name',
width: 120
},
{
title: '手机号',
dataIndex: 'phone',
key: 'phone',
width: 120
},
{
@@ -129,12 +135,6 @@
key: 'sortNumber',
width: 120
},
{
title: '是否删除',
dataIndex: 'isDelete',
key: 'isDelete',
width: 120
},
{
title: '创建时间',
dataIndex: 'createTime',
@@ -145,16 +145,6 @@
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
{
title: '修改时间',
dataIndex: 'updateTime',
key: 'updateTime',
width: 200,
align: 'center',
sorter: true,
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
{
title: '操作',
key: 'action',