gxwebsoft
9b5875e6fb
- 新增配送模式三态选择（0全国/1指定配送/2指定不发货） - 编辑表单中增加“配送模式”单选，mode=2时复用多选地区组件选择不发货地区 - 保存时根据模式调整 regionMode 和 regionIds 字段，确保模式与地区同步 - 列表页配送地区列新增不发货黑名单显示，聚合城市码为省份名并支持省名去重 - 加载地区时建立城市ID到省份ID映射，实现城市码聚合显示省名功能 - 适配旧数据兼容性，支持单值旧数据和全国模式显示 - 表单校验强化，指定配送/不发货模式下必须选择有效地区 - 完成端到端链路功能闭环，前端支持黑名单配置，后端按租户生效配送限制
339 lines
9.2 KiB
Vue
339 lines
9.2 KiB
Vue
<template>
|
|
<a-page-header :title="pageTitle" @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"
|
|
v-model:selection="selection"
|
|
tool-class="ele-toolbar-form"
|
|
class="sys-org-table"
|
|
>
|
|
<template #toolbar>
|
|
<search
|
|
:selection="selection"
|
|
@add="openEdit"
|
|
@remove="removeBatch"
|
|
/>
|
|
</template>
|
|
<template #bodyCell="{ column, record }">
|
|
<template v-if="column.key === 'status'">
|
|
<a-tag v-if="record.status === 0" color="green">启用</a-tag>
|
|
<a-tag v-else 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>
|
|
|
|
<!-- 编辑弹窗 -->
|
|
<ShopExpressTemplateDetailEdit
|
|
v-model:visible="showEdit"
|
|
:data="current"
|
|
:template-id="templateId"
|
|
:template-type="templateType"
|
|
@done="reload"
|
|
/>
|
|
</a-page-header>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { createVNode, ref, computed, onMounted, h } from 'vue';
|
|
import { useRoute } from 'vue-router';
|
|
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 ShopExpressTemplateDetailEdit from './components/shopExpressTemplateDetailEdit.vue';
|
|
import {
|
|
pageShopExpressTemplateDetail,
|
|
removeShopExpressTemplateDetail,
|
|
removeBatchShopExpressTemplateDetail
|
|
} from '@/api/shop/shopExpressTemplateDetail';
|
|
import type {
|
|
ShopExpressTemplateDetail,
|
|
ShopExpressTemplateDetailParam
|
|
} from '@/api/shop/shopExpressTemplateDetail/model';
|
|
import { getRegionsData } from '@/components/RegionsSelect/load-data';
|
|
|
|
const route = useRoute();
|
|
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
|
|
|
|
// 从路由参数获取模板信息
|
|
const templateId = Number(route.query.templateId) || undefined;
|
|
const templateTitle = (route.query.title as string) || '';
|
|
const templateType = route.query.type !== 'false'; // 默认 true（按件）
|
|
|
|
// 页面标题
|
|
const pageTitle = computed(() => {
|
|
return templateTitle
|
|
? `${templateTitle} - 配送区域`
|
|
: (getPageTitle() as string);
|
|
});
|
|
|
|
// 地区ID→名称映射
|
|
const regionMap = ref<Record<string, string>>({});
|
|
// 城市ID→省份ID映射（用于把城市码聚合显示为省名）
|
|
const cityToProvince = ref<Record<string, string>>({});
|
|
|
|
// 表格选中数据
|
|
const selection = ref<ShopExpressTemplateDetail[]>([]);
|
|
// 当前编辑数据
|
|
const current = ref<ShopExpressTemplateDetail | null>(null);
|
|
// 是否显示编辑弹窗
|
|
const showEdit = ref(false);
|
|
|
|
// 表格数据源（自动按 templateId 过滤）
|
|
const datasource: DatasourceFunction = ({
|
|
page,
|
|
limit,
|
|
where,
|
|
orders,
|
|
filters
|
|
}) => {
|
|
if (filters) {
|
|
where.status = filters.status;
|
|
}
|
|
return pageShopExpressTemplateDetail({
|
|
templateId: templateId,
|
|
...where,
|
|
...orders,
|
|
page,
|
|
limit
|
|
});
|
|
};
|
|
|
|
// 表格列配置
|
|
const columns = ref<ColumnItem[]>([
|
|
{
|
|
title: '配送地区',
|
|
key: 'region',
|
|
align: 'center',
|
|
width: 150,
|
|
customRender: ({ record }) => {
|
|
const mode = record.regionMode;
|
|
const ids = (record.regionIds || '')
|
|
.split(',')
|
|
.filter(Boolean);
|
|
if (mode === 2) {
|
|
// 指定不发货（黑名单）
|
|
if (!ids.length) {
|
|
return h('span', { style: { color: '#bbb' } }, '不发货（未配置地区）');
|
|
}
|
|
const text = '不发货：' + aggregateProvinces(ids).join('、');
|
|
return renderRegionText(text, 26);
|
|
}
|
|
if (mode === 1) {
|
|
// 指定配送（白名单）
|
|
if (!ids.length) return '默认全国';
|
|
const text = aggregateProvinces(ids).join('、');
|
|
return renderRegionText(text, 22);
|
|
}
|
|
// 兼容旧数据 / 全国
|
|
const province = record.provinceId
|
|
? regionMap.value[String(record.provinceId)]
|
|
: '';
|
|
const city = record.cityId
|
|
? regionMap.value[String(record.cityId)]
|
|
: '';
|
|
if (!province && !city) return '默认全国';
|
|
return city ? `${province} / ${city}` : province;
|
|
}
|
|
},
|
|
{
|
|
title: '首件数量/重量',
|
|
dataIndex: 'firstNum',
|
|
key: 'firstNum',
|
|
align: 'center',
|
|
width: 120
|
|
},
|
|
{
|
|
title: '首件价格',
|
|
dataIndex: 'firstAmount',
|
|
key: 'firstAmount',
|
|
align: 'center',
|
|
width: 100
|
|
},
|
|
{
|
|
title: '续件数量/重量',
|
|
dataIndex: 'extraNum',
|
|
key: 'extraNum',
|
|
align: 'center',
|
|
width: 120
|
|
},
|
|
{
|
|
title: '续件价格',
|
|
dataIndex: 'extraAmount',
|
|
key: 'extraAmount',
|
|
align: 'center',
|
|
width: 100
|
|
},
|
|
{
|
|
title: '状态',
|
|
dataIndex: 'status',
|
|
key: 'status',
|
|
align: 'center',
|
|
width: 80
|
|
},
|
|
{
|
|
title: '排序',
|
|
dataIndex: 'sortNumber',
|
|
key: 'sortNumber',
|
|
align: 'center',
|
|
width: 80,
|
|
sorter: true
|
|
},
|
|
{
|
|
title: '创建时间',
|
|
dataIndex: 'createTime',
|
|
key: 'createTime',
|
|
align: 'center',
|
|
width: 120,
|
|
sorter: true,
|
|
ellipsis: true,
|
|
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
|
|
},
|
|
{
|
|
title: '操作',
|
|
key: 'action',
|
|
width: 140,
|
|
fixed: 'right',
|
|
align: 'center',
|
|
hideInSetting: true
|
|
}
|
|
]);
|
|
|
|
/* 搜索 */
|
|
const reload = (where?: ShopExpressTemplateDetailParam) => {
|
|
selection.value = [];
|
|
tableRef?.value?.reload({ where: where });
|
|
};
|
|
|
|
/* 打开编辑弹窗 */
|
|
const openEdit = (row?: ShopExpressTemplateDetail) => {
|
|
current.value = row ?? null;
|
|
showEdit.value = true;
|
|
};
|
|
|
|
/* 删除单个 */
|
|
const remove = (row: ShopExpressTemplateDetail) => {
|
|
const hide = message.loading('请求中..', 0);
|
|
removeShopExpressTemplateDetail(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);
|
|
removeBatchShopExpressTemplateDetail(
|
|
selection.value.map((d) => d.id)
|
|
)
|
|
.then((msg) => {
|
|
hide();
|
|
message.success(msg);
|
|
reload();
|
|
})
|
|
.catch((e) => {
|
|
hide();
|
|
message.error(e.message);
|
|
});
|
|
}
|
|
});
|
|
};
|
|
|
|
/* 自定义行属性 */
|
|
const customRow = (record: ShopExpressTemplateDetail) => {
|
|
return {
|
|
onDblclick: () => {
|
|
openEdit(record);
|
|
}
|
|
};
|
|
};
|
|
|
|
/* 把城市编码数组聚合为去重的省份名称数组（兼容直接存省份码的场景） */
|
|
const aggregateProvinces = (ids: string[]) => {
|
|
const set = new Set<string>();
|
|
ids.forEach((id) => {
|
|
const prov = cityToProvince.value[id];
|
|
if (prov) {
|
|
set.add(regionMap.value[prov] || prov);
|
|
} else {
|
|
set.add(regionMap.value[id] || id);
|
|
}
|
|
});
|
|
return [...set];
|
|
};
|
|
|
|
/* 过长截断并支持 tooltip 悬浮查看全部 */
|
|
const renderRegionText = (text: string, max = 22) => {
|
|
if (text.length > max) {
|
|
return h('span', { title: text }, text.slice(0, max) + '…');
|
|
}
|
|
return text;
|
|
};
|
|
|
|
/* 加载地区数据，建立ID→名称映射 */
|
|
onMounted(() => {
|
|
getRegionsData().then((data) => {
|
|
const map: Record<string, string> = {};
|
|
const c2p: Record<string, string> = {};
|
|
data.forEach((province) => {
|
|
map[province.value] = province.label;
|
|
if (province.children) {
|
|
province.children.forEach((city) => {
|
|
map[city.value] = city.label;
|
|
c2p[city.value] = province.value;
|
|
});
|
|
}
|
|
});
|
|
regionMap.value = map;
|
|
cityToProvince.value = c2p;
|
|
});
|
|
});
|
|
</script>
|
|
|
|
<script lang="ts">
|
|
export default {
|
|
name: 'ShopExpressTemplateDetail'
|
|
};
|
|
</script>
|
|
|
|
<style lang="less" scoped></style>
|