feat(shop): 完善订单发货功能及配送方式展示

- 新增发货备注、快递公司、发货人信息等字段
- 优化发货表单验证逻辑,支持不同配送方式的动态校验
- 新增配送方式为"商家送货"和"无需发货"的处理逻辑
- 完善订单详情页配送信息展示,增加发货店铺和无需发货备注显示
- 修复发货模态框中部分字段重置逻辑
- 调整开发环境API配置注释状态
This commit is contained in:
2025-12-16 15:00:29 +08:00
parent 66cd1dbf11
commit 89d359b40e
6 changed files with 1000 additions and 0 deletions

View File

@@ -0,0 +1,126 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api';
import type { CreditUser, CreditUserParam } from './model';
/**
* 分页查询招投标信息表
*/
export async function pageCreditUser(params: CreditUserParam) {
const res = await request.get<ApiResult<PageResult<CreditUser>>>(
'/credit/credit-user/page',
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询招投标信息表列表
*/
export async function listCreditUser(params?: CreditUserParam) {
const res = await request.get<ApiResult<CreditUser[]>>(
'/credit/credit-user',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加招投标信息表
*/
export async function addCreditUser(data: CreditUser) {
const res = await request.post<ApiResult<unknown>>(
'/credit/credit-user',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改招投标信息表
*/
export async function updateCreditUser(data: CreditUser) {
const res = await request.put<ApiResult<unknown>>(
'/credit/credit-user',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除招投标信息表
*/
export async function removeCreditUser(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
'/credit/credit-user/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除招投标信息表
*/
export async function removeBatchCreditUser(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
'/credit/credit-user/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询招投标信息表
*/
export async function getCreditUser(id: number) {
const res = await request.get<ApiResult<CreditUser>>(
'/credit/credit-user/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 导入招投标
*/
export async function importCreditUsers(file: File) {
const formData = new FormData();
formData.append('file', file);
const res = await request.post<ApiResult<unknown>>(
'/credit/credit-user/import',
formData,
{
headers: {
'Content-Type': 'multipart/form-data'
}
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}

View File

@@ -0,0 +1,67 @@
import type { PageParam } from '@/api';
/**
* 招投标信息表
*/
export interface CreditUser {
// ID
id?: number;
// 客户名称
name?: string;
// 唯一标识
code?: string;
// 类型, 0普通用户, 1招投标
type?: number;
// 企业角色
role?: string;
// 上级id, 0是顶级
parentId?: number;
// 信息类型
infoType?: string;
// 所在国家
country?: string;
// 所在省份
province?: string;
// 所在城市
city?: string;
// 所在辖区
region?: string;
// 街道地址
address?: string;
// 招采单位名称
procurementName?: string;
// 中标单位名称
winningName?: string;
// 中标单位名称
winningPrice?: string;
// 发布日期
releaseDate?: string;
// 备注
comments?: string;
// 是否推荐
recommend?: number;
// 到期时间
expirationTime?: string;
// 排序(数字越小越靠前)
sortNumber?: number;
// 状态, 0正常, 1冻结
status?: number;
// 是否删除, 0否, 1是
deleted?: number;
// 用户ID
userId?: number;
// 租户id
tenantId?: number;
// 创建时间
createTime?: string;
// 修改时间
updateTime?: string;
}
/**
* 招投标信息表搜索条件
*/
export interface CreditUserParam extends PageParam {
id?: number;
keywords?: string;
}

View File

@@ -0,0 +1,93 @@
<!-- 招投标导入弹窗 -->
<template>
<ele-modal
:width="520"
:footer="null"
title="招投标批量导入"
:visible="visible"
@update:visible="updateVisible"
>
<a-spin :spinning="loading">
<a-upload-dragger
accept=".xls,.xlsx"
:show-upload-list="false"
:customRequest="doUpload"
style="padding: 24px 0; margin-bottom: 16px"
>
<p class="ant-upload-drag-icon">
<cloud-upload-outlined />
</p>
<p class="ant-upload-hint">将文件拖到此处或点击上传</p>
</a-upload-dragger>
</a-spin>
<div class="ele-text-center">
<span>只能上传xlsxlsx文件</span>
<a :href="templateUrl" download="招投标导入模板.xlsx">
下载导入模板
</a>
</div>
</ele-modal>
</template>
<script lang="ts" setup>
import { computed, ref } from 'vue';
import { message } from 'ant-design-vue/es';
import { CloudUploadOutlined } from '@ant-design/icons-vue';
import { importCreditUsers } from '@/api/credit/creditUser';
import { API_BASE_URL } from '@/config/setting';
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
defineProps<{
// 是否打开弹窗
visible: boolean;
}>();
// 导入请求状态
const loading = ref(false);
// 模板下载地址,保持与当前接口域名一致
const templateUrl = computed(() => {
const base =
(localStorage.getItem('ApiUrl') || API_BASE_URL || '').replace(/\/$/, '');
return `${base}/credit/credit-user/import/template`;
});
/* 上传 */
const doUpload = ({ file }) => {
if (
![
'application/vnd.ms-excel',
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
].includes(file.type)
) {
message.error('只能选择 excel 文件');
return false;
}
if (file.size / 1024 / 1024 > 10) {
message.error('大小不能超过 10MB');
return false;
}
loading.value = true;
importCreditUsers(file)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
return false;
};
/* 更新 visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
</script>

View File

@@ -0,0 +1,309 @@
<!-- 编辑弹窗 -->
<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="客户名称" name="name">
<a-input
allow-clear
placeholder="请输入客户名称"
v-model:value="form.name"
/>
</a-form-item>
<a-form-item label="发布日期" name="releaseDate">
<a-input
allow-clear
placeholder="请输入发布日期"
v-model:value="form.releaseDate"
/>
</a-form-item>
<!-- <a-form-item label="类型, 0普通用户, 1招投标" name="type">-->
<!-- <a-input-->
<!-- allow-clear-->
<!-- placeholder="请输入类型, 0普通用户, 1招投标"-->
<!-- v-model:value="form.type"-->
<!-- />-->
<!-- </a-form-item>-->
<a-form-item label="企业角色" name="role">
<a-input
allow-clear
placeholder="请输入企业角色"
v-model:value="form.role"
/>
</a-form-item>
<!-- <a-form-item label="上级id, 0是顶级" name="parentId">-->
<!-- <a-input-->
<!-- allow-clear-->
<!-- placeholder="请输入上级id, 0是顶级"-->
<!-- v-model:value="form.parentId"-->
<!-- />-->
<!-- </a-form-item>-->
<a-form-item label="信息类型" name="infoType">
<a-input
allow-clear
placeholder="请输入信息类型"
v-model:value="form.infoType"
/>
</a-form-item>
<!-- <a-form-item label="所在国家" name="country">-->
<!-- <a-input-->
<!-- allow-clear-->
<!-- placeholder="请输入所在国家"-->
<!-- v-model:value="form.country"-->
<!-- />-->
<!-- </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="address">
<a-input
allow-clear
placeholder="请输入街道地址"
v-model:value="form.address"
/>
</a-form-item>
<a-form-item label="招采单位" name="procurementName">
<a-input
allow-clear
placeholder="请输入招采单位名称"
v-model:value="form.procurementName"
/>
</a-form-item>
<a-form-item label="中标单位" name="winningName">
<a-input
allow-clear
placeholder="请输入中标单位名称"
v-model:value="form.winningName"
/>
</a-form-item>
<a-form-item label="中标金额" name="winningPrice">
<a-input
allow-clear
placeholder="请输入中标金额"
v-model:value="form.winningPrice"
/>
</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="recommend">-->
<!-- <a-input-->
<!-- allow-clear-->
<!-- placeholder="请输入是否推荐"-->
<!-- v-model:value="form.recommend"-->
<!-- />-->
<!-- </a-form-item>-->
<!-- <a-form-item label="到期时间" name="expirationTime">-->
<!-- <a-input-->
<!-- allow-clear-->
<!-- placeholder="请输入到期时间"-->
<!-- v-model:value="form.expirationTime"-->
<!-- />-->
<!-- </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>
</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 { addCreditUser, updateCreditUser } from '@/api/credit/creditUser';
import { CreditUser } from '@/api/credit/creditUser/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?: CreditUser | 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<CreditUser>({
id: undefined,
name: undefined,
code: undefined,
type: undefined,
role: undefined,
parentId: undefined,
infoType: undefined,
country: undefined,
province: undefined,
city: undefined,
region: undefined,
address: undefined,
procurementName: undefined,
winningName: undefined,
winningPrice: undefined,
releaseDate: undefined,
comments: undefined,
recommend: undefined,
expirationTime: undefined,
sortNumber: undefined,
deleted: undefined,
userId: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
status: 0,
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
creditUserName: [
{
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 ? updateCreditUser : addCreditUser;
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>

View File

@@ -0,0 +1,87 @@
<!-- 搜索表单 -->
<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-button class="ele-btn-icon" @click="openImport">
<template #icon>
<CloudUploadOutlined />
</template>
<span>导入</span>
</a-button>
<a-button
danger
class="ele-btn-icon"
:disabled="!selection?.length"
@click="remove"
>
<template #icon>
<DeleteOutlined />
</template>
<span>批量删除</span>
</a-button>
<a-input-search
allow-clear
v-model:value="keywords"
placeholder="请输入关键词"
style="width: 220px"
@search="handleSearch"
@pressEnter="handleSearch"
/>
</a-space>
</template>
<script lang="ts" setup>
import { computed, ref } from 'vue';
import {
PlusOutlined,
CloudUploadOutlined,
DeleteOutlined
} from '@ant-design/icons-vue';
import type { CreditUser, CreditUserParam } from '@/api/credit/creditUser/model';
const props = withDefaults(
defineProps<{
// 选中的角色
selection?: CreditUser[];
}>(),
{
selection: () => []
}
);
const emit = defineEmits<{
(e: 'search', where?: CreditUserParam): void;
(e: 'add'): void;
(e: 'remove'): void;
(e: 'batchMove'): void;
(e: 'importData'): void;
}>();
const keywords = ref('');
const selection = computed(() => props.selection || []);
// 新增
const add = () => {
emit('add');
};
// 搜索
const handleSearch = () => {
emit('search', { keywords: keywords.value });
};
// 导入
const openImport = () => {
emit('importData');
};
// 批量删除
const remove = () => {
emit('remove');
};
</script>

View File

@@ -0,0 +1,318 @@
<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"
v-model:selection="selection"
>
<template #toolbar>
<search
@search="reload"
:selection="selection"
@add="openEdit"
@remove="removeBatch"
@batchMove="openMove"
@importData="openImport"
/>
</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>
<!-- 编辑弹窗 -->
<CreditUserEdit v-model:visible="showEdit" :data="current" @done="reload" />
<!-- 导入弹窗 -->
<CreditUserImport v-model:visible="showImport" @done="reload" />
</a-page-header>
</template>
<script lang="ts" setup>
import { createVNode, ref } 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 CreditUserEdit from './components/creditUserEdit.vue';
import CreditUserImport from './components/credit-user-import.vue';
import { pageCreditUser, removeCreditUser, removeBatchCreditUser } from '@/api/credit/creditUser';
import type { CreditUser, CreditUserParam } from '@/api/credit/creditUser/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格选中数据
const selection = ref<CreditUser[]>([]);
// 当前编辑数据
const current = ref<CreditUser | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示导入弹窗
const showImport = ref(false);
// 是否显示批量移动弹窗
const showMove = ref(false);
// 搜索关键词
const searchText = ref('');
// 表格数据源
const datasource: DatasourceFunction = ({
page,
limit,
where = {},
orders,
filters
}) => {
const params: CreditUserParam = { ...where };
if (filters) {
(params as any).status = filters.status;
}
if (!params.keywords && searchText.value) {
params.keywords = searchText.value;
}
return pageCreditUser({
...params,
...orders,
page,
limit
});
};
// 完整的列配置(包含所有字段)
const columns = ref<ColumnItem[]>([
{
title: 'ID',
dataIndex: 'id',
key: 'id',
width: 90,
},
{
title: '项目名称',
dataIndex: 'name',
key: 'name'
},
{
title: '发布日期',
dataIndex: 'releaseDate',
key: 'releaseDate',
},
// {
// title: '唯一标识',
// dataIndex: 'code',
// key: 'code',
// ellipsis: true
// },
// {
// title: '类型, 0普通用户, 1招投标',
// dataIndex: 'type',
// key: 'type',
// width: 120
// },
{
title: '企业角色',
dataIndex: 'role',
key: 'role',
ellipsis: true
},
{
title: '信息类型',
dataIndex: 'infoType',
key: 'infoType',
ellipsis: true
},
{
title: '省份地区',
dataIndex: 'province',
key: 'province',
ellipsis: true
},
// {
// title: '所在城市',
// dataIndex: 'city',
// key: 'city',
// ellipsis: true
// },
// {
// title: '所在辖区',
// dataIndex: 'region',
// key: 'region',
// ellipsis: true
// },
// {
// title: '街道地址',
// dataIndex: 'address',
// key: 'address',
// ellipsis: true
// },
{
title: '招采单位',
dataIndex: 'procurementName',
key: 'procurementName',
ellipsis: true
},
{
title: '中标单位',
dataIndex: 'winningName',
key: 'winningName',
ellipsis: true
},
{
title: '中标金额',
dataIndex: 'winningPrice',
key: 'winningPrice',
ellipsis: true
},
// {
// title: '排序',
// dataIndex: 'sortNumber',
// key: 'sortNumber',
// width: 90,
// align: 'center',
// },
// {
// title: '状态',
// dataIndex: 'status',
// key: 'status',
// width: 120,
// align: 'center'
// },
// {
// title: '创建时间',
// dataIndex: 'createTime',
// key: 'createTime',
// width: 200,
// align: 'center',
// sorter: true,
// ellipsis: true,
// customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
// },
// {
// title: '操作',
// key: 'action',
// width: 120,
// fixed: 'right',
// align: 'center',
// hideInSetting: true
// }
]);
/* 搜索 */
const reload = (where?: CreditUserParam) => {
if (where && Object.prototype.hasOwnProperty.call(where, 'keywords')) {
searchText.value = where.keywords ?? '';
}
const targetWhere = where ?? { keywords: searchText.value || undefined };
selection.value = [];
tableRef?.value?.reload({ where: targetWhere });
};
/* 打开编辑弹窗 */
const openEdit = (row?: CreditUser) => {
current.value = row ?? null;
showEdit.value = true;
};
/* 打开导入弹窗 */
const openImport = () => {
showImport.value = true;
};
/* 打开批量移动弹窗 */
const openMove = () => {
showMove.value = true;
};
/* 删除单个 */
const remove = (row: CreditUser) => {
const hide = message.loading('请求中..', 0);
removeCreditUser(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);
removeBatchCreditUser(selection.value.map((d) => d.id))
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
}
});
};
/* 自定义行属性 */
const customRow = (record: CreditUser) => {
return {
// 行点击事件
onClick: () => {
// console.log(record);
},
// 行双击事件
onDblclick: () => {
openEdit(record);
}
};
};
</script>
<script lang="ts">
export default {
name: 'CreditUser'
};
</script>
<style lang="less" scoped></style>