refactor(project): remove store mock fallback flows and unify real-data states
This commit is contained in:
@@ -45,8 +45,9 @@ export interface DeliveryGeneralSettingsDto {
|
||||
|
||||
/** 门店配送设置聚合 */
|
||||
export interface StoreDeliverySettingsDto {
|
||||
generalSettings: DeliveryGeneralSettingsDto;
|
||||
mode: DeliveryMode;
|
||||
generalSettings: DeliveryGeneralSettingsDto | null;
|
||||
isConfigured: boolean;
|
||||
mode: DeliveryMode | null;
|
||||
/** 半径配送中心点纬度 */
|
||||
radiusCenterLatitude: null | number;
|
||||
/** 半径配送中心点经度 */
|
||||
@@ -57,7 +58,17 @@ export interface StoreDeliverySettingsDto {
|
||||
}
|
||||
|
||||
/** 保存配送设置参数 */
|
||||
export type SaveStoreDeliverySettingsParams = StoreDeliverySettingsDto;
|
||||
export interface SaveStoreDeliverySettingsParams {
|
||||
generalSettings: DeliveryGeneralSettingsDto;
|
||||
mode: DeliveryMode;
|
||||
/** 半径配送中心点纬度 */
|
||||
radiusCenterLatitude: null | number;
|
||||
/** 半径配送中心点经度 */
|
||||
radiusCenterLongitude: null | number;
|
||||
polygonZones: PolygonZoneDto[];
|
||||
radiusTiers: RadiusTierDto[];
|
||||
storeId: string;
|
||||
}
|
||||
|
||||
/** 复制配送设置参数 */
|
||||
export interface CopyStoreDeliverySettingsParams {
|
||||
|
||||
@@ -44,7 +44,8 @@ export interface DineInTableDto {
|
||||
/** 门店堂食设置聚合 */
|
||||
export interface StoreDineInSettingsDto {
|
||||
areas: DineInAreaDto[];
|
||||
basicSettings: DineInBasicSettingsDto;
|
||||
basicSettings: DineInBasicSettingsDto | null;
|
||||
isConfigured: boolean;
|
||||
storeId: string;
|
||||
tables: DineInTableDto[];
|
||||
}
|
||||
|
||||
@@ -60,12 +60,33 @@ export interface StoreFeesSettingsDto {
|
||||
packagingFeeMode: PackagingFeeMode;
|
||||
/** 包装费阶梯 */
|
||||
packagingFeeTiers: PackagingFeeTierDto[];
|
||||
/** 是否已配置 */
|
||||
isConfigured: boolean;
|
||||
/** 门店 ID */
|
||||
storeId: string;
|
||||
}
|
||||
|
||||
/** 保存费用设置参数 */
|
||||
export type SaveStoreFeesSettingsParams = StoreFeesSettingsDto;
|
||||
export interface SaveStoreFeesSettingsParams {
|
||||
/** 基础配送费 */
|
||||
baseDeliveryFee: number;
|
||||
/** 固定包装费 */
|
||||
fixedPackagingFee: number;
|
||||
/** 免配送费门槛,空值表示关闭 */
|
||||
freeDeliveryThreshold: null | number;
|
||||
/** 起送金额 */
|
||||
minimumOrderAmount: number;
|
||||
/** 其他费用 */
|
||||
otherFees: StoreOtherFeesDto;
|
||||
/** 按订单包装费模式 */
|
||||
orderPackagingFeeMode: OrderPackagingFeeMode;
|
||||
/** 包装费模式 */
|
||||
packagingFeeMode: PackagingFeeMode;
|
||||
/** 包装费阶梯 */
|
||||
packagingFeeTiers: PackagingFeeTierDto[];
|
||||
/** 门店 ID */
|
||||
storeId: string;
|
||||
}
|
||||
|
||||
/** 复制费用设置参数 */
|
||||
export interface CopyStoreFeesSettingsParams {
|
||||
|
||||
@@ -71,10 +71,11 @@ export interface PickupPreviewDayDto {
|
||||
|
||||
/** 门店自提设置聚合 */
|
||||
export interface StorePickupSettingsDto {
|
||||
basicSettings: PickupBasicSettingsDto;
|
||||
basicSettings: null | PickupBasicSettingsDto;
|
||||
bigSlots: PickupSlotDto[];
|
||||
fineRule: PickupFineRuleDto;
|
||||
mode: PickupMode;
|
||||
fineRule: null | PickupFineRuleDto;
|
||||
isConfigured: boolean;
|
||||
mode: null | PickupMode;
|
||||
previewDays: PickupPreviewDayDto[];
|
||||
storeId: string;
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ const emit = defineEmits<{
|
||||
(event: 'update:open', value: boolean): void;
|
||||
}>();
|
||||
|
||||
const DEFAULT_CENTER: LngLatTuple = [116.397_428, 39.909_23];
|
||||
const DEFAULT_CENTER: LngLatTuple = [104.195_397, 35.861_66];
|
||||
const MAP_MODAL_Z_INDEX = 10_000;
|
||||
const MAP_DEBUG_PREFIX = '[TenantUI-DeliveryMap]';
|
||||
|
||||
|
||||
@@ -28,106 +28,13 @@ export const TIER_COLOR_PALETTE = [
|
||||
|
||||
export const DEFAULT_DELIVERY_MODE: DeliveryMode = 'radius';
|
||||
|
||||
export const DEFAULT_RADIUS_TIERS: RadiusTierDto[] = [
|
||||
{
|
||||
id: 'tier-1',
|
||||
minDistance: 0,
|
||||
maxDistance: 1,
|
||||
deliveryFee: 3,
|
||||
etaMinutes: 20,
|
||||
minOrderAmount: 15,
|
||||
color: '#52c41a',
|
||||
},
|
||||
{
|
||||
id: 'tier-2',
|
||||
minDistance: 1,
|
||||
maxDistance: 3,
|
||||
deliveryFee: 5,
|
||||
etaMinutes: 35,
|
||||
minOrderAmount: 20,
|
||||
color: '#faad14',
|
||||
},
|
||||
{
|
||||
id: 'tier-3',
|
||||
minDistance: 3,
|
||||
maxDistance: 5,
|
||||
deliveryFee: 8,
|
||||
etaMinutes: 50,
|
||||
minOrderAmount: 25,
|
||||
color: '#ff4d4f',
|
||||
},
|
||||
];
|
||||
export const DEFAULT_RADIUS_TIERS: RadiusTierDto[] = [];
|
||||
|
||||
function createPolygonGeoJson(coordinates: Array<[number, number]>) {
|
||||
return JSON.stringify({
|
||||
type: 'FeatureCollection',
|
||||
features: [
|
||||
{
|
||||
type: 'Feature',
|
||||
geometry: {
|
||||
type: 'Polygon',
|
||||
coordinates: [coordinates],
|
||||
},
|
||||
properties: {},
|
||||
},
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
export const DEFAULT_POLYGON_ZONES: PolygonZoneDto[] = [
|
||||
{
|
||||
id: 'zone-core',
|
||||
name: '核心区域',
|
||||
color: '#52c41a',
|
||||
deliveryFee: 3,
|
||||
minOrderAmount: 15,
|
||||
etaMinutes: 20,
|
||||
priority: 1,
|
||||
polygonGeoJson: createPolygonGeoJson([
|
||||
[116.389, 39.907],
|
||||
[116.397, 39.907],
|
||||
[116.397, 39.913],
|
||||
[116.389, 39.913],
|
||||
[116.389, 39.907],
|
||||
]),
|
||||
},
|
||||
{
|
||||
id: 'zone-cbd',
|
||||
name: '朝阳CBD',
|
||||
color: '#1677ff',
|
||||
deliveryFee: 5,
|
||||
minOrderAmount: 20,
|
||||
etaMinutes: 35,
|
||||
priority: 2,
|
||||
polygonGeoJson: createPolygonGeoJson([
|
||||
[116.456, 39.914],
|
||||
[116.468, 39.914],
|
||||
[116.468, 39.923],
|
||||
[116.456, 39.923],
|
||||
[116.456, 39.914],
|
||||
]),
|
||||
},
|
||||
{
|
||||
id: 'zone-slt',
|
||||
name: '三里屯片区',
|
||||
color: '#faad14',
|
||||
deliveryFee: 6,
|
||||
minOrderAmount: 25,
|
||||
etaMinutes: 40,
|
||||
priority: 3,
|
||||
polygonGeoJson: createPolygonGeoJson([
|
||||
[116.445, 39.928],
|
||||
[116.455, 39.928],
|
||||
[116.455, 39.936],
|
||||
[116.445, 39.936],
|
||||
[116.445, 39.928],
|
||||
]),
|
||||
},
|
||||
];
|
||||
export const DEFAULT_POLYGON_ZONES: PolygonZoneDto[] = [];
|
||||
|
||||
export const DEFAULT_GENERAL_SETTINGS: DeliveryGeneralSettingsDto = {
|
||||
freeDeliveryThreshold: 30,
|
||||
maxDeliveryDistance: 5,
|
||||
hourlyCapacityLimit: 50,
|
||||
etaAdjustmentMinutes: 10,
|
||||
freeDeliveryThreshold: null,
|
||||
maxDeliveryDistance: 0,
|
||||
hourlyCapacityLimit: 1,
|
||||
etaAdjustmentMinutes: 0,
|
||||
};
|
||||
|
||||
@@ -38,11 +38,14 @@ import {
|
||||
} from './helpers';
|
||||
|
||||
interface CreateDataActionsOptions {
|
||||
clearSettings: () => void;
|
||||
editingMode: Ref<DeliveryMode>;
|
||||
generalSettings: DeliveryGeneralSettingsDto;
|
||||
isConfigured: Ref<boolean>;
|
||||
isSaving: Ref<boolean>;
|
||||
isSettingsLoading: Ref<boolean>;
|
||||
isStoreLoading: Ref<boolean>;
|
||||
loadedStoreId: Ref<string>;
|
||||
mode: Ref<DeliveryMode>;
|
||||
radiusCenterLatitude: Ref<null | number>;
|
||||
radiusCenterLongitude: Ref<null | number>;
|
||||
@@ -85,17 +88,6 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
});
|
||||
}
|
||||
|
||||
/** 回填默认配置,作为接口异常时的兜底展示。 */
|
||||
function applyDefaultSettings() {
|
||||
options.mode.value = DEFAULT_DELIVERY_MODE;
|
||||
options.editingMode.value = DEFAULT_DELIVERY_MODE;
|
||||
options.radiusCenterLatitude.value = null;
|
||||
options.radiusCenterLongitude.value = null;
|
||||
options.radiusTiers.value = sortRadiusTiers(DEFAULT_RADIUS_TIERS);
|
||||
options.polygonZones.value = sortPolygonZones(DEFAULT_POLYGON_ZONES);
|
||||
syncGeneralSettings(cloneGeneralSettings(DEFAULT_GENERAL_SETTINGS));
|
||||
}
|
||||
|
||||
/** 加载指定门店的配送设置。 */
|
||||
async function loadStoreSettings(storeId: string) {
|
||||
options.isSettingsLoading.value = true;
|
||||
@@ -104,29 +96,41 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
const result = await getStoreDeliverySettingsApi(storeId);
|
||||
if (options.selectedStoreId.value !== currentStoreId) return;
|
||||
|
||||
if (!result.isConfigured) {
|
||||
options.clearSettings();
|
||||
options.isConfigured.value = false;
|
||||
options.loadedStoreId.value = currentStoreId;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
return;
|
||||
}
|
||||
|
||||
options.mode.value = result.mode ?? DEFAULT_DELIVERY_MODE;
|
||||
options.editingMode.value = options.mode.value;
|
||||
options.radiusCenterLatitude.value = result.radiusCenterLatitude ?? null;
|
||||
options.radiusCenterLongitude.value =
|
||||
result.radiusCenterLongitude ?? null;
|
||||
options.radiusTiers.value = sortRadiusTiers(
|
||||
result.radiusTiers?.length ? result.radiusTiers : DEFAULT_RADIUS_TIERS,
|
||||
result.radiusTiers ?? DEFAULT_RADIUS_TIERS,
|
||||
);
|
||||
options.polygonZones.value = sortPolygonZones(
|
||||
result.polygonZones?.length
|
||||
? result.polygonZones
|
||||
: clonePolygonZones(DEFAULT_POLYGON_ZONES),
|
||||
result.polygonZones ?? clonePolygonZones(DEFAULT_POLYGON_ZONES),
|
||||
);
|
||||
|
||||
syncGeneralSettings({
|
||||
...DEFAULT_GENERAL_SETTINGS,
|
||||
...result.generalSettings,
|
||||
});
|
||||
syncGeneralSettings(
|
||||
result.generalSettings
|
||||
? cloneGeneralSettings(result.generalSettings)
|
||||
: cloneGeneralSettings(DEFAULT_GENERAL_SETTINGS),
|
||||
);
|
||||
options.isConfigured.value = true;
|
||||
options.loadedStoreId.value = currentStoreId;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
applyDefaultSettings();
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
options.clearSettings();
|
||||
options.isConfigured.value = false;
|
||||
options.loadedStoreId.value = '';
|
||||
options.snapshot.value = null;
|
||||
message.error('加载配送设置失败,请稍后重试');
|
||||
} finally {
|
||||
options.isSettingsLoading.value = false;
|
||||
}
|
||||
@@ -148,8 +152,10 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
|
||||
if (options.stores.value.length === 0) {
|
||||
options.selectedStoreId.value = '';
|
||||
options.loadedStoreId.value = '';
|
||||
options.isConfigured.value = false;
|
||||
options.snapshot.value = null;
|
||||
applyDefaultSettings();
|
||||
options.clearSettings();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -172,8 +178,11 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
console.error(error);
|
||||
options.stores.value = [];
|
||||
options.selectedStoreId.value = '';
|
||||
options.loadedStoreId.value = '';
|
||||
options.isConfigured.value = false;
|
||||
options.snapshot.value = null;
|
||||
applyDefaultSettings();
|
||||
options.clearSettings();
|
||||
message.error('加载门店失败,请稍后重试');
|
||||
} finally {
|
||||
options.isStoreLoading.value = false;
|
||||
}
|
||||
@@ -209,7 +218,7 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
/** 重置到最近一次加载/保存后的快照。 */
|
||||
function resetFromSnapshot() {
|
||||
if (!options.snapshot.value) {
|
||||
applyDefaultSettings();
|
||||
options.clearSettings();
|
||||
return;
|
||||
}
|
||||
applySnapshot(options.snapshot.value);
|
||||
|
||||
@@ -95,7 +95,7 @@ export function createTierActions(options: CreateTierActionsOptions) {
|
||||
// 1. 校验区间与字段合法性。
|
||||
if (options.tierForm.maxDistance <= options.tierForm.minDistance) {
|
||||
message.error('结束距离必须大于起始距离');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (
|
||||
@@ -103,7 +103,7 @@ export function createTierActions(options: CreateTierActionsOptions) {
|
||||
options.tierForm.minOrderAmount < 0
|
||||
) {
|
||||
message.error('金额字段不能小于 0');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
// 2. 校验与现有梯度区间冲突。
|
||||
@@ -116,7 +116,7 @@ export function createTierActions(options: CreateTierActionsOptions) {
|
||||
});
|
||||
if (hasOverlap) {
|
||||
message.error('距离区间与已有梯度重叠,请调整后重试');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
// 3. 组装记录并写回列表。
|
||||
@@ -143,18 +143,20 @@ export function createTierActions(options: CreateTierActionsOptions) {
|
||||
message.success(
|
||||
options.tierDrawerMode.value === 'edit' ? '梯度已更新' : '梯度已添加',
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
/** 删除指定梯度。 */
|
||||
function handleDeleteTier(tierId: string) {
|
||||
if (options.radiusTiers.value.length <= 1) {
|
||||
message.warning('至少保留一个梯度');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
options.radiusTiers.value = options.radiusTiers.value.filter(
|
||||
(item) => item.id !== tierId,
|
||||
);
|
||||
message.success('梯度已删除');
|
||||
return true;
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
@@ -101,12 +101,12 @@ export function createZoneActions(options: CreateZoneActionsOptions) {
|
||||
const normalizedName = options.zoneForm.name.trim();
|
||||
if (!normalizedName) {
|
||||
message.error('请输入区域名称');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (countPolygonsInGeoJson(options.zoneForm.polygonGeoJson) <= 0) {
|
||||
message.error('请先绘制配送区域');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
// 2. 优先级冲突校验。
|
||||
@@ -116,7 +116,7 @@ export function createZoneActions(options: CreateZoneActionsOptions) {
|
||||
});
|
||||
if (hasPriorityConflict) {
|
||||
message.error('优先级已存在,请调整后重试');
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
// 3. 写回列表。
|
||||
@@ -144,6 +144,7 @@ export function createZoneActions(options: CreateZoneActionsOptions) {
|
||||
message.success(
|
||||
options.zoneDrawerMode.value === 'edit' ? '区域已更新' : '区域已添加',
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
/** 删除指定区域。 */
|
||||
@@ -152,6 +153,7 @@ export function createZoneActions(options: CreateZoneActionsOptions) {
|
||||
(item) => item.id !== zoneId,
|
||||
);
|
||||
message.success('区域已删除');
|
||||
return true;
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
@@ -67,6 +67,8 @@ export function useStoreDeliveryPage() {
|
||||
const isSettingsLoading = ref(false);
|
||||
const isSaving = ref(false);
|
||||
const isCopySubmitting = ref(false);
|
||||
const isConfigured = ref(false);
|
||||
const loadedStoreId = ref('');
|
||||
|
||||
// 2. 页面主业务数据。
|
||||
const stores = ref<StoreListItemDto[]>([]);
|
||||
@@ -180,6 +182,19 @@ export function useStoreDeliveryPage() {
|
||||
|
||||
const isRadiusMode = computed(() => editingMode.value === 'radius');
|
||||
const isPageLoading = computed(() => isSettingsLoading.value);
|
||||
const hasSelectedStore = computed(() => Boolean(selectedStoreId.value));
|
||||
const hasLoadedStoreSettings = computed(
|
||||
() =>
|
||||
loadedStoreId.value === selectedStoreId.value && snapshot.value !== null,
|
||||
);
|
||||
const canOperate = computed(
|
||||
() =>
|
||||
hasSelectedStore.value &&
|
||||
loadedStoreId.value === selectedStoreId.value &&
|
||||
!isStoreLoading.value &&
|
||||
!isSettingsLoading.value &&
|
||||
!isSaving.value,
|
||||
);
|
||||
|
||||
const tierDrawerTitle = computed(() =>
|
||||
tierDrawerMode.value === 'edit' ? '编辑梯度' : '添加梯度',
|
||||
@@ -188,6 +203,19 @@ export function useStoreDeliveryPage() {
|
||||
zoneDrawerMode.value === 'edit' ? '编辑区域' : '新增区域',
|
||||
);
|
||||
|
||||
function clearSettings() {
|
||||
deliveryMode.value = DEFAULT_DELIVERY_MODE;
|
||||
editingMode.value = DEFAULT_DELIVERY_MODE;
|
||||
radiusCenterLatitude.value = null;
|
||||
radiusCenterLongitude.value = null;
|
||||
radiusTiers.value = cloneRadiusTiers(DEFAULT_RADIUS_TIERS);
|
||||
polygonZones.value = clonePolygonZones(DEFAULT_POLYGON_ZONES);
|
||||
Object.assign(
|
||||
generalSettings,
|
||||
cloneGeneralSettings(DEFAULT_GENERAL_SETTINGS),
|
||||
);
|
||||
}
|
||||
|
||||
// 5. 数据域动作装配。
|
||||
const {
|
||||
loadStoreSettings,
|
||||
@@ -195,11 +223,14 @@ export function useStoreDeliveryPage() {
|
||||
resetFromSnapshot,
|
||||
saveCurrentSettings,
|
||||
} = createDataActions({
|
||||
clearSettings,
|
||||
editingMode,
|
||||
generalSettings,
|
||||
isConfigured,
|
||||
isSaving,
|
||||
isSettingsLoading,
|
||||
isStoreLoading,
|
||||
loadedStoreId,
|
||||
mode: deliveryMode,
|
||||
radiusCenterLatitude,
|
||||
radiusCenterLongitude,
|
||||
@@ -224,8 +255,8 @@ export function useStoreDeliveryPage() {
|
||||
});
|
||||
|
||||
const {
|
||||
handleDeleteTier,
|
||||
handleTierSubmit,
|
||||
handleDeleteTier: handleDeleteTierLocal,
|
||||
handleTierSubmit: handleTierSubmitLocal,
|
||||
openTierDrawer,
|
||||
setTierColor,
|
||||
setTierDeliveryFee,
|
||||
@@ -245,8 +276,8 @@ export function useStoreDeliveryPage() {
|
||||
});
|
||||
|
||||
const {
|
||||
handleDeleteZone,
|
||||
handleZoneSubmit,
|
||||
handleDeleteZone: handleDeleteZoneLocal,
|
||||
handleZoneSubmit: handleZoneSubmitLocal,
|
||||
openZoneDrawer,
|
||||
setZoneColor,
|
||||
setZoneDeliveryFee,
|
||||
@@ -294,6 +325,7 @@ export function useStoreDeliveryPage() {
|
||||
|
||||
// 切换“当前生效模式”,二次确认后保存,防止误操作。
|
||||
function setDeliveryMode(value: DeliveryMode) {
|
||||
if (!canOperate.value) return;
|
||||
if (value === deliveryMode.value) return;
|
||||
Modal.confirm({
|
||||
title: '确认切换当前启用的配送模式?',
|
||||
@@ -362,22 +394,47 @@ export function useStoreDeliveryPage() {
|
||||
}
|
||||
}
|
||||
|
||||
async function handleTierSubmit() {
|
||||
if (!canOperate.value) return;
|
||||
const changed = handleTierSubmitLocal();
|
||||
if (!changed) return;
|
||||
await saveCurrentSettings();
|
||||
}
|
||||
|
||||
async function handleDeleteTier(tierId: string) {
|
||||
if (!canOperate.value) return;
|
||||
const changed = handleDeleteTierLocal(tierId);
|
||||
if (!changed) return;
|
||||
await saveCurrentSettings();
|
||||
}
|
||||
|
||||
async function handleZoneSubmit() {
|
||||
if (!canOperate.value) return;
|
||||
const changed = handleZoneSubmitLocal();
|
||||
if (!changed) return;
|
||||
await saveCurrentSettings();
|
||||
}
|
||||
|
||||
async function handleDeleteZone(zoneId: string) {
|
||||
if (!canOperate.value) return;
|
||||
const changed = handleDeleteZoneLocal(zoneId);
|
||||
if (!changed) return;
|
||||
await saveCurrentSettings();
|
||||
}
|
||||
|
||||
// 7. 门店切换时自动刷新配置。
|
||||
watch(selectedStoreId, async (storeId) => {
|
||||
if (!storeId) {
|
||||
deliveryMode.value = DEFAULT_DELIVERY_MODE;
|
||||
editingMode.value = DEFAULT_DELIVERY_MODE;
|
||||
radiusCenterLatitude.value = null;
|
||||
radiusCenterLongitude.value = null;
|
||||
radiusTiers.value = cloneRadiusTiers(DEFAULT_RADIUS_TIERS);
|
||||
polygonZones.value = clonePolygonZones(DEFAULT_POLYGON_ZONES);
|
||||
Object.assign(
|
||||
generalSettings,
|
||||
cloneGeneralSettings(DEFAULT_GENERAL_SETTINGS),
|
||||
);
|
||||
loadedStoreId.value = '';
|
||||
isConfigured.value = false;
|
||||
clearSettings();
|
||||
snapshot.value = null;
|
||||
return;
|
||||
}
|
||||
loadedStoreId.value = '';
|
||||
isConfigured.value = false;
|
||||
snapshot.value = null;
|
||||
clearSettings();
|
||||
await loadStoreSettings(storeId);
|
||||
});
|
||||
|
||||
@@ -392,6 +449,7 @@ export function useStoreDeliveryPage() {
|
||||
|
||||
return {
|
||||
DELIVERY_MODE_OPTIONS,
|
||||
canOperate,
|
||||
copyCandidates,
|
||||
copyTargetStoreIds,
|
||||
deliveryMode,
|
||||
@@ -409,6 +467,9 @@ export function useStoreDeliveryPage() {
|
||||
isCopyIndeterminate,
|
||||
isCopyModalOpen,
|
||||
isCopySubmitting,
|
||||
isConfigured,
|
||||
hasLoadedStoreSettings,
|
||||
hasSelectedStore,
|
||||
isPageLoading,
|
||||
isRadiusMode,
|
||||
isSaving,
|
||||
@@ -422,6 +483,7 @@ export function useStoreDeliveryPage() {
|
||||
openCopyModal,
|
||||
openTierDrawer,
|
||||
openZoneDrawer,
|
||||
loadedStoreId,
|
||||
polygonZones,
|
||||
radiusCenterLatitude,
|
||||
radiusCenterLongitude,
|
||||
|
||||
@@ -20,6 +20,7 @@ import { useStoreDeliveryPage } from './composables/useStoreDeliveryPage';
|
||||
|
||||
const {
|
||||
DELIVERY_MODE_OPTIONS,
|
||||
canOperate,
|
||||
copyCandidates,
|
||||
copyTargetStoreIds,
|
||||
deliveryMode,
|
||||
@@ -37,6 +38,8 @@ const {
|
||||
isCopyIndeterminate,
|
||||
isCopyModalOpen,
|
||||
isCopySubmitting,
|
||||
isConfigured,
|
||||
hasLoadedStoreSettings,
|
||||
isPageLoading,
|
||||
isRadiusMode,
|
||||
isSaving,
|
||||
@@ -98,7 +101,9 @@ const {
|
||||
:selected-store-id="selectedStoreId"
|
||||
:store-options="storeOptions"
|
||||
:is-store-loading="isStoreLoading"
|
||||
:copy-disabled="!selectedStoreId || copyCandidates.length === 0"
|
||||
:copy-disabled="
|
||||
!canOperate || !isConfigured || copyCandidates.length === 0
|
||||
"
|
||||
@update:selected-store-id="setSelectedStoreId"
|
||||
@copy="openCopyModal"
|
||||
/>
|
||||
@@ -111,6 +116,12 @@ const {
|
||||
|
||||
<template v-else>
|
||||
<Spin :spinning="isPageLoading">
|
||||
<Card v-if="hasLoadedStoreSettings && !isConfigured" :bordered="false">
|
||||
<Empty
|
||||
description="当前门店尚未配置配送规则。请先填写规则并保存,之后可执行复制。"
|
||||
/>
|
||||
</Card>
|
||||
|
||||
<div class="delivery-cards-stack">
|
||||
<DeliveryModeCard
|
||||
:active-mode="deliveryMode"
|
||||
|
||||
@@ -9,6 +9,7 @@ import type { DineInAreaDto } from '#/api/store-dinein';
|
||||
import { Button, Card, Empty, Popconfirm } from 'ant-design-vue';
|
||||
|
||||
interface Props {
|
||||
canOperate: boolean;
|
||||
getAreaTableCount: (areaId: string) => number;
|
||||
isSaving: boolean;
|
||||
selectedArea?: DineInAreaDto;
|
||||
@@ -32,7 +33,14 @@ const emit = defineEmits<{
|
||||
<span class="section-title">区域管理</span>
|
||||
</template>
|
||||
<template #extra>
|
||||
<Button type="primary" size="small" @click="emit('add')">添加区域</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('add')"
|
||||
>
|
||||
添加区域
|
||||
</Button>
|
||||
</template>
|
||||
|
||||
<template v-if="props.areas.length > 0">
|
||||
@@ -43,6 +51,7 @@ const emit = defineEmits<{
|
||||
type="button"
|
||||
class="dinein-area-pill"
|
||||
:class="{ active: props.selectedAreaId === area.id }"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('selectArea', area.id)"
|
||||
>
|
||||
{{ area.name }} ({{ props.getAreaTableCount(area.id) }}桌)
|
||||
@@ -58,6 +67,7 @@ const emit = defineEmits<{
|
||||
<Button
|
||||
type="link"
|
||||
size="small"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('edit', props.selectedArea)"
|
||||
>
|
||||
编辑
|
||||
@@ -66,9 +76,16 @@ const emit = defineEmits<{
|
||||
title="确认删除该区域吗?"
|
||||
ok-text="确认"
|
||||
cancel-text="取消"
|
||||
:disabled="!props.canOperate"
|
||||
@confirm="emit('delete', props.selectedArea)"
|
||||
>
|
||||
<Button type="link" danger size="small" :loading="props.isSaving">
|
||||
<Button
|
||||
type="link"
|
||||
danger
|
||||
size="small"
|
||||
:disabled="!props.canOperate"
|
||||
:loading="props.isSaving"
|
||||
>
|
||||
删除
|
||||
</Button>
|
||||
</Popconfirm>
|
||||
|
||||
@@ -9,6 +9,7 @@ import type { DineInBasicSettingsDto } from '#/api/store-dinein';
|
||||
import { Button, Card, InputNumber, Switch } from 'ant-design-vue';
|
||||
|
||||
interface Props {
|
||||
canOperate: boolean;
|
||||
isSaving: boolean;
|
||||
onSetDefaultDiningMinutes: (value: number) => void;
|
||||
onSetEnabled: (value: boolean) => void;
|
||||
@@ -40,6 +41,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
<div class="dinein-form-control">
|
||||
<Switch
|
||||
:checked="props.settings.enabled"
|
||||
:disabled="!props.canOperate"
|
||||
@update:checked="(value) => props.onSetEnabled(Boolean(value))"
|
||||
/>
|
||||
</div>
|
||||
@@ -53,6 +55,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:min="1"
|
||||
:precision="0"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="dinein-number-input"
|
||||
@update:value="
|
||||
(value) => props.onSetDefaultDiningMinutes(toNumber(value, 90))
|
||||
@@ -70,6 +73,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:min="0"
|
||||
:precision="0"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="dinein-number-input"
|
||||
@update:value="
|
||||
(value) => props.onSetOvertimeReminderMinutes(toNumber(value, 10))
|
||||
@@ -81,8 +85,18 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
</div>
|
||||
|
||||
<div class="dinein-form-actions">
|
||||
<Button :disabled="props.isSaving" @click="emit('reset')">重置</Button>
|
||||
<Button type="primary" :loading="props.isSaving" @click="emit('save')">
|
||||
<Button
|
||||
:disabled="props.isSaving || !props.canOperate"
|
||||
@click="emit('reset')"
|
||||
>
|
||||
重置
|
||||
</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
:loading="props.isSaving"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('save')"
|
||||
>
|
||||
保存设置
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -10,6 +10,8 @@ import type { DineInStatusOption } from '#/views/store/dine-in/types';
|
||||
import { Button, Card, Empty, Popconfirm, Tag } from 'ant-design-vue';
|
||||
|
||||
interface Props {
|
||||
canOperate: boolean;
|
||||
hasSelectedArea: boolean;
|
||||
isSaving: boolean;
|
||||
resolveStatusClassName: (status: DineInTableDto['status']) => string;
|
||||
statusMap: Record<DineInTableDto['status'], DineInStatusOption>;
|
||||
@@ -34,8 +36,19 @@ const emit = defineEmits<{
|
||||
</template>
|
||||
<template #extra>
|
||||
<div class="dinein-table-header-actions">
|
||||
<Button size="small" @click="emit('batch')">批量生成</Button>
|
||||
<Button type="primary" size="small" @click="emit('add')">
|
||||
<Button
|
||||
size="small"
|
||||
:disabled="!props.canOperate || !props.hasSelectedArea"
|
||||
@click="emit('batch')"
|
||||
>
|
||||
批量生成
|
||||
</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled="!props.canOperate || !props.hasSelectedArea"
|
||||
@click="emit('add')"
|
||||
>
|
||||
添加桌位
|
||||
</Button>
|
||||
</div>
|
||||
@@ -68,19 +81,36 @@ const emit = defineEmits<{
|
||||
</div>
|
||||
|
||||
<div class="dinein-table-footer">
|
||||
<Button size="small" type="text" @click="emit('qrcode', table)">
|
||||
<Button
|
||||
size="small"
|
||||
type="text"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('qrcode', table)"
|
||||
>
|
||||
二维码
|
||||
</Button>
|
||||
<Button size="small" type="text" @click="emit('edit', table)">
|
||||
<Button
|
||||
size="small"
|
||||
type="text"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('edit', table)"
|
||||
>
|
||||
编辑
|
||||
</Button>
|
||||
<Popconfirm
|
||||
title="确认删除该桌位吗?"
|
||||
ok-text="确认"
|
||||
cancel-text="取消"
|
||||
:disabled="!props.canOperate"
|
||||
@confirm="emit('delete', table.id)"
|
||||
>
|
||||
<Button size="small" type="text" danger :loading="props.isSaving">
|
||||
<Button
|
||||
size="small"
|
||||
type="text"
|
||||
danger
|
||||
:disabled="!props.canOperate"
|
||||
:loading="props.isSaving"
|
||||
>
|
||||
删除
|
||||
</Button>
|
||||
</Popconfirm>
|
||||
@@ -89,6 +119,11 @@ const emit = defineEmits<{
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<Empty v-else description="当前区域暂无桌位" />
|
||||
<Empty
|
||||
v-else
|
||||
:description="
|
||||
props.hasSelectedArea ? '当前区域暂无桌位' : '请先添加并选择区域'
|
||||
"
|
||||
/>
|
||||
</Card>
|
||||
</template>
|
||||
|
||||
@@ -15,12 +15,7 @@ import { message } from 'ant-design-vue';
|
||||
|
||||
import { deleteDineInAreaApi, saveDineInAreaApi } from '#/api/store-dinein';
|
||||
|
||||
import {
|
||||
countAreaTables,
|
||||
createDineInId,
|
||||
sortAreas,
|
||||
validateAreaForm,
|
||||
} from './helpers';
|
||||
import { countAreaTables, sortAreas, validateAreaForm } from './helpers';
|
||||
|
||||
interface CreateAreaActionsOptions {
|
||||
areaDrawerMode: Ref<DineInAreaDrawerMode>;
|
||||
@@ -91,30 +86,27 @@ export function createAreaActions(options: CreateAreaActionsOptions) {
|
||||
|
||||
options.isSavingArea.value = true;
|
||||
try {
|
||||
const areaId = options.areaForm.id || createDineInId('area');
|
||||
const areaPayload: DineInAreaDto = {
|
||||
id: areaId,
|
||||
name: options.areaForm.name.trim(),
|
||||
description: options.areaForm.description.trim(),
|
||||
sort: Math.max(1, Math.floor(options.areaForm.sort)),
|
||||
};
|
||||
|
||||
await saveDineInAreaApi({
|
||||
const savedArea = await saveDineInAreaApi({
|
||||
storeId: options.selectedStoreId.value,
|
||||
area: areaPayload,
|
||||
area: {
|
||||
id: options.areaForm.id || undefined,
|
||||
name: options.areaForm.name.trim(),
|
||||
description: options.areaForm.description.trim(),
|
||||
sort: Math.max(1, Math.floor(options.areaForm.sort)),
|
||||
},
|
||||
});
|
||||
|
||||
options.areas.value =
|
||||
options.areaDrawerMode.value === 'edit' && options.areaForm.id
|
||||
? sortAreas(
|
||||
options.areas.value.map((item) =>
|
||||
item.id === options.areaForm.id ? areaPayload : item,
|
||||
item.id === options.areaForm.id ? savedArea : item,
|
||||
),
|
||||
)
|
||||
: sortAreas([...options.areas.value, areaPayload]);
|
||||
: sortAreas([...options.areas.value, savedArea]);
|
||||
|
||||
if (!options.selectedAreaId.value) {
|
||||
options.selectedAreaId.value = areaPayload.id;
|
||||
options.selectedAreaId.value = savedArea.id;
|
||||
}
|
||||
options.fixSelectedArea();
|
||||
options.updateSnapshot();
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
/**
|
||||
* 文件职责:堂食管理页面静态常量。
|
||||
* 1. 维护默认区域、桌位、基础设置。
|
||||
* 2. 提供状态、座位数等选项映射。
|
||||
* 1. 维护状态、座位数、标签建议等固定枚举。
|
||||
* 2. 不包含任何业务数据兜底。
|
||||
*/
|
||||
import type {
|
||||
DineInAreaDto,
|
||||
DineInBasicSettingsDto,
|
||||
DineInEditableStatus,
|
||||
DineInTableDto,
|
||||
DineInTableStatus,
|
||||
} from '#/api/store-dinein';
|
||||
import type {
|
||||
@@ -55,100 +52,6 @@ export const DINE_IN_EDITABLE_STATUS_OPTIONS: Array<{
|
||||
{ label: '停用', value: 'disabled' },
|
||||
];
|
||||
|
||||
export const DEFAULT_DINE_IN_BASIC_SETTINGS: DineInBasicSettingsDto = {
|
||||
enabled: true,
|
||||
defaultDiningMinutes: 90,
|
||||
overtimeReminderMinutes: 10,
|
||||
};
|
||||
|
||||
export const DEFAULT_DINE_IN_AREAS: DineInAreaDto[] = [
|
||||
{
|
||||
id: 'dinein-area-hall',
|
||||
name: '大厅',
|
||||
description: '主要用餐区域,共12张桌位,可容纳约48人同时用餐',
|
||||
sort: 1,
|
||||
},
|
||||
{
|
||||
id: 'dinein-area-private-room',
|
||||
name: '包间',
|
||||
description: '安静独立区域,适合聚餐与商务接待',
|
||||
sort: 2,
|
||||
},
|
||||
{
|
||||
id: 'dinein-area-terrace',
|
||||
name: '露台',
|
||||
description: '开放式外摆区域,适合休闲场景',
|
||||
sort: 3,
|
||||
},
|
||||
];
|
||||
|
||||
export const DEFAULT_DINE_IN_TABLES: DineInTableDto[] = [
|
||||
{
|
||||
id: 'dinein-table-a01',
|
||||
code: 'A01',
|
||||
areaId: 'dinein-area-hall',
|
||||
seats: 4,
|
||||
status: 'free',
|
||||
tags: ['靠窗'],
|
||||
},
|
||||
{
|
||||
id: 'dinein-table-a02',
|
||||
code: 'A02',
|
||||
areaId: 'dinein-area-hall',
|
||||
seats: 2,
|
||||
status: 'dining',
|
||||
tags: [],
|
||||
},
|
||||
{
|
||||
id: 'dinein-table-a03',
|
||||
code: 'A03',
|
||||
areaId: 'dinein-area-hall',
|
||||
seats: 6,
|
||||
status: 'free',
|
||||
tags: ['VIP', '靠窗'],
|
||||
},
|
||||
{
|
||||
id: 'dinein-table-a04',
|
||||
code: 'A04',
|
||||
areaId: 'dinein-area-hall',
|
||||
seats: 4,
|
||||
status: 'reserved',
|
||||
tags: [],
|
||||
},
|
||||
{
|
||||
id: 'dinein-table-a07',
|
||||
code: 'A07',
|
||||
areaId: 'dinein-area-hall',
|
||||
seats: 4,
|
||||
status: 'disabled',
|
||||
tags: [],
|
||||
},
|
||||
{
|
||||
id: 'dinein-table-v01',
|
||||
code: 'V01',
|
||||
areaId: 'dinein-area-private-room',
|
||||
seats: 8,
|
||||
status: 'dining',
|
||||
tags: ['包厢'],
|
||||
},
|
||||
{
|
||||
id: 'dinein-table-v02',
|
||||
code: 'V02',
|
||||
areaId: 'dinein-area-private-room',
|
||||
seats: 6,
|
||||
status: 'free',
|
||||
tags: ['VIP'],
|
||||
},
|
||||
{
|
||||
id: 'dinein-table-t01',
|
||||
code: 'T01',
|
||||
areaId: 'dinein-area-terrace',
|
||||
seats: 4,
|
||||
status: 'free',
|
||||
tags: ['露台'],
|
||||
},
|
||||
];
|
||||
|
||||
export const TABLE_TAG_SUGGESTIONS = [
|
||||
'VIP',
|
||||
'包厢',
|
||||
|
||||
@@ -22,14 +22,7 @@ import {
|
||||
} from '#/api/store-dinein';
|
||||
|
||||
import {
|
||||
DEFAULT_DINE_IN_AREAS,
|
||||
DEFAULT_DINE_IN_BASIC_SETTINGS,
|
||||
DEFAULT_DINE_IN_TABLES,
|
||||
} from './constants';
|
||||
import {
|
||||
cloneAreas,
|
||||
cloneBasicSettings,
|
||||
cloneTables,
|
||||
createSettingsSnapshot,
|
||||
sortAreas,
|
||||
sortTables,
|
||||
@@ -38,9 +31,12 @@ import {
|
||||
interface CreateDataActionsOptions {
|
||||
areas: Ref<DineInAreaDto[]>;
|
||||
basicSettings: DineInBasicSettingsDto;
|
||||
clearSettings: () => void;
|
||||
isConfigured: Ref<boolean>;
|
||||
isPageLoading: Ref<boolean>;
|
||||
isSavingBasic: Ref<boolean>;
|
||||
isStoreLoading: Ref<boolean>;
|
||||
loadedStoreId: Ref<string>;
|
||||
selectedAreaId: Ref<string>;
|
||||
selectedStoreId: Ref<string>;
|
||||
snapshot: Ref<DineInSettingsSnapshot | null>;
|
||||
@@ -57,14 +53,6 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
next.overtimeReminderMinutes;
|
||||
}
|
||||
|
||||
/** 应用默认配置(接口异常兜底)。 */
|
||||
function applyDefaultSettings() {
|
||||
options.areas.value = sortAreas(cloneAreas(DEFAULT_DINE_IN_AREAS));
|
||||
options.tables.value = sortTables(cloneTables(DEFAULT_DINE_IN_TABLES));
|
||||
syncBasicSettings(cloneBasicSettings(DEFAULT_DINE_IN_BASIC_SETTINGS));
|
||||
options.selectedAreaId.value = options.areas.value[0]?.id ?? '';
|
||||
}
|
||||
|
||||
/** 构建当前快照。 */
|
||||
function buildCurrentSnapshot() {
|
||||
return createSettingsSnapshot({
|
||||
@@ -96,27 +84,31 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
const result = await getStoreDineInSettingsApi(storeId);
|
||||
if (options.selectedStoreId.value !== currentStoreId) return;
|
||||
|
||||
options.areas.value = sortAreas(
|
||||
result.areas?.length > 0
|
||||
? result.areas
|
||||
: cloneAreas(DEFAULT_DINE_IN_AREAS),
|
||||
);
|
||||
options.tables.value = sortTables(
|
||||
result.tables?.length > 0
|
||||
? result.tables
|
||||
: cloneTables(DEFAULT_DINE_IN_TABLES),
|
||||
);
|
||||
syncBasicSettings({
|
||||
...DEFAULT_DINE_IN_BASIC_SETTINGS,
|
||||
...result.basicSettings,
|
||||
});
|
||||
if (!result.isConfigured) {
|
||||
options.clearSettings();
|
||||
options.isConfigured.value = false;
|
||||
options.loadedStoreId.value = currentStoreId;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
return;
|
||||
}
|
||||
|
||||
options.areas.value = sortAreas(result.areas ?? []);
|
||||
options.tables.value = sortTables(result.tables ?? []);
|
||||
if (result.basicSettings) {
|
||||
syncBasicSettings(cloneBasicSettings(result.basicSettings));
|
||||
}
|
||||
fixSelectedArea();
|
||||
options.isConfigured.value = true;
|
||||
options.loadedStoreId.value = currentStoreId;
|
||||
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
applyDefaultSettings();
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
options.isConfigured.value = false;
|
||||
options.loadedStoreId.value = '';
|
||||
options.snapshot.value = null;
|
||||
options.clearSettings();
|
||||
message.error('加载堂食设置失败,请稍后重试');
|
||||
} finally {
|
||||
options.isPageLoading.value = false;
|
||||
}
|
||||
@@ -138,7 +130,8 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
|
||||
if (options.stores.value.length === 0) {
|
||||
options.selectedStoreId.value = '';
|
||||
applyDefaultSettings();
|
||||
options.isConfigured.value = false;
|
||||
options.clearSettings();
|
||||
options.snapshot.value = null;
|
||||
return;
|
||||
}
|
||||
@@ -156,9 +149,11 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
message.error('加载门店失败,请稍后重试');
|
||||
options.stores.value = [];
|
||||
options.selectedStoreId.value = '';
|
||||
applyDefaultSettings();
|
||||
options.isConfigured.value = false;
|
||||
options.clearSettings();
|
||||
options.snapshot.value = null;
|
||||
} finally {
|
||||
options.isStoreLoading.value = false;
|
||||
@@ -174,6 +169,7 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
storeId: options.selectedStoreId.value,
|
||||
basicSettings: cloneBasicSettings(options.basicSettings),
|
||||
});
|
||||
options.isConfigured.value = true;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
message.success('堂食设置已保存');
|
||||
} catch (error) {
|
||||
@@ -185,10 +181,11 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
|
||||
/** 重置基础设置到最近快照。 */
|
||||
function resetBasicSettings() {
|
||||
const source =
|
||||
options.snapshot.value?.basicSettings ??
|
||||
cloneBasicSettings(DEFAULT_DINE_IN_BASIC_SETTINGS);
|
||||
syncBasicSettings(source);
|
||||
if (!options.snapshot.value) {
|
||||
message.warning('暂无可恢复的已保存配置');
|
||||
return;
|
||||
}
|
||||
syncBasicSettings(options.snapshot.value.basicSettings);
|
||||
message.success('已恢复到最近一次保存状态');
|
||||
}
|
||||
|
||||
|
||||
@@ -58,11 +58,6 @@ export function sortTables(source: DineInTableDto[]) {
|
||||
return cloneTables(source).toSorted((a, b) => a.code.localeCompare(b.code));
|
||||
}
|
||||
|
||||
/** 生成唯一 ID。 */
|
||||
export function createDineInId(prefix: 'area' | 'table') {
|
||||
return `dinein-${prefix}-${Date.now()}-${Math.floor(Math.random() * 1000)}`;
|
||||
}
|
||||
|
||||
/** 规范化桌位编号(大写 + 去空格)。 */
|
||||
export function normalizeTableCode(code: string) {
|
||||
return code.trim().toUpperCase();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { ComputedRef, Ref } from 'vue';
|
||||
import type { Ref } from 'vue';
|
||||
|
||||
/**
|
||||
* 文件职责:堂食桌位动作。
|
||||
@@ -25,7 +25,6 @@ import {
|
||||
} from '#/api/store-dinein';
|
||||
|
||||
import {
|
||||
createDineInId,
|
||||
generateBatchCodes,
|
||||
normalizeTableCode,
|
||||
sortTables,
|
||||
@@ -36,7 +35,6 @@ import {
|
||||
interface CreateTableActionsOptions {
|
||||
areas: Ref<DineInAreaDto[]>;
|
||||
batchForm: DineInBatchFormState;
|
||||
batchPreviewCodes: ComputedRef<string[]>;
|
||||
isBatchModalOpen: Ref<boolean>;
|
||||
isSavingBatch: Ref<boolean>;
|
||||
isSavingTable: Ref<boolean>;
|
||||
@@ -120,7 +118,6 @@ export function createTableActions(options: CreateTableActionsOptions) {
|
||||
|
||||
options.isSavingTable.value = true;
|
||||
try {
|
||||
const tableId = options.tableForm.id || createDineInId('table');
|
||||
let nextStatus: DineInTableStatus = options.tableForm.sourceStatus;
|
||||
if (options.tableForm.isDisabled) {
|
||||
nextStatus = 'disabled';
|
||||
@@ -128,28 +125,26 @@ export function createTableActions(options: CreateTableActionsOptions) {
|
||||
nextStatus = 'free';
|
||||
}
|
||||
|
||||
const tablePayload: DineInTableDto = {
|
||||
id: tableId,
|
||||
code: normalizeTableCode(options.tableForm.code),
|
||||
areaId: options.tableForm.areaId,
|
||||
seats: options.tableForm.seats,
|
||||
status: nextStatus,
|
||||
tags: [...options.tableForm.tags],
|
||||
};
|
||||
|
||||
await saveDineInTableApi({
|
||||
const savedTable = await saveDineInTableApi({
|
||||
storeId: options.selectedStoreId.value,
|
||||
table: tablePayload,
|
||||
table: {
|
||||
id: options.tableForm.id || undefined,
|
||||
code: normalizeTableCode(options.tableForm.code),
|
||||
areaId: options.tableForm.areaId,
|
||||
seats: options.tableForm.seats,
|
||||
status: nextStatus,
|
||||
tags: [...options.tableForm.tags],
|
||||
},
|
||||
});
|
||||
|
||||
options.tables.value =
|
||||
options.tableDrawerMode.value === 'edit' && options.tableForm.id
|
||||
? sortTables(
|
||||
options.tables.value.map((item) =>
|
||||
item.id === options.tableForm.id ? tablePayload : item,
|
||||
item.id === options.tableForm.id ? savedTable : item,
|
||||
),
|
||||
)
|
||||
: sortTables([...options.tables.value, tablePayload]);
|
||||
: sortTables([...options.tables.value, savedTable]);
|
||||
|
||||
options.updateSnapshot();
|
||||
options.isTableDrawerOpen.value = false;
|
||||
@@ -237,7 +232,7 @@ export function createTableActions(options: CreateTableActionsOptions) {
|
||||
|
||||
options.isSavingBatch.value = true;
|
||||
try {
|
||||
await batchCreateDineInTablesApi({
|
||||
const result = await batchCreateDineInTablesApi({
|
||||
storeId: options.selectedStoreId.value,
|
||||
areaId: options.batchForm.areaId,
|
||||
codePrefix: options.batchForm.codePrefix,
|
||||
@@ -246,15 +241,7 @@ export function createTableActions(options: CreateTableActionsOptions) {
|
||||
seats: options.batchForm.seats,
|
||||
});
|
||||
|
||||
const createdTables: DineInTableDto[] =
|
||||
options.batchPreviewCodes.value.map((code) => ({
|
||||
id: createDineInId('table'),
|
||||
areaId: options.batchForm.areaId,
|
||||
code,
|
||||
seats: options.batchForm.seats,
|
||||
status: 'free',
|
||||
tags: [],
|
||||
}));
|
||||
const createdTables: DineInTableDto[] = result.createdTables ?? [];
|
||||
|
||||
options.tables.value = sortTables([
|
||||
...options.tables.value,
|
||||
|
||||
@@ -23,9 +23,6 @@ import { computed, onActivated, onMounted, reactive, ref, watch } from 'vue';
|
||||
|
||||
import { createAreaActions } from './dinein-page/area-actions';
|
||||
import {
|
||||
DEFAULT_DINE_IN_AREAS,
|
||||
DEFAULT_DINE_IN_BASIC_SETTINGS,
|
||||
DEFAULT_DINE_IN_TABLES,
|
||||
DINE_IN_SEATS_OPTIONS,
|
||||
DINE_IN_STATUS_MAP,
|
||||
TABLE_TAG_SUGGESTIONS,
|
||||
@@ -33,18 +30,19 @@ import {
|
||||
import { createCopyActions } from './dinein-page/copy-actions';
|
||||
import { createDataActions } from './dinein-page/data-actions';
|
||||
import {
|
||||
cloneAreas,
|
||||
cloneBasicSettings,
|
||||
cloneTables,
|
||||
countAreaTables,
|
||||
createSettingsSnapshot,
|
||||
generateBatchCodes,
|
||||
resolveStatusClassName,
|
||||
sortAreas,
|
||||
sortTables,
|
||||
} from './dinein-page/helpers';
|
||||
import { createTableActions } from './dinein-page/table-actions';
|
||||
|
||||
const EMPTY_BASIC_SETTINGS: DineInBasicSettingsDto = {
|
||||
enabled: false,
|
||||
defaultDiningMinutes: 0,
|
||||
overtimeReminderMinutes: 0,
|
||||
};
|
||||
|
||||
export function useStoreDineInPage() {
|
||||
// 1. 页面 loading / submitting 状态。
|
||||
const isStoreLoading = ref(false);
|
||||
@@ -54,27 +52,19 @@ export function useStoreDineInPage() {
|
||||
const isSavingTable = ref(false);
|
||||
const isSavingBatch = ref(false);
|
||||
const isCopySubmitting = ref(false);
|
||||
const isConfigured = ref(false);
|
||||
|
||||
// 2. 页面核心业务数据。
|
||||
const stores = ref<StoreListItemDto[]>([]);
|
||||
const selectedStoreId = ref('');
|
||||
const areas = ref<DineInAreaDto[]>(
|
||||
sortAreas(cloneAreas(DEFAULT_DINE_IN_AREAS)),
|
||||
);
|
||||
const tables = ref<DineInTableDto[]>(
|
||||
sortTables(cloneTables(DEFAULT_DINE_IN_TABLES)),
|
||||
);
|
||||
const loadedStoreId = ref('');
|
||||
const areas = ref<DineInAreaDto[]>([]);
|
||||
const tables = ref<DineInTableDto[]>([]);
|
||||
const basicSettings = reactive<DineInBasicSettingsDto>(
|
||||
cloneBasicSettings(DEFAULT_DINE_IN_BASIC_SETTINGS),
|
||||
);
|
||||
const selectedAreaId = ref(areas.value[0]?.id ?? '');
|
||||
const snapshot = ref<DineInSettingsSnapshot | null>(
|
||||
createSettingsSnapshot({
|
||||
areas: areas.value,
|
||||
tables: tables.value,
|
||||
basicSettings,
|
||||
}),
|
||||
cloneBasicSettings(EMPTY_BASIC_SETTINGS),
|
||||
);
|
||||
const selectedAreaId = ref('');
|
||||
const snapshot = ref<DineInSettingsSnapshot | null>(null);
|
||||
|
||||
// 3. 复制弹窗状态。
|
||||
const isCopyModalOpen = ref(false);
|
||||
@@ -121,6 +111,20 @@ export function useStoreDineInPage() {
|
||||
stores.value.find((store) => store.id === selectedStoreId.value)?.name ??
|
||||
'',
|
||||
);
|
||||
const hasSelectedStore = computed(() => Boolean(selectedStoreId.value));
|
||||
const hasLoadedStoreSettings = computed(() => snapshot.value !== null);
|
||||
const canOperate = computed(
|
||||
() =>
|
||||
hasSelectedStore.value &&
|
||||
loadedStoreId.value === selectedStoreId.value &&
|
||||
hasLoadedStoreSettings.value &&
|
||||
!isStoreLoading.value &&
|
||||
!isPageLoading.value &&
|
||||
!isSavingArea.value &&
|
||||
!isSavingTable.value &&
|
||||
!isSavingBatch.value &&
|
||||
!isSavingBasic.value,
|
||||
);
|
||||
|
||||
const selectedArea = computed(
|
||||
() =>
|
||||
@@ -180,6 +184,18 @@ export function useStoreDineInPage() {
|
||||
tableDrawerMode.value === 'edit' ? '保存修改' : '确认添加',
|
||||
);
|
||||
|
||||
function clearSettings() {
|
||||
loadedStoreId.value = '';
|
||||
areas.value = [];
|
||||
tables.value = [];
|
||||
selectedAreaId.value = '';
|
||||
basicSettings.enabled = EMPTY_BASIC_SETTINGS.enabled;
|
||||
basicSettings.defaultDiningMinutes =
|
||||
EMPTY_BASIC_SETTINGS.defaultDiningMinutes;
|
||||
basicSettings.overtimeReminderMinutes =
|
||||
EMPTY_BASIC_SETTINGS.overtimeReminderMinutes;
|
||||
}
|
||||
|
||||
// 7. 数据域动作装配。
|
||||
const {
|
||||
buildCurrentSnapshot,
|
||||
@@ -191,9 +207,12 @@ export function useStoreDineInPage() {
|
||||
} = createDataActions({
|
||||
areas,
|
||||
basicSettings,
|
||||
clearSettings,
|
||||
isConfigured,
|
||||
isPageLoading,
|
||||
isSavingBasic,
|
||||
isStoreLoading,
|
||||
loadedStoreId,
|
||||
selectedAreaId,
|
||||
selectedStoreId,
|
||||
snapshot,
|
||||
@@ -261,7 +280,6 @@ export function useStoreDineInPage() {
|
||||
} = createTableActions({
|
||||
areas,
|
||||
batchForm,
|
||||
batchPreviewCodes,
|
||||
isBatchModalOpen,
|
||||
isSavingBatch,
|
||||
isSavingTable,
|
||||
@@ -304,17 +322,12 @@ export function useStoreDineInPage() {
|
||||
// 9. 门店切换时自动刷新配置。
|
||||
watch(selectedStoreId, async (storeId) => {
|
||||
if (!storeId) {
|
||||
areas.value = sortAreas(cloneAreas(DEFAULT_DINE_IN_AREAS));
|
||||
tables.value = sortTables(cloneTables(DEFAULT_DINE_IN_TABLES));
|
||||
basicSettings.enabled = DEFAULT_DINE_IN_BASIC_SETTINGS.enabled;
|
||||
basicSettings.defaultDiningMinutes =
|
||||
DEFAULT_DINE_IN_BASIC_SETTINGS.defaultDiningMinutes;
|
||||
basicSettings.overtimeReminderMinutes =
|
||||
DEFAULT_DINE_IN_BASIC_SETTINGS.overtimeReminderMinutes;
|
||||
selectedAreaId.value = areas.value[0]?.id ?? '';
|
||||
clearSettings();
|
||||
isConfigured.value = false;
|
||||
snapshot.value = null;
|
||||
return;
|
||||
}
|
||||
isConfigured.value = false;
|
||||
await loadStoreSettings(storeId);
|
||||
});
|
||||
|
||||
@@ -335,6 +348,7 @@ export function useStoreDineInPage() {
|
||||
basicSettings,
|
||||
batchForm,
|
||||
batchPreviewCodes,
|
||||
canOperate,
|
||||
copyCandidates,
|
||||
copyTargetStoreIds,
|
||||
filteredTables,
|
||||
@@ -351,6 +365,7 @@ export function useStoreDineInPage() {
|
||||
isCopyIndeterminate,
|
||||
isCopyModalOpen,
|
||||
isCopySubmitting,
|
||||
isConfigured,
|
||||
isPageLoading,
|
||||
isSavingArea,
|
||||
isSavingBasic,
|
||||
@@ -368,6 +383,9 @@ export function useStoreDineInPage() {
|
||||
selectedArea,
|
||||
selectedAreaId,
|
||||
selectedAreaTableCount,
|
||||
hasSelectedStore,
|
||||
hasLoadedStoreSettings,
|
||||
loadedStoreId,
|
||||
selectedStoreId,
|
||||
selectedStoreName,
|
||||
setAreaDescription,
|
||||
|
||||
@@ -32,6 +32,7 @@ const {
|
||||
basicSettings,
|
||||
batchForm,
|
||||
batchPreviewCodes,
|
||||
canOperate,
|
||||
copyCandidates,
|
||||
copyTargetStoreIds,
|
||||
filteredTables,
|
||||
@@ -42,12 +43,14 @@ const {
|
||||
handleSubmitArea,
|
||||
handleSubmitBatch,
|
||||
handleSubmitTable,
|
||||
hasLoadedStoreSettings,
|
||||
isAreaDrawerOpen,
|
||||
isBatchModalOpen,
|
||||
isCopyAllChecked,
|
||||
isCopyIndeterminate,
|
||||
isCopyModalOpen,
|
||||
isCopySubmitting,
|
||||
isConfigured,
|
||||
isPageLoading,
|
||||
isSavingArea,
|
||||
isSavingBasic,
|
||||
@@ -125,7 +128,9 @@ function onViewQrCode(tableCode: string) {
|
||||
:selected-store-id="selectedStoreId"
|
||||
:store-options="storeOptions"
|
||||
:is-store-loading="isStoreLoading"
|
||||
:copy-disabled="!selectedStoreId || copyCandidates.length === 0"
|
||||
:copy-disabled="
|
||||
!canOperate || !isConfigured || copyCandidates.length === 0
|
||||
"
|
||||
@update:selected-store-id="setSelectedStoreId"
|
||||
@copy="openCopyModal"
|
||||
/>
|
||||
@@ -138,7 +143,14 @@ function onViewQrCode(tableCode: string) {
|
||||
|
||||
<template v-else>
|
||||
<Spin :spinning="isPageLoading">
|
||||
<Card v-if="hasLoadedStoreSettings && !isConfigured" :bordered="false">
|
||||
<Empty
|
||||
description="当前门店尚未配置堂食规则。请先填写并保存,之后可执行复制。"
|
||||
/>
|
||||
</Card>
|
||||
|
||||
<DineInAreaSection
|
||||
:can-operate="canOperate"
|
||||
:areas="areas"
|
||||
:selected-area-id="selectedAreaId"
|
||||
:selected-area="selectedArea"
|
||||
@@ -151,6 +163,8 @@ function onViewQrCode(tableCode: string) {
|
||||
/>
|
||||
|
||||
<DineInTableGridSection
|
||||
:can-operate="canOperate"
|
||||
:has-selected-area="Boolean(selectedArea)"
|
||||
:tables="filteredTables"
|
||||
:is-saving="isSavingTable"
|
||||
:status-map="DINE_IN_STATUS_MAP"
|
||||
@@ -163,6 +177,7 @@ function onViewQrCode(tableCode: string) {
|
||||
/>
|
||||
|
||||
<DineInBasicSettingsCard
|
||||
:can-operate="canOperate"
|
||||
:settings="basicSettings"
|
||||
:is-saving="isSavingBasic"
|
||||
:on-set-enabled="setDineInEnabled"
|
||||
|
||||
@@ -8,6 +8,7 @@ import { Button, Card, InputNumber } from 'ant-design-vue';
|
||||
|
||||
interface Props {
|
||||
baseDeliveryFee: number;
|
||||
canOperate: boolean;
|
||||
freeDeliveryThreshold: null | number;
|
||||
isSaving: boolean;
|
||||
minimumOrderAmount: number;
|
||||
@@ -46,6 +47,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="1"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="fees-input"
|
||||
placeholder="如:15.00"
|
||||
@update:value="
|
||||
@@ -69,6 +71,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="1"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="fees-input"
|
||||
placeholder="如:3.00"
|
||||
@update:value="
|
||||
@@ -92,6 +95,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="1"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="fees-input"
|
||||
placeholder="如:30.00"
|
||||
@update:value="
|
||||
@@ -109,8 +113,18 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
</div>
|
||||
|
||||
<div class="fees-actions">
|
||||
<Button :disabled="props.isSaving" @click="emit('reset')">重置</Button>
|
||||
<Button type="primary" :loading="props.isSaving" @click="emit('save')">
|
||||
<Button
|
||||
:disabled="props.isSaving || !props.canOperate"
|
||||
@click="emit('reset')"
|
||||
>
|
||||
重置
|
||||
</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
:loading="props.isSaving"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('save')"
|
||||
>
|
||||
保存设置
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
import { Button, Card, InputNumber, Switch } from 'ant-design-vue';
|
||||
|
||||
interface Props {
|
||||
canOperate: boolean;
|
||||
cutleryAmount: number;
|
||||
cutleryEnabled: boolean;
|
||||
isSaving: boolean;
|
||||
@@ -41,6 +42,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
<div class="other-fee-row">
|
||||
<Switch
|
||||
:checked="props.cutleryEnabled"
|
||||
:disabled="!props.canOperate"
|
||||
@update:checked="(value) => props.onSetCutleryEnabled(Boolean(value))"
|
||||
/>
|
||||
<div class="other-fee-meta">
|
||||
@@ -57,7 +59,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="0.5"
|
||||
:controls="false"
|
||||
:disabled="!props.cutleryEnabled"
|
||||
:disabled="!props.cutleryEnabled || !props.canOperate"
|
||||
class="other-fee-input"
|
||||
placeholder="如:1.00"
|
||||
@update:value="
|
||||
@@ -71,6 +73,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
<div class="other-fee-row">
|
||||
<Switch
|
||||
:checked="props.rushEnabled"
|
||||
:disabled="!props.canOperate"
|
||||
@update:checked="(value) => props.onSetRushEnabled(Boolean(value))"
|
||||
/>
|
||||
<div class="other-fee-meta">
|
||||
@@ -85,7 +88,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="0.5"
|
||||
:controls="false"
|
||||
:disabled="!props.rushEnabled"
|
||||
:disabled="!props.rushEnabled || !props.canOperate"
|
||||
class="other-fee-input"
|
||||
placeholder="如:3.00"
|
||||
@update:value="
|
||||
@@ -96,8 +99,18 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
</div>
|
||||
|
||||
<div class="fees-actions">
|
||||
<Button :disabled="props.isSaving" @click="emit('reset')">重置</Button>
|
||||
<Button type="primary" :loading="props.isSaving" @click="emit('save')">
|
||||
<Button
|
||||
:disabled="props.isSaving || !props.canOperate"
|
||||
@click="emit('reset')"
|
||||
>
|
||||
重置
|
||||
</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
:loading="props.isSaving"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('save')"
|
||||
>
|
||||
保存设置
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,7 @@ import type { PackagingFeeTierDto } from '#/api/store-fees';
|
||||
import { Button, Card, InputNumber, Switch } from 'ant-design-vue';
|
||||
|
||||
interface Props {
|
||||
canOperate: boolean;
|
||||
fixedPackagingFee: number;
|
||||
formatCurrency: (value: number) => string;
|
||||
formatTierRange: (tier: PackagingFeeTierDto) => string;
|
||||
@@ -31,11 +32,6 @@ const emit = defineEmits<{
|
||||
(event: 'save'): void;
|
||||
}>();
|
||||
|
||||
const packagingModes: Array<{ label: string; value: 'item' | 'order' }> = [
|
||||
{ label: '按订单收取', value: 'order' },
|
||||
{ label: '按商品收取', value: 'item' },
|
||||
];
|
||||
|
||||
function toNumber(value: null | number | string, fallback = 0) {
|
||||
const parsed = Number(value);
|
||||
return Number.isFinite(parsed) ? parsed : fallback;
|
||||
@@ -48,17 +44,51 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
<span class="section-title">包装费设置</span>
|
||||
</template>
|
||||
|
||||
<div class="packaging-mode-switch">
|
||||
<div class="packaging-mode-toggle-row">
|
||||
<button
|
||||
v-for="mode in packagingModes"
|
||||
:key="mode.value"
|
||||
type="button"
|
||||
class="mode-switch-item"
|
||||
:class="{ active: props.packagingMode === mode.value }"
|
||||
@click="props.onSetPackagingMode(mode.value)"
|
||||
class="mode-toggle-label"
|
||||
:class="{ active: props.packagingMode === 'order' }"
|
||||
:disabled="!props.canOperate"
|
||||
@click="props.onSetPackagingMode('order')"
|
||||
>
|
||||
{{ mode.label }}
|
||||
按订单收取
|
||||
</button>
|
||||
|
||||
<Switch
|
||||
:checked="props.packagingMode === 'item'"
|
||||
:disabled="!props.canOperate"
|
||||
@update:checked="
|
||||
(checked) => props.onSetPackagingMode(checked ? 'item' : 'order')
|
||||
"
|
||||
/>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="mode-toggle-label"
|
||||
:class="{ active: props.packagingMode === 'item' }"
|
||||
:disabled="!props.canOperate"
|
||||
@click="props.onSetPackagingMode('item')"
|
||||
>
|
||||
按商品收取
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="packaging-mode-guide"
|
||||
:class="
|
||||
props.packagingMode === 'item'
|
||||
? 'packaging-mode-guide-item'
|
||||
: 'packaging-mode-guide-order'
|
||||
"
|
||||
>
|
||||
<div class="guide-title">当前生效规则</div>
|
||||
<div v-if="props.packagingMode === 'order'" class="guide-desc">
|
||||
订单将按固定/阶梯包装费计算;商品包装费配置暂不生效。
|
||||
</div>
|
||||
<div v-else class="guide-desc">
|
||||
订单包装费将汇总商品维度配置;本页固定/阶梯包装费暂不生效。
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="props.packagingMode === 'order'">
|
||||
@@ -73,6 +103,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="0.5"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="fees-input"
|
||||
placeholder="如:2.00"
|
||||
@update:value="
|
||||
@@ -91,6 +122,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
<div class="packaging-tier-toggle-row">
|
||||
<Switch
|
||||
:checked="props.tieredEnabled"
|
||||
:disabled="!props.canOperate"
|
||||
@update:checked="
|
||||
(value) => props.onSetTieredEnabled(Boolean(value))
|
||||
"
|
||||
@@ -117,12 +149,15 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
<td>{{ props.formatTierRange(tier) }}</td>
|
||||
<td>{{ props.formatCurrency(tier.fee) }}</td>
|
||||
<td>
|
||||
<a class="fees-table-link" @click="emit('editTier', tier)">
|
||||
<a
|
||||
class="fees-table-link"
|
||||
@click="props.canOperate && emit('editTier', tier)"
|
||||
>
|
||||
编辑
|
||||
</a>
|
||||
<a
|
||||
class="fees-table-link danger"
|
||||
@click="emit('deleteTier', tier)"
|
||||
@click="props.canOperate && emit('deleteTier', tier)"
|
||||
>
|
||||
删除
|
||||
</a>
|
||||
@@ -133,7 +168,9 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
</div>
|
||||
|
||||
<div class="packaging-tier-add-row">
|
||||
<Button @click="emit('addTier')">+ 添加阶梯</Button>
|
||||
<Button :disabled="!props.canOperate" @click="emit('addTier')">
|
||||
+ 添加阶梯
|
||||
</Button>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
@@ -149,8 +186,18 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
</template>
|
||||
|
||||
<div class="fees-actions">
|
||||
<Button :disabled="props.isSaving" @click="emit('reset')">重置</Button>
|
||||
<Button type="primary" :loading="props.isSaving" @click="emit('save')">
|
||||
<Button
|
||||
:disabled="props.isSaving || !props.canOperate"
|
||||
@click="emit('reset')"
|
||||
>
|
||||
重置
|
||||
</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
:loading="props.isSaving"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('save')"
|
||||
>
|
||||
保存设置
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,7 @@ import type { PackagingFeeTierFormState } from '#/views/store/fees/types';
|
||||
import { Button, Drawer, InputNumber } from 'ant-design-vue';
|
||||
|
||||
interface Props {
|
||||
canOperate: boolean;
|
||||
form: PackagingFeeTierFormState;
|
||||
isSaving: boolean;
|
||||
onSetFee: (value: number) => void;
|
||||
@@ -49,6 +50,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="1"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="drawer-input"
|
||||
placeholder="起始金额"
|
||||
@update:value="
|
||||
@@ -63,6 +65,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="1"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="drawer-input"
|
||||
placeholder="结束金额(留空表示无上限)"
|
||||
@update:value="
|
||||
@@ -90,6 +93,7 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
:precision="2"
|
||||
:step="0.5"
|
||||
:controls="false"
|
||||
:disabled="!props.canOperate"
|
||||
class="drawer-input"
|
||||
placeholder="如:2.00"
|
||||
@update:value="
|
||||
@@ -102,12 +106,16 @@ function toNumber(value: null | number | string, fallback = 0) {
|
||||
|
||||
<template #footer>
|
||||
<div class="drawer-footer">
|
||||
<Button :disabled="props.isSaving" @click="emit('update:open', false)">
|
||||
<Button
|
||||
:disabled="props.isSaving || !props.canOperate"
|
||||
@click="emit('update:open', false)"
|
||||
>
|
||||
取消
|
||||
</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
:loading="props.isSaving"
|
||||
:disabled="!props.canOperate"
|
||||
@click="emit('submit')"
|
||||
>
|
||||
{{ props.form.id ? '保存修改' : '新增并保存' }}
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
import type {
|
||||
PackagingFeeMode,
|
||||
PackagingFeeTierDto,
|
||||
StoreFeesSettingsDto,
|
||||
} from '#/api/store-fees';
|
||||
import type { PackagingFeeMode } from '#/api/store-fees';
|
||||
|
||||
/** 文件职责:费用设置页面常量定义。 */
|
||||
|
||||
@@ -15,47 +11,3 @@ export const PACKAGING_MODE_OPTIONS: Array<{
|
||||
{ label: '按订单收取', value: 'order' },
|
||||
{ label: '按商品收取', value: 'item' },
|
||||
];
|
||||
|
||||
export const DEFAULT_PACKAGING_TIERS: PackagingFeeTierDto[] = [
|
||||
{
|
||||
id: 'packaging-tier-1',
|
||||
minAmount: 0,
|
||||
maxAmount: 30,
|
||||
fee: 2,
|
||||
sort: 1,
|
||||
},
|
||||
{
|
||||
id: 'packaging-tier-2',
|
||||
minAmount: 30,
|
||||
maxAmount: 60,
|
||||
fee: 3,
|
||||
sort: 2,
|
||||
},
|
||||
{
|
||||
id: 'packaging-tier-3',
|
||||
minAmount: 60,
|
||||
maxAmount: null,
|
||||
fee: 5,
|
||||
sort: 3,
|
||||
},
|
||||
];
|
||||
|
||||
export const DEFAULT_FEES_SETTINGS: Omit<StoreFeesSettingsDto, 'storeId'> = {
|
||||
minimumOrderAmount: 15,
|
||||
baseDeliveryFee: 3,
|
||||
freeDeliveryThreshold: 30,
|
||||
packagingFeeMode: 'order',
|
||||
orderPackagingFeeMode: 'tiered',
|
||||
fixedPackagingFee: 2,
|
||||
packagingFeeTiers: DEFAULT_PACKAGING_TIERS,
|
||||
otherFees: {
|
||||
cutlery: {
|
||||
enabled: false,
|
||||
amount: 1,
|
||||
},
|
||||
rush: {
|
||||
enabled: false,
|
||||
amount: 3,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -6,7 +6,10 @@ import type { StoreListItemDto } from '#/api/store';
|
||||
* 1. 加载门店列表与门店费用配置。
|
||||
* 2. 保存费用配置并维护快照。
|
||||
*/
|
||||
import type { StoreFeesSettingsDto } from '#/api/store-fees';
|
||||
import type {
|
||||
SaveStoreFeesSettingsParams,
|
||||
StoreFeesSettingsDto,
|
||||
} from '#/api/store-fees';
|
||||
import type {
|
||||
StoreFeesFormState,
|
||||
StoreFeesSettingsSnapshot,
|
||||
@@ -20,7 +23,6 @@ import {
|
||||
saveStoreFeesSettingsApi,
|
||||
} from '#/api/store-fees';
|
||||
|
||||
import { DEFAULT_FEES_SETTINGS, DEFAULT_PACKAGING_TIERS } from './constants';
|
||||
import {
|
||||
cloneOtherFees,
|
||||
cloneTiers,
|
||||
@@ -30,14 +32,28 @@ import {
|
||||
} from './helpers';
|
||||
|
||||
interface CreateDataActionsOptions {
|
||||
clearSettings: () => void;
|
||||
form: StoreFeesFormState;
|
||||
isConfigured: Ref<boolean>;
|
||||
isPageLoading: Ref<boolean>;
|
||||
isStoreLoading: Ref<boolean>;
|
||||
loadedStoreId: Ref<string>;
|
||||
selectedStoreId: Ref<string>;
|
||||
snapshot: Ref<null | StoreFeesSettingsSnapshot>;
|
||||
stores: Ref<StoreListItemDto[]>;
|
||||
}
|
||||
|
||||
const EMPTY_OTHER_FEES = {
|
||||
cutlery: {
|
||||
enabled: false,
|
||||
amount: 0,
|
||||
},
|
||||
rush: {
|
||||
enabled: false,
|
||||
amount: 0,
|
||||
},
|
||||
};
|
||||
|
||||
export function createDataActions(options: CreateDataActionsOptions) {
|
||||
/** 同步页面表单,保持 reactive 引用不变。 */
|
||||
function syncForm(next: StoreFeesFormState) {
|
||||
@@ -64,65 +80,52 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
return createSettingsSnapshot(options.form);
|
||||
}
|
||||
|
||||
/** 应用默认配置。 */
|
||||
function applyDefaultSettings() {
|
||||
syncForm({
|
||||
...DEFAULT_FEES_SETTINGS,
|
||||
packagingFeeTiers: cloneTiers(DEFAULT_PACKAGING_TIERS),
|
||||
otherFees: cloneOtherFees(DEFAULT_FEES_SETTINGS.otherFees),
|
||||
});
|
||||
}
|
||||
|
||||
/** 将接口返回值转为页面表单态。 */
|
||||
function normalizeSettings(
|
||||
source: null | Partial<StoreFeesSettingsDto> | undefined,
|
||||
): StoreFeesFormState {
|
||||
const packagingFeeMode =
|
||||
source?.packagingFeeMode === 'item' ||
|
||||
source?.packagingFeeMode === 'order'
|
||||
? source.packagingFeeMode
|
||||
: 'order';
|
||||
const orderPackagingFeeMode =
|
||||
source?.orderPackagingFeeMode === 'fixed' ||
|
||||
source?.orderPackagingFeeMode === 'tiered'
|
||||
? source.orderPackagingFeeMode
|
||||
: 'fixed';
|
||||
|
||||
const otherFees = cloneOtherFees({
|
||||
cutlery: {
|
||||
enabled: Boolean(source?.otherFees?.cutlery?.enabled),
|
||||
amount: normalizeMoney(source?.otherFees?.cutlery?.amount ?? 0, 0),
|
||||
},
|
||||
rush: {
|
||||
enabled: Boolean(source?.otherFees?.rush?.enabled),
|
||||
amount: normalizeMoney(source?.otherFees?.rush?.amount ?? 0, 0),
|
||||
},
|
||||
});
|
||||
|
||||
return {
|
||||
minimumOrderAmount: normalizeMoney(
|
||||
source?.minimumOrderAmount ?? DEFAULT_FEES_SETTINGS.minimumOrderAmount,
|
||||
DEFAULT_FEES_SETTINGS.minimumOrderAmount,
|
||||
),
|
||||
baseDeliveryFee: normalizeMoney(
|
||||
source?.baseDeliveryFee ?? DEFAULT_FEES_SETTINGS.baseDeliveryFee,
|
||||
DEFAULT_FEES_SETTINGS.baseDeliveryFee,
|
||||
),
|
||||
minimumOrderAmount: normalizeMoney(source?.minimumOrderAmount ?? 0, 0),
|
||||
baseDeliveryFee: normalizeMoney(source?.baseDeliveryFee ?? 0, 0),
|
||||
freeDeliveryThreshold:
|
||||
source?.freeDeliveryThreshold === null ||
|
||||
source?.freeDeliveryThreshold === undefined
|
||||
? null
|
||||
: normalizeMoney(
|
||||
source.freeDeliveryThreshold,
|
||||
DEFAULT_FEES_SETTINGS.freeDeliveryThreshold ?? 0,
|
||||
),
|
||||
packagingFeeMode:
|
||||
source?.packagingFeeMode === 'item' ||
|
||||
source?.packagingFeeMode === 'order'
|
||||
? source.packagingFeeMode
|
||||
: DEFAULT_FEES_SETTINGS.packagingFeeMode,
|
||||
orderPackagingFeeMode:
|
||||
source?.orderPackagingFeeMode === 'fixed' ||
|
||||
source?.orderPackagingFeeMode === 'tiered'
|
||||
? source.orderPackagingFeeMode
|
||||
: DEFAULT_FEES_SETTINGS.orderPackagingFeeMode,
|
||||
fixedPackagingFee: normalizeMoney(
|
||||
source?.fixedPackagingFee ?? DEFAULT_FEES_SETTINGS.fixedPackagingFee,
|
||||
DEFAULT_FEES_SETTINGS.fixedPackagingFee,
|
||||
),
|
||||
packagingFeeTiers: sortTiers(
|
||||
cloneTiers(
|
||||
source?.packagingFeeTiers?.length
|
||||
? source.packagingFeeTiers
|
||||
: DEFAULT_PACKAGING_TIERS,
|
||||
),
|
||||
),
|
||||
otherFees: cloneOtherFees(
|
||||
source?.otherFees ?? DEFAULT_FEES_SETTINGS.otherFees,
|
||||
),
|
||||
: normalizeMoney(source.freeDeliveryThreshold, 0),
|
||||
packagingFeeMode,
|
||||
orderPackagingFeeMode,
|
||||
fixedPackagingFee: normalizeMoney(source?.fixedPackagingFee ?? 0, 0),
|
||||
packagingFeeTiers: sortTiers(cloneTiers(source?.packagingFeeTiers ?? [])),
|
||||
otherFees: source?.otherFees
|
||||
? otherFees
|
||||
: cloneOtherFees(EMPTY_OTHER_FEES),
|
||||
};
|
||||
}
|
||||
|
||||
/** 按当前门店构建保存参数。 */
|
||||
function buildSavePayload(storeId: string): StoreFeesSettingsDto {
|
||||
function buildSavePayload(storeId: string): SaveStoreFeesSettingsParams {
|
||||
return {
|
||||
storeId,
|
||||
minimumOrderAmount: options.form.minimumOrderAmount,
|
||||
@@ -144,12 +147,25 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
const result = await getStoreFeesSettingsApi(storeId);
|
||||
if (options.selectedStoreId.value !== currentStoreId) return;
|
||||
|
||||
if (!result.isConfigured) {
|
||||
options.clearSettings();
|
||||
options.isConfigured.value = false;
|
||||
options.loadedStoreId.value = currentStoreId;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
return;
|
||||
}
|
||||
|
||||
syncForm(normalizeSettings(result));
|
||||
options.isConfigured.value = true;
|
||||
options.loadedStoreId.value = currentStoreId;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
applyDefaultSettings();
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
options.isConfigured.value = false;
|
||||
options.loadedStoreId.value = '';
|
||||
options.snapshot.value = null;
|
||||
options.clearSettings();
|
||||
message.error('加载费用设置失败,请稍后重试');
|
||||
} finally {
|
||||
options.isPageLoading.value = false;
|
||||
}
|
||||
@@ -171,8 +187,9 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
|
||||
if (options.stores.value.length === 0) {
|
||||
options.selectedStoreId.value = '';
|
||||
options.isConfigured.value = false;
|
||||
options.snapshot.value = null;
|
||||
applyDefaultSettings();
|
||||
options.clearSettings();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -189,10 +206,12 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
message.error('加载门店失败,请稍后重试');
|
||||
options.stores.value = [];
|
||||
options.selectedStoreId.value = '';
|
||||
options.isConfigured.value = false;
|
||||
options.snapshot.value = null;
|
||||
applyDefaultSettings();
|
||||
options.clearSettings();
|
||||
} finally {
|
||||
options.isStoreLoading.value = false;
|
||||
}
|
||||
@@ -205,6 +224,7 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
const payload = buildSavePayload(options.selectedStoreId.value);
|
||||
const result = await saveStoreFeesSettingsApi(payload);
|
||||
syncForm(normalizeSettings(result ?? payload));
|
||||
options.isConfigured.value = true;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
message.success(successText);
|
||||
return true;
|
||||
@@ -218,7 +238,7 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
/** 重置到最近一次快照。 */
|
||||
function resetFromSnapshot() {
|
||||
if (!options.snapshot.value) {
|
||||
applyDefaultSettings();
|
||||
message.warning('暂无可恢复的已保存配置');
|
||||
return;
|
||||
}
|
||||
syncForm(options.snapshot.value);
|
||||
|
||||
@@ -9,7 +9,6 @@ import type {
|
||||
|
||||
import { message } from 'ant-design-vue';
|
||||
|
||||
import { DEFAULT_PACKAGING_TIERS } from './constants';
|
||||
import {
|
||||
cloneTiers,
|
||||
createTierId,
|
||||
@@ -51,7 +50,7 @@ export function createPackagingActions(options: CreatePackagingActionsOptions) {
|
||||
options.tierForm.id = '';
|
||||
options.tierForm.minAmount = defaultMin;
|
||||
options.tierForm.maxAmount = null;
|
||||
options.tierForm.fee = normalizeMoney(lastTier?.fee ?? 2, 2);
|
||||
options.tierForm.fee = normalizeMoney(lastTier?.fee ?? 0, 0);
|
||||
options.isTierDrawerOpen.value = true;
|
||||
}
|
||||
|
||||
@@ -96,9 +95,6 @@ export function createPackagingActions(options: CreatePackagingActionsOptions) {
|
||||
/** 切换是否启用阶梯包装费。 */
|
||||
function toggleTiered(checked: boolean) {
|
||||
options.form.orderPackagingFeeMode = checked ? 'tiered' : 'fixed';
|
||||
if (checked && options.form.packagingFeeTiers.length === 0) {
|
||||
options.form.packagingFeeTiers = cloneTiers(DEFAULT_PACKAGING_TIERS);
|
||||
}
|
||||
}
|
||||
|
||||
/** 删除阶梯。 */
|
||||
|
||||
@@ -15,12 +15,9 @@ import type {
|
||||
|
||||
import { computed, onActivated, onMounted, reactive, ref, watch } from 'vue';
|
||||
|
||||
import { message } from 'ant-design-vue';
|
||||
import { message, Modal } from 'ant-design-vue';
|
||||
|
||||
import {
|
||||
DEFAULT_FEES_SETTINGS,
|
||||
PACKAGING_MODE_OPTIONS,
|
||||
} from './fees-page/constants';
|
||||
import { PACKAGING_MODE_OPTIONS } from './fees-page/constants';
|
||||
import { createCopyActions } from './fees-page/copy-actions';
|
||||
import { createDataActions } from './fees-page/data-actions';
|
||||
import {
|
||||
@@ -33,6 +30,28 @@ import {
|
||||
} from './fees-page/helpers';
|
||||
import { createPackagingActions } from './fees-page/packaging-actions';
|
||||
|
||||
const EMPTY_FEES_SETTINGS: StoreFeesFormState = {
|
||||
minimumOrderAmount: 0,
|
||||
baseDeliveryFee: 0,
|
||||
freeDeliveryThreshold: null,
|
||||
packagingFeeMode: 'order',
|
||||
orderPackagingFeeMode: 'fixed',
|
||||
fixedPackagingFee: 0,
|
||||
packagingFeeTiers: [],
|
||||
otherFees: {
|
||||
cutlery: {
|
||||
enabled: false,
|
||||
amount: 0,
|
||||
},
|
||||
rush: {
|
||||
enabled: false,
|
||||
amount: 0,
|
||||
},
|
||||
},
|
||||
};
|
||||
const PACKAGING_MODE_SWITCH_CONFIRM_KEY =
|
||||
'store-fees-packaging-mode-switch-confirmed';
|
||||
|
||||
export function useStoreFeesPage() {
|
||||
// 1. 页面 loading / submitting 状态。
|
||||
const isStoreLoading = ref(false);
|
||||
@@ -41,13 +60,13 @@ export function useStoreFeesPage() {
|
||||
const isSavingPackaging = ref(false);
|
||||
const isSavingOther = ref(false);
|
||||
const isCopySubmitting = ref(false);
|
||||
const isConfigured = ref(false);
|
||||
|
||||
// 2. 页面核心业务数据。
|
||||
const stores = ref<StoreListItemDto[]>([]);
|
||||
const selectedStoreId = ref('');
|
||||
const form = reactive<StoreFeesFormState>(
|
||||
cloneFeesForm(DEFAULT_FEES_SETTINGS),
|
||||
);
|
||||
const loadedStoreId = ref('');
|
||||
const form = reactive<StoreFeesFormState>(cloneFeesForm(EMPTY_FEES_SETTINGS));
|
||||
const snapshot = ref<null | StoreFeesSettingsSnapshot>(null);
|
||||
|
||||
// 3. 复制弹窗状态。
|
||||
@@ -61,7 +80,7 @@ export function useStoreFeesPage() {
|
||||
id: '',
|
||||
minAmount: 0,
|
||||
maxAmount: null,
|
||||
fee: 2,
|
||||
fee: 0,
|
||||
});
|
||||
|
||||
// 5. 页面衍生视图数据。
|
||||
@@ -74,6 +93,19 @@ export function useStoreFeesPage() {
|
||||
stores.value.find((store) => store.id === selectedStoreId.value)?.name ??
|
||||
'',
|
||||
);
|
||||
const hasSelectedStore = computed(() => Boolean(selectedStoreId.value));
|
||||
const hasLoadedStoreSettings = computed(() => snapshot.value !== null);
|
||||
const canOperate = computed(
|
||||
() =>
|
||||
hasSelectedStore.value &&
|
||||
loadedStoreId.value === selectedStoreId.value &&
|
||||
hasLoadedStoreSettings.value &&
|
||||
!isStoreLoading.value &&
|
||||
!isPageLoading.value &&
|
||||
!isSavingDelivery.value &&
|
||||
!isSavingPackaging.value &&
|
||||
!isSavingOther.value,
|
||||
);
|
||||
|
||||
const copyCandidates = computed(() =>
|
||||
stores.value.filter((store) => store.id !== selectedStoreId.value),
|
||||
@@ -97,6 +129,37 @@ export function useStoreFeesPage() {
|
||||
|
||||
const isOrderMode = computed(() => form.packagingFeeMode === 'order');
|
||||
|
||||
function hasConfirmedPackagingModeSwitch() {
|
||||
try {
|
||||
return (
|
||||
window.localStorage.getItem(PACKAGING_MODE_SWITCH_CONFIRM_KEY) === '1'
|
||||
);
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function markPackagingModeSwitchConfirmed() {
|
||||
try {
|
||||
window.localStorage.setItem(PACKAGING_MODE_SWITCH_CONFIRM_KEY, '1');
|
||||
} catch {
|
||||
// 忽略本地存储异常,不影响当前切换。
|
||||
}
|
||||
}
|
||||
|
||||
function getPackagingModeConfirmContent(value: PackagingFeeMode) {
|
||||
if (value === 'order') {
|
||||
return '切换后订单将按本页固定/阶梯包装费计算,商品包装费配置将暂不生效。';
|
||||
}
|
||||
return '切换后订单包装费将汇总商品维度配置,本页固定/阶梯包装费将暂不生效。';
|
||||
}
|
||||
|
||||
function clearSettings() {
|
||||
loadedStoreId.value = '';
|
||||
Object.assign(form, cloneFeesForm(EMPTY_FEES_SETTINGS));
|
||||
isTierDrawerOpen.value = false;
|
||||
}
|
||||
|
||||
// 6. 动作装配。
|
||||
const {
|
||||
loadStoreSettings,
|
||||
@@ -104,9 +167,12 @@ export function useStoreFeesPage() {
|
||||
resetFromSnapshot,
|
||||
saveCurrentSettings,
|
||||
} = createDataActions({
|
||||
clearSettings,
|
||||
form,
|
||||
isConfigured,
|
||||
isPageLoading,
|
||||
isStoreLoading,
|
||||
loadedStoreId,
|
||||
selectedStoreId,
|
||||
snapshot,
|
||||
stores,
|
||||
@@ -169,7 +235,25 @@ export function useStoreFeesPage() {
|
||||
}
|
||||
|
||||
function setPackagingMode(value: PackagingFeeMode) {
|
||||
setPackagingFeeMode(value);
|
||||
if (!canOperate.value) return;
|
||||
if (value === form.packagingFeeMode) return;
|
||||
|
||||
const applyMode = () => setPackagingFeeMode(value);
|
||||
if (hasConfirmedPackagingModeSwitch()) {
|
||||
applyMode();
|
||||
return;
|
||||
}
|
||||
|
||||
Modal.confirm({
|
||||
title: '确认切换包装费收取方式?',
|
||||
content: getPackagingModeConfirmContent(value),
|
||||
okText: '确认切换',
|
||||
cancelText: '取消',
|
||||
onOk() {
|
||||
applyMode();
|
||||
markPackagingModeSwitchConfirmed();
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function setCutleryEnabled(value: boolean) {
|
||||
@@ -196,7 +280,11 @@ export function useStoreFeesPage() {
|
||||
|
||||
/** 重置“起送与配送费”分区。 */
|
||||
function resetDeliverySection() {
|
||||
const source = snapshot.value ?? cloneFeesForm(DEFAULT_FEES_SETTINGS);
|
||||
if (!snapshot.value) {
|
||||
message.warning('暂无可恢复的已保存配置');
|
||||
return;
|
||||
}
|
||||
const source = snapshot.value;
|
||||
form.minimumOrderAmount = source.minimumOrderAmount;
|
||||
form.baseDeliveryFee = source.baseDeliveryFee;
|
||||
form.freeDeliveryThreshold = source.freeDeliveryThreshold;
|
||||
@@ -205,7 +293,11 @@ export function useStoreFeesPage() {
|
||||
|
||||
/** 重置“包装费设置”分区。 */
|
||||
function resetPackagingSection() {
|
||||
const source = snapshot.value ?? cloneFeesForm(DEFAULT_FEES_SETTINGS);
|
||||
if (!snapshot.value) {
|
||||
message.warning('暂无可恢复的已保存配置');
|
||||
return;
|
||||
}
|
||||
const source = snapshot.value;
|
||||
form.packagingFeeMode = source.packagingFeeMode;
|
||||
form.orderPackagingFeeMode = source.orderPackagingFeeMode;
|
||||
form.fixedPackagingFee = source.fixedPackagingFee;
|
||||
@@ -215,14 +307,18 @@ export function useStoreFeesPage() {
|
||||
|
||||
/** 重置“其他费用”分区。 */
|
||||
function resetOtherSection() {
|
||||
const source = snapshot.value ?? cloneFeesForm(DEFAULT_FEES_SETTINGS);
|
||||
if (!snapshot.value) {
|
||||
message.warning('暂无可恢复的已保存配置');
|
||||
return;
|
||||
}
|
||||
const source = snapshot.value;
|
||||
form.otherFees = cloneOtherFees(source.otherFees);
|
||||
message.success('已重置其他费用');
|
||||
}
|
||||
|
||||
/** 保存“起送与配送费”分区。 */
|
||||
async function saveDeliverySection() {
|
||||
if (!selectedStoreId.value) return;
|
||||
if (!canOperate.value) return;
|
||||
isSavingDelivery.value = true;
|
||||
try {
|
||||
await saveCurrentSettings('起送与配送费已保存');
|
||||
@@ -233,7 +329,7 @@ export function useStoreFeesPage() {
|
||||
|
||||
/** 保存“包装费设置”分区。 */
|
||||
async function savePackagingSection() {
|
||||
if (!selectedStoreId.value) return;
|
||||
if (!canOperate.value) return;
|
||||
if (!validateCurrentPackaging()) return;
|
||||
isSavingPackaging.value = true;
|
||||
try {
|
||||
@@ -245,7 +341,7 @@ export function useStoreFeesPage() {
|
||||
|
||||
/** 保存“其他费用”分区。 */
|
||||
async function saveOtherSection() {
|
||||
if (!selectedStoreId.value) return;
|
||||
if (!canOperate.value) return;
|
||||
isSavingOther.value = true;
|
||||
try {
|
||||
await saveCurrentSettings('其他费用已保存');
|
||||
@@ -274,11 +370,14 @@ export function useStoreFeesPage() {
|
||||
/** 切换门店时同步拉取配置。 */
|
||||
watch(selectedStoreId, async (storeId) => {
|
||||
if (!storeId) {
|
||||
Object.assign(form, cloneFeesForm(DEFAULT_FEES_SETTINGS));
|
||||
clearSettings();
|
||||
isConfigured.value = false;
|
||||
snapshot.value = null;
|
||||
isTierDrawerOpen.value = false;
|
||||
return;
|
||||
}
|
||||
loadedStoreId.value = '';
|
||||
isConfigured.value = false;
|
||||
isTierDrawerOpen.value = false;
|
||||
await loadStoreSettings(storeId);
|
||||
});
|
||||
|
||||
@@ -291,6 +390,7 @@ export function useStoreFeesPage() {
|
||||
PACKAGING_MODE_OPTIONS,
|
||||
copyCandidates,
|
||||
copyTargetStoreIds,
|
||||
canOperate,
|
||||
form,
|
||||
formatCurrency,
|
||||
formatTierRange,
|
||||
@@ -301,6 +401,7 @@ export function useStoreFeesPage() {
|
||||
isCopyIndeterminate,
|
||||
isCopyModalOpen,
|
||||
isCopySubmitting,
|
||||
isConfigured,
|
||||
isOrderMode,
|
||||
isPageLoading,
|
||||
isSavingDelivery,
|
||||
@@ -308,6 +409,7 @@ export function useStoreFeesPage() {
|
||||
isSavingPackaging,
|
||||
isStoreLoading,
|
||||
isTierDrawerOpen,
|
||||
loadedStoreId,
|
||||
onDeleteTier,
|
||||
openCopyModal,
|
||||
openTierDrawer,
|
||||
@@ -318,6 +420,8 @@ export function useStoreFeesPage() {
|
||||
saveDeliverySection,
|
||||
saveOtherSection,
|
||||
savePackagingSection,
|
||||
hasLoadedStoreSettings,
|
||||
hasSelectedStore,
|
||||
selectedStoreId,
|
||||
selectedStoreName,
|
||||
setBaseDeliveryFee,
|
||||
|
||||
@@ -19,6 +19,7 @@ import FeesTierDrawer from './components/FeesTierDrawer.vue';
|
||||
import { useStoreFeesPage } from './composables/useStoreFeesPage';
|
||||
|
||||
const {
|
||||
canOperate,
|
||||
copyCandidates,
|
||||
copyTargetStoreIds,
|
||||
form,
|
||||
@@ -27,10 +28,12 @@ const {
|
||||
handleCopyCheckAll,
|
||||
handleCopySubmit,
|
||||
handleSubmitTier,
|
||||
hasLoadedStoreSettings,
|
||||
isCopyAllChecked,
|
||||
isCopyIndeterminate,
|
||||
isCopyModalOpen,
|
||||
isCopySubmitting,
|
||||
isConfigured,
|
||||
isPageLoading,
|
||||
isSavingDelivery,
|
||||
isSavingOther,
|
||||
@@ -81,7 +84,9 @@ function onEditTier(tier: PackagingFeeTierDto) {
|
||||
:selected-store-id="selectedStoreId"
|
||||
:store-options="storeOptions"
|
||||
:is-store-loading="isStoreLoading"
|
||||
:copy-disabled="!selectedStoreId || copyCandidates.length === 0"
|
||||
:copy-disabled="
|
||||
!canOperate || !isConfigured || copyCandidates.length === 0
|
||||
"
|
||||
copy-button-text="复制费用设置到其他门店"
|
||||
@update:selected-store-id="setSelectedStoreId"
|
||||
@copy="openCopyModal"
|
||||
@@ -95,7 +100,14 @@ function onEditTier(tier: PackagingFeeTierDto) {
|
||||
|
||||
<template v-else>
|
||||
<Spin :spinning="isPageLoading">
|
||||
<Card v-if="hasLoadedStoreSettings && !isConfigured" :bordered="false">
|
||||
<Empty
|
||||
description="当前门店尚未配置费用规则。请先填写并保存,之后可执行复制。"
|
||||
/>
|
||||
</Card>
|
||||
|
||||
<FeesDeliveryCard
|
||||
:can-operate="canOperate"
|
||||
:minimum-order-amount="form.minimumOrderAmount"
|
||||
:base-delivery-fee="form.baseDeliveryFee"
|
||||
:free-delivery-threshold="form.freeDeliveryThreshold"
|
||||
@@ -108,6 +120,7 @@ function onEditTier(tier: PackagingFeeTierDto) {
|
||||
/>
|
||||
|
||||
<FeesPackagingCard
|
||||
:can-operate="canOperate"
|
||||
:packaging-mode="form.packagingFeeMode"
|
||||
:tiered-enabled="form.orderPackagingFeeMode === 'tiered'"
|
||||
:fixed-packaging-fee="form.fixedPackagingFee"
|
||||
@@ -126,6 +139,7 @@ function onEditTier(tier: PackagingFeeTierDto) {
|
||||
/>
|
||||
|
||||
<FeesOtherCard
|
||||
:can-operate="canOperate"
|
||||
:cutlery-enabled="form.otherFees.cutlery.enabled"
|
||||
:cutlery-amount="form.otherFees.cutlery.amount"
|
||||
:rush-enabled="form.otherFees.rush.enabled"
|
||||
@@ -142,6 +156,7 @@ function onEditTier(tier: PackagingFeeTierDto) {
|
||||
</template>
|
||||
|
||||
<FeesTierDrawer
|
||||
:can-operate="canOperate"
|
||||
:open="isTierDrawerOpen"
|
||||
:title="tierDrawerTitle"
|
||||
:form="tierForm"
|
||||
|
||||
@@ -1,30 +1,58 @@
|
||||
/* 文件职责:包装费卡片样式。 */
|
||||
.page-store-fees {
|
||||
.packaging-mode-switch {
|
||||
.packaging-mode-toggle-row {
|
||||
display: inline-flex;
|
||||
gap: 2px;
|
||||
padding: 3px;
|
||||
margin-bottom: 16px;
|
||||
background: #f8f9fb;
|
||||
border-radius: 8px;
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.mode-switch-item {
|
||||
padding: 6px 18px;
|
||||
.mode-toggle-label {
|
||||
padding: 0;
|
||||
font-size: 13px;
|
||||
color: #4b5563;
|
||||
cursor: pointer;
|
||||
background: transparent;
|
||||
border: none;
|
||||
border-radius: 6px;
|
||||
transition: all 0.2s ease;
|
||||
transition: color 0.2s ease;
|
||||
}
|
||||
|
||||
.mode-switch-item.active {
|
||||
.mode-toggle-label.active {
|
||||
font-weight: 600;
|
||||
color: #1677ff;
|
||||
background: #fff;
|
||||
box-shadow: 0 1px 3px rgb(15 23 42 / 10%);
|
||||
}
|
||||
|
||||
.mode-toggle-label:disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.packaging-mode-guide {
|
||||
padding: 10px 12px;
|
||||
margin-bottom: 16px;
|
||||
border: 1px solid #dbeafe;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.packaging-mode-guide-order {
|
||||
background: #f5f9ff;
|
||||
}
|
||||
|
||||
.packaging-mode-guide-item {
|
||||
background: #f6ffed;
|
||||
border-color: #ccebd2;
|
||||
}
|
||||
|
||||
.packaging-mode-guide .guide-title {
|
||||
margin-bottom: 4px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: #1f2937;
|
||||
}
|
||||
|
||||
.packaging-mode-guide .guide-desc {
|
||||
font-size: 12px;
|
||||
color: #4b5563;
|
||||
}
|
||||
|
||||
.packaging-tier-block {
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.packaging-mode-switch {
|
||||
.packaging-mode-toggle-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mode-switch-item {
|
||||
flex: 1;
|
||||
.mode-toggle-label {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,16 +43,16 @@ export const FINE_INTERVAL_OPTIONS: Array<{ label: string; value: number }> = [
|
||||
];
|
||||
|
||||
export const DEFAULT_PICKUP_BASIC_SETTINGS: PickupBasicSettingsDto = {
|
||||
allowSameDayPickup: true,
|
||||
bookingDays: 3,
|
||||
maxItemsPerOrder: 20,
|
||||
allowSameDayPickup: false,
|
||||
bookingDays: 1,
|
||||
maxItemsPerOrder: null,
|
||||
};
|
||||
|
||||
export const DEFAULT_FINE_RULE: PickupFineRuleDto = {
|
||||
intervalMinutes: 30,
|
||||
slotCapacity: 5,
|
||||
dayStartTime: '09:00',
|
||||
dayEndTime: '20:30',
|
||||
minAdvanceHours: 2,
|
||||
dayOfWeeks: [...ALL_WEEK_DAYS],
|
||||
slotCapacity: 1,
|
||||
dayStartTime: '',
|
||||
dayEndTime: '',
|
||||
minAdvanceHours: 0,
|
||||
dayOfWeeks: [],
|
||||
};
|
||||
|
||||
@@ -42,12 +42,15 @@ import {
|
||||
interface CreateDataActionsOptions {
|
||||
basicSettings: PickupBasicSettingsDto;
|
||||
bigSlots: Ref<PickupSlotDto[]>;
|
||||
clearSettings: () => void;
|
||||
fineRule: PickupFineRuleDto;
|
||||
isConfigured: Ref<boolean>;
|
||||
isPageLoading: Ref<boolean>;
|
||||
isSavingBasic: Ref<boolean>;
|
||||
isSavingFineRule: Ref<boolean>;
|
||||
isSavingSlots: Ref<boolean>;
|
||||
isStoreLoading: Ref<boolean>;
|
||||
loadedStoreId: Ref<string>;
|
||||
mode: Ref<PickupMode>;
|
||||
previewDays: Ref<PickupPreviewDayDto[]>;
|
||||
selectedStoreId: Ref<string>;
|
||||
@@ -84,15 +87,6 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
});
|
||||
}
|
||||
|
||||
/** 应用默认配置(接口异常兜底)。 */
|
||||
function applyDefaultSettings() {
|
||||
options.mode.value = DEFAULT_PICKUP_MODE;
|
||||
syncBasicSettings(cloneBasicSettings(DEFAULT_PICKUP_BASIC_SETTINGS));
|
||||
options.bigSlots.value = [];
|
||||
syncFineRule(cloneFineRule(DEFAULT_FINE_RULE));
|
||||
options.previewDays.value = [];
|
||||
}
|
||||
|
||||
/** 应用快照到当前页面状态。 */
|
||||
function applySnapshot(snapshot: PickupSettingsSnapshot) {
|
||||
options.mode.value = snapshot.mode;
|
||||
@@ -110,28 +104,43 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
const result = await getStorePickupSettingsApi(storeId);
|
||||
if (options.selectedStoreId.value !== currentStoreId) return;
|
||||
|
||||
if (!result.isConfigured) {
|
||||
options.clearSettings();
|
||||
options.isConfigured.value = false;
|
||||
options.loadedStoreId.value = currentStoreId;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
return;
|
||||
}
|
||||
|
||||
options.mode.value = result.mode ?? DEFAULT_PICKUP_MODE;
|
||||
syncBasicSettings({
|
||||
...DEFAULT_PICKUP_BASIC_SETTINGS,
|
||||
...result.basicSettings,
|
||||
});
|
||||
syncBasicSettings(
|
||||
result.basicSettings
|
||||
? cloneBasicSettings(result.basicSettings)
|
||||
: cloneBasicSettings(DEFAULT_PICKUP_BASIC_SETTINGS),
|
||||
);
|
||||
options.bigSlots.value = sortSlots(
|
||||
result.bigSlots?.length ? result.bigSlots : [],
|
||||
);
|
||||
syncFineRule({
|
||||
...DEFAULT_FINE_RULE,
|
||||
...result.fineRule,
|
||||
});
|
||||
syncFineRule(
|
||||
result.fineRule
|
||||
? cloneFineRule(result.fineRule)
|
||||
: cloneFineRule(DEFAULT_FINE_RULE),
|
||||
);
|
||||
options.previewDays.value =
|
||||
result.previewDays?.length > 0
|
||||
? clonePreviewDays(result.previewDays)
|
||||
: [];
|
||||
|
||||
options.isConfigured.value = true;
|
||||
options.loadedStoreId.value = currentStoreId;
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
applyDefaultSettings();
|
||||
options.snapshot.value = buildCurrentSnapshot();
|
||||
options.clearSettings();
|
||||
options.isConfigured.value = false;
|
||||
options.loadedStoreId.value = '';
|
||||
options.snapshot.value = null;
|
||||
message.error('加载自提设置失败,请稍后重试');
|
||||
} finally {
|
||||
options.isPageLoading.value = false;
|
||||
}
|
||||
@@ -153,8 +162,10 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
|
||||
if (options.stores.value.length === 0) {
|
||||
options.selectedStoreId.value = '';
|
||||
options.loadedStoreId.value = '';
|
||||
options.isConfigured.value = false;
|
||||
options.snapshot.value = null;
|
||||
applyDefaultSettings();
|
||||
options.clearSettings();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -173,8 +184,11 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
console.error(error);
|
||||
options.stores.value = [];
|
||||
options.selectedStoreId.value = '';
|
||||
options.loadedStoreId.value = '';
|
||||
options.isConfigured.value = false;
|
||||
options.snapshot.value = null;
|
||||
applyDefaultSettings();
|
||||
options.clearSettings();
|
||||
message.error('加载门店失败,请稍后重试');
|
||||
} finally {
|
||||
options.isStoreLoading.value = false;
|
||||
}
|
||||
@@ -243,7 +257,7 @@ export function createDataActions(options: CreateDataActionsOptions) {
|
||||
/** 重置到最近一次快照。 */
|
||||
function resetFromSnapshot() {
|
||||
if (!options.snapshot.value) {
|
||||
applyDefaultSettings();
|
||||
options.clearSettings();
|
||||
return;
|
||||
}
|
||||
applySnapshot(options.snapshot.value);
|
||||
|
||||
@@ -48,6 +48,8 @@ export function useStorePickupPage() {
|
||||
const isSavingSlots = ref(false);
|
||||
const isSavingFineRule = ref(false);
|
||||
const isCopySubmitting = ref(false);
|
||||
const isConfigured = ref(false);
|
||||
const loadedStoreId = ref('');
|
||||
|
||||
// 2. 页面核心业务数据。
|
||||
const stores = ref<StoreListItemDto[]>([]);
|
||||
@@ -119,6 +121,34 @@ export function useStorePickupPage() {
|
||||
? `编辑时段 - ${slotForm.name}`
|
||||
: '添加时段',
|
||||
);
|
||||
const hasSelectedStore = computed(() => Boolean(selectedStoreId.value));
|
||||
const hasLoadedStoreSettings = computed(
|
||||
() =>
|
||||
loadedStoreId.value === selectedStoreId.value && snapshot.value !== null,
|
||||
);
|
||||
const canOperate = computed(
|
||||
() =>
|
||||
hasSelectedStore.value &&
|
||||
loadedStoreId.value === selectedStoreId.value &&
|
||||
!isStoreLoading.value &&
|
||||
!isPageLoading.value &&
|
||||
!isSavingBasic.value &&
|
||||
!isSavingSlots.value &&
|
||||
!isSavingFineRule.value,
|
||||
);
|
||||
|
||||
function clearSettings() {
|
||||
pickupMode.value = DEFAULT_PICKUP_MODE;
|
||||
basicSettings.allowSameDayPickup =
|
||||
DEFAULT_PICKUP_BASIC_SETTINGS.allowSameDayPickup;
|
||||
basicSettings.bookingDays = DEFAULT_PICKUP_BASIC_SETTINGS.bookingDays;
|
||||
basicSettings.maxItemsPerOrder =
|
||||
DEFAULT_PICKUP_BASIC_SETTINGS.maxItemsPerOrder;
|
||||
bigSlots.value = [];
|
||||
Object.assign(fineRule, cloneFineRule(DEFAULT_FINE_RULE));
|
||||
previewDays.value = [];
|
||||
selectedPreviewDate.value = '';
|
||||
}
|
||||
|
||||
// 6. 数据域动作装配。
|
||||
const {
|
||||
@@ -131,12 +161,15 @@ export function useStorePickupPage() {
|
||||
} = createDataActions({
|
||||
basicSettings,
|
||||
bigSlots,
|
||||
clearSettings,
|
||||
fineRule,
|
||||
isConfigured,
|
||||
isPageLoading,
|
||||
isSavingBasic,
|
||||
isSavingFineRule,
|
||||
isSavingSlots,
|
||||
isStoreLoading,
|
||||
loadedStoreId,
|
||||
mode: pickupMode,
|
||||
previewDays,
|
||||
selectedStoreId,
|
||||
@@ -204,6 +237,7 @@ export function useStorePickupPage() {
|
||||
}
|
||||
|
||||
function setPickupMode(value: 'big' | 'fine') {
|
||||
if (!canOperate.value) return;
|
||||
pickupMode.value = value;
|
||||
}
|
||||
|
||||
@@ -255,19 +289,16 @@ export function useStorePickupPage() {
|
||||
// 8. 门店切换时自动刷新配置。
|
||||
watch(selectedStoreId, async (storeId) => {
|
||||
if (!storeId) {
|
||||
pickupMode.value = DEFAULT_PICKUP_MODE;
|
||||
basicSettings.allowSameDayPickup =
|
||||
DEFAULT_PICKUP_BASIC_SETTINGS.allowSameDayPickup;
|
||||
basicSettings.bookingDays = DEFAULT_PICKUP_BASIC_SETTINGS.bookingDays;
|
||||
basicSettings.maxItemsPerOrder =
|
||||
DEFAULT_PICKUP_BASIC_SETTINGS.maxItemsPerOrder;
|
||||
bigSlots.value = [];
|
||||
Object.assign(fineRule, cloneFineRule(DEFAULT_FINE_RULE));
|
||||
previewDays.value = [];
|
||||
selectedPreviewDate.value = previewDays.value[0]?.date ?? '';
|
||||
loadedStoreId.value = '';
|
||||
isConfigured.value = false;
|
||||
clearSettings();
|
||||
snapshot.value = null;
|
||||
return;
|
||||
}
|
||||
loadedStoreId.value = '';
|
||||
isConfigured.value = false;
|
||||
snapshot.value = null;
|
||||
clearSettings();
|
||||
await loadStoreSettings(storeId);
|
||||
selectedPreviewDate.value = previewDays.value[0]?.date ?? '';
|
||||
});
|
||||
@@ -297,6 +328,7 @@ export function useStorePickupPage() {
|
||||
WEEKDAY_OPTIONS,
|
||||
basicSettings,
|
||||
bigSlots,
|
||||
canOperate,
|
||||
calcReservedPercent,
|
||||
copyCandidates,
|
||||
copyTargetStoreIds,
|
||||
@@ -312,6 +344,9 @@ export function useStorePickupPage() {
|
||||
isCopyIndeterminate,
|
||||
isCopyModalOpen,
|
||||
isCopySubmitting,
|
||||
isConfigured,
|
||||
hasLoadedStoreSettings,
|
||||
hasSelectedStore,
|
||||
isFineDaySelected,
|
||||
isPageLoading,
|
||||
isSavingBasic,
|
||||
@@ -322,6 +357,7 @@ export function useStorePickupPage() {
|
||||
isStoreLoading,
|
||||
openCopyModal,
|
||||
openSlotDrawer,
|
||||
loadedStoreId,
|
||||
pickupMode,
|
||||
previewDays,
|
||||
quickSelectFineDays,
|
||||
|
||||
@@ -24,6 +24,7 @@ const {
|
||||
WEEKDAY_OPTIONS,
|
||||
basicSettings,
|
||||
bigSlots,
|
||||
canOperate,
|
||||
calcReservedPercent,
|
||||
copyCandidates,
|
||||
copyTargetStoreIds,
|
||||
@@ -39,6 +40,8 @@ const {
|
||||
isCopyIndeterminate,
|
||||
isCopyModalOpen,
|
||||
isCopySubmitting,
|
||||
isConfigured,
|
||||
hasLoadedStoreSettings,
|
||||
isFineDaySelected,
|
||||
isPageLoading,
|
||||
isSavingBasic,
|
||||
@@ -92,7 +95,9 @@ const {
|
||||
:selected-store-id="selectedStoreId"
|
||||
:store-options="storeOptions"
|
||||
:is-store-loading="isStoreLoading"
|
||||
:copy-disabled="!selectedStoreId || copyCandidates.length === 0"
|
||||
:copy-disabled="
|
||||
!canOperate || !isConfigured || copyCandidates.length === 0
|
||||
"
|
||||
@update:selected-store-id="setSelectedStoreId"
|
||||
@copy="openCopyModal"
|
||||
/>
|
||||
@@ -105,6 +110,12 @@ const {
|
||||
|
||||
<template v-else>
|
||||
<Spin :spinning="isPageLoading">
|
||||
<Card v-if="hasLoadedStoreSettings && !isConfigured" :bordered="false">
|
||||
<Empty
|
||||
description="当前门店尚未配置自提规则。请先完成配置并保存,之后可执行复制。"
|
||||
/>
|
||||
</Card>
|
||||
|
||||
<PickupBasicSettingsCard
|
||||
:settings="basicSettings"
|
||||
:is-saving="isSavingBasic"
|
||||
|
||||
@@ -83,6 +83,30 @@ export function resolveShiftTimeByType(
|
||||
};
|
||||
}
|
||||
|
||||
/** 按班次类型构建单日排班(总是使用模板时间)。 */
|
||||
export function buildDayShiftByType(payload: {
|
||||
dayOfWeek: number;
|
||||
shiftType: ShiftType;
|
||||
templates: StoreShiftTemplatesDto;
|
||||
}): StaffDayShiftDto {
|
||||
if (payload.shiftType === 'off') {
|
||||
return {
|
||||
dayOfWeek: payload.dayOfWeek,
|
||||
shiftType: 'off',
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
};
|
||||
}
|
||||
|
||||
const template = payload.templates[payload.shiftType];
|
||||
return {
|
||||
dayOfWeek: payload.dayOfWeek,
|
||||
shiftType: payload.shiftType,
|
||||
startTime: template.startTime,
|
||||
endTime: template.endTime,
|
||||
};
|
||||
}
|
||||
|
||||
/** 归一化单日排班。 */
|
||||
export function normalizeDayShift(payload: {
|
||||
dayOfWeek: number;
|
||||
@@ -171,16 +195,9 @@ export function updateWeekRowShift(payload: {
|
||||
row: WeekEditorRow;
|
||||
templates: StoreShiftTemplatesDto;
|
||||
}) {
|
||||
const currentShift = payload.row.shifts.find(
|
||||
(item) => item.dayOfWeek === payload.dayOfWeek,
|
||||
);
|
||||
const nextShift = normalizeDayShift({
|
||||
const nextShift = buildDayShiftByType({
|
||||
dayOfWeek: payload.dayOfWeek,
|
||||
shift: {
|
||||
dayOfWeek: payload.dayOfWeek,
|
||||
shiftType: payload.nextShiftType,
|
||||
},
|
||||
fallback: currentShift,
|
||||
shiftType: payload.nextShiftType,
|
||||
templates: payload.templates,
|
||||
});
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ import {
|
||||
|
||||
import { SHIFT_CYCLE } from './constants';
|
||||
import {
|
||||
buildDayShiftByType,
|
||||
buildWeekEditorRows,
|
||||
cloneScheduleMap,
|
||||
cloneShifts,
|
||||
@@ -74,16 +75,9 @@ export function createScheduleActions(options: CreateScheduleActionsOptions) {
|
||||
|
||||
/** 更新个人排班班次类型。 */
|
||||
function setPersonalShiftType(dayOfWeek: number, shiftType: ShiftType) {
|
||||
const currentShift = options.personalForm.shifts.find(
|
||||
(item) => item.dayOfWeek === dayOfWeek,
|
||||
);
|
||||
const nextShift = normalizeDayShift({
|
||||
const nextShift = buildDayShiftByType({
|
||||
dayOfWeek,
|
||||
shift: {
|
||||
dayOfWeek,
|
||||
shiftType,
|
||||
},
|
||||
fallback: currentShift,
|
||||
shiftType,
|
||||
templates: options.templates.value,
|
||||
});
|
||||
upsertPersonalShift(dayOfWeek, nextShift);
|
||||
|
||||
@@ -39,11 +39,19 @@
|
||||
color: #667085;
|
||||
background: #fafafa;
|
||||
}
|
||||
|
||||
th:first-child {
|
||||
width: 140px;
|
||||
padding-left: 16px;
|
||||
text-align: left;
|
||||
}
|
||||
}
|
||||
|
||||
.schedule-staff-cell,
|
||||
.staff-week-name-cell {
|
||||
min-width: 96px;
|
||||
width: 140px;
|
||||
min-width: 140px;
|
||||
padding-left: 16px !important;
|
||||
text-align: left !important;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user