add store auto closed day

src/pages/store/StoreBusinessDayCalendar.vue

@@ -15,6 +15,7 @@
 			</div>
 		</header>
 		<div class="calendar-card">
+			<card-title description="设置门店休息日，该日无任何登记记录不视为中断连续登记事件" />
 			<t-calendar
 				:key="calendarRenderKey"
 				class="calendar"
@@ -39,19 +40,19 @@
 			</div>
 			<t-form label-align="left">
 				<t-form-item label="状态">
-					<t-radio-group v-model="formModel.openStatus" variant="default-filled">
+					<t-radio-group v-model="formModel.status" variant="default-filled">
 						<t-radio :block="false" borderless value="OPEN">营业</t-radio>
 						<t-radio :block="false" borderless value="CLOSED">休息</t-radio>
 					</t-radio-group>
 				</t-form-item>
 				<t-form-item
 					class="reason"
-					:class="{ 'is-hidden': formModel.openStatus !== 'CLOSED' }"
+					:class="{ 'is-hidden': formModel.status !== 'CLOSED' }"
 					label="原因"
 				>
 					<t-input
 						v-model.trim="formModel.reason"
-						:disabled="formModel.openStatus !== 'CLOSED'"
+						:disabled="formModel.status !== 'CLOSED'"
 						placeholder="休息原因或备注"
 						borderless
 					/>
@@ -84,7 +85,7 @@
 import { DialogPlugin, Toast, type CalendarProps, type TDate } from "tdesign-mobile-vue";
 import { useUserStore } from "timi-web";
 import StoreAPI from "@/api/StoreAPI";
-import type { Store, StoreBusinessDay, StoreBusinessDayOpenStatus } from "@/types/Store";
+import type { Store, StoreBusinessDay, StoreBusinessDayStatus } from "@/types/Store";
 import { gaoRoleCodes, permissionCodes } from "@/utils/permission";
 
 defineOptions({
@@ -130,8 +131,8 @@ const calendarFormat = computed<NonNullable<CalendarProps["format"]>>(() => {
 		}
 		return {
 			...dateItem,
-			className: `business-day-${day.openStatus!.toLowerCase()}`,
+			className: `business-day-${day.status!.toLowerCase()}`,
-			suffix: day.openStatus === "OPEN" ? "营" : "休"
+			suffix: day.status === "OPEN" ? "营" : "休"
 		};
 	};
 });
@@ -176,7 +177,7 @@ const isDeleting = ref(false);
 const editingId = ref("");
 const formModel = reactive({
 	dateText: "",
-	openStatus: "OPEN" as StoreBusinessDayOpenStatus,
+	status: "OPEN" as StoreBusinessDayStatus,
 	reason: "正常休息"
 });
 const savePermissionCode = computed(() => {
@@ -192,7 +193,7 @@ function openDayEditor(day?: StoreBusinessDay, dateValue = toDateValue(new Date(
 	editingId.value = day?.id || "";
 	Object.assign(formModel, {
 		dateText: formatDateValue(day?.dateValue || dateValue),
-		openStatus: day?.openStatus || "OPEN",
+		status: day?.status || "OPEN",
 		reason: day ? day.reason : "正常休息"
 	});
 	editorVisible.value = true;
@@ -215,8 +216,8 @@ async function saveDay(): Promise<void> {
 			id: editingId.value || undefined,
 			storeId: storeId.value,
 			dateValue: parseDateValue(formModel.dateText),
-			openStatus: formModel.openStatus,
+			status: formModel.status,
-			reason: formModel.openStatus === "CLOSED" ? formModel.reason || undefined : undefined
+			reason: formModel.status === "CLOSED" ? formModel.reason || undefined : undefined
 		};
 		if (editingId.value) {
 			await StoreAPI.updateBusinessDay(day);
@@ -317,10 +318,11 @@ onMounted(async () => {
 .store-business-day-calendar {
 	gap: .75rem;
 	display: grid;
-	padding: calc(var(--app-nav-height) + 1rem) 1rem 6rem;
+	padding: calc(var(--app-nav-height) + 1rem) 0 6rem;
 
 	.summary {
 		gap: .75rem;
+		margin: 0 1rem;
 		display: flex;
 		padding: .75rem;
 		border-radius: .75rem;
@@ -350,6 +352,7 @@ onMounted(async () => {
 		}
 
 		:deep(.t-calendar) {
+			margin: 0 1rem;
 			z-index: 1;
 			overflow: hidden;
 			border-radius: .75rem;

src/pages/store/StoreEdit.vue

@@ -2,26 +2,39 @@
 	<div v-can="savePermissionCode" class="store-edit">
 		<t-form class="form" label-align="left">
 			<t-form-item v-if="!isStoreManagerScope" label="编码">
-				<t-input v-model.trim="formModel.code" placeholder="门店编码" borderless />
+				<t-input v-model.trim="formData.code" placeholder="门店编码" borderless />
 			</t-form-item>
 			<t-form-item label="名称">
-				<t-input v-model.trim="formModel.name" placeholder="门店名称" borderless />
+				<t-input v-model.trim="formData.name" placeholder="门店名称" borderless />
 			</t-form-item>
 			<t-form-item v-if="!isStoreManagerScope" label="启用" content-align="right">
-				<t-switch v-model="formModel.status" :custom-value="['ACTIVE', 'INACTIVE']" />
+				<t-switch v-model="formData.status" :custom-value="['ACTIVE', 'INACTIVE']" />
 			</t-form-item>
 			<t-form-item label="电话">
-				<t-input v-model.trim="formModel.telephone" type="tel" placeholder="联系电话" borderless />
+				<t-input v-model.trim="formData.telephone" type="tel" placeholder="联系电话" borderless />
 			</t-form-item>
 			<t-form-item label="地址">
-				<t-input v-model.trim="formModel.address" placeholder="门店地址" borderless />
+				<t-input v-model.trim="formData.address" placeholder="门店地址" borderless />
 			</t-form-item>
 			<t-form-item label="备注">
-				<t-textarea v-model.trim="formModel.remark" class="textarea" placeholder="备注" autosize borderless />
+				<t-textarea v-model.trim="formData.remark" class="textarea" placeholder="备注" autosize borderless />
 			</t-form-item>
 		</t-form>
 		<t-cell-group v-if="!isCreateMode" theme="card">
-			<t-cell title="营业日管理" note="配置营业或休息日期" arrow hover @click="router.push(`/management/stores/${routeId}/business-days`)" />
+			<t-cell
+				title="营业日管理"
+				note="配置营业或休息日期"
+				arrow
+				@click="router.push(`/management/stores/${routeId}/business-days`)"
+			/>
+			<t-cell
+				title="自动休息日"
+				description="全天无任何登记记录时自动判定为休息日，休息日不视为中断连续登记事件"
+			>
+				<template #right-icon>
+					<t-switch v-model="formData.autoClosedDay" />
+				</template>
+			</t-cell>
 		</t-cell-group>
 		<div class="actions">
 			<t-button
@@ -36,7 +49,7 @@
 				class="action"
 				theme="primary"
 				:loading="isSaving"
-				@click="saveStore"
+				@click="doSave"
 			>保存</t-button>
 		</div>
 	</div>
@@ -46,7 +59,8 @@
 import { DialogPlugin, Toast } from "tdesign-mobile-vue";
 import { useUserStore } from "timi-web";
 import StoreAPI from "@/api/StoreAPI";
-import type { Store, StoreStatus } from "@/types/Store";
+import { useCurrentStoreStore } from "@/store/currentStoreStore";
+import type { StoreStatus } from "@/types/Store";
 import { gaoRoleCodes, permissionCodes } from "@/utils/permission";
 
 defineOptions({
@@ -56,6 +70,7 @@ defineOptions({
 const route = useRoute();
 const router = useRouter();
 const userStore = useUserStore();
+const currentStoreStore = useCurrentStoreStore();
 const routeId = computed(() => String(route.params.id || ""));
 const isStoreManagerScope = computed(() => userStore.hasRoles(gaoRoleCodes.storeManager) && !userStore.hasRoles(gaoRoleCodes.globalManager));
 
@@ -68,105 +83,81 @@ const savePermissionCode = computed(() => isCreateMode.value ? permissionCodes.s
 
 const isSaving = ref(false);
 const isRemoving = ref(false);
-const formModel = reactive({
+const formData = reactive({
 	id: "",
 	code: "",
 	name: "",
 	status: "ACTIVE" as StoreStatus,
 	telephone: "",
 	address: "",
-	remark: ""
+	remark: "",
+	autoClosedDay: true
 });
-const sortValue = ref(0);
 
-// ---------- 页面数据 ----------
+async function doSave(): Promise<void> {
-
-async function fillForm(): Promise<void> {
-	if (!routeId.value) {
-		return;
-	}
-
-	const current = await StoreAPI.detail(routeId.value);
-	Object.assign(formModel, {
-		id: current.id || "",
-		code: current.code || "",
-		name: current.name || "",
-		status: current.status || "ACTIVE",
-		telephone: current.telephone || "",
-		address: current.address || "",
-		remark: current.remark || ""
-	});
-	sortValue.value = current.sort ?? 0;
-}
-
-// ---------- 保存 ----------
-
-async function saveStore(): Promise<void> {
 	if (!validateForm()) {
 		return;
 	}
-
 	isSaving.value = true;
 	try {
-		const store = buildStorePayload();
 		if (isCreateMode.value) {
-			await StoreAPI.create(store);
+			await StoreAPI.create(formData);
 		} else {
-			await StoreAPI.update(store);
+			await StoreAPI.update(formData);
+			await refreshCurrentStore();
 		}
 		Toast.success("门店已保存");
-		if (isStoreManagerScope.value) {
+		if (userStore.hasPermissions(permissionCodes.store.create)) {
-			return;
-		}
 			await router.replace("/management/stores");
+		} else {
+			await router.replace("/store");
+		}
 	} finally {
 		isSaving.value = false;
 	}
 }
 
-function buildStorePayload(): Store {
+async function refreshCurrentStore(): Promise<void> {
-	if (isStoreManagerScope.value) {
+	if (formData.id !== currentStoreStore.currentStoreId) {
-		return {
+		return;
-			id: formModel.id || undefined,
-			name: formModel.name,
-			telephone: formModel.telephone || undefined,
-			address: formModel.address || undefined,
-			remark: formModel.remark || undefined
-		};
 	}
 
-	return {
+	await currentStoreStore.refreshCurrentStore(formData.id);
-		id: formModel.id || undefined,
-		code: formModel.code,
-		name: formModel.name,
-		status: formModel.status,
-		telephone: formModel.telephone || undefined,
-		address: formModel.address || undefined,
-		remark: formModel.remark || undefined,
-		sort: sortValue.value
-	};
 }
 
 function validateForm(): boolean {
-	if (!isStoreManagerScope.value && !formModel.code) {
+	if (!isStoreManagerScope.value && !formData.code) {
 		Toast.warning("请填写门店编码");
 		return false;
 	}
-	if (!formModel.name) {
+	if (!formData.name) {
 		Toast.warning("请填写门店名称");
 		return false;
 	}
 	return true;
 }
 
-async function confirmRemoveStore(): Promise<void> {
+onMounted(async () => {
-	if (!formModel.id) {
+	try {
+		if (!routeId.value) {
 			return;
 		}
+		const current = await StoreAPI.detail(routeId.value);
+		Object.assign(formData, current);
+	} catch {
+		Toast.error("门店数据加载失败");
+	}
+});
 
+// ---------- 删除 ----------
+
+async function confirmRemoveStore(): Promise<void> {
+	if (!formData.id) {
+		return;
+	}
 	const dialog = DialogPlugin.confirm({
 		title: "删除门店",
-		content: `确定删除 ${formModel.name} 吗？删除后无法恢复。`,
+		content: `确定删除 ${formData.name} 吗？删除后无法恢复。`,
 		cancelBtn: "取消",
 		confirmBtn: "删除",
 		onCancel() {
@@ -186,21 +177,13 @@ async function removeStore(): Promise<void> {
 
 	isRemoving.value = true;
 	try {
-		await StoreAPI.remove(formModel.id);
+		await StoreAPI.remove(formData.id);
 		Toast.success("门店已删除");
 		await router.replace("/management/stores");
 	} finally {
 		isRemoving.value = false;
 	}
 }
-
-onMounted(async () => {
-	try {
-		await fillForm();
-	} catch {
-		Toast.error("门店数据加载失败");
-	}
-});
 </script>
 
 <style scoped lang="less">

src/pages/tabs/SettingTab.vue

@@ -43,7 +43,6 @@
 			</t-cell>
 		</t-cell-group>
 		<footer class="footer">
-			<p>版本 1.0.0</p>
 			<p>技术支持：夜雨</p>
 			<p>Copyright © 2026 imyeyu.com</p>
 		</footer>

src/store/currentStoreStore.ts

@@ -101,6 +101,21 @@ export const useCurrentStoreStore = defineStore("currentStore", () => {
 		}
 	}
 
+	async function refreshCurrentStore(storeId = currentStoreId.value): Promise<void> {
+		if (!storeId || storeId !== currentStoreId.value) {
+			return;
+		}
+
+		const result = await StoreAPI.detail(storeId);
+		const index = storeList.value.findIndex(item => item.id === storeId);
+		if (-1 < index) {
+			storeList.value.splice(index, 1, result);
+		}
+		if (loginStore.value?.id === storeId) {
+			loginStore.value = result;
+		}
+	}
+
 	function selectStore(storeId: string): void {
 		if (!storeId) {
 			return;
@@ -133,6 +148,7 @@ export const useCurrentStoreStore = defineStore("currentStore", () => {
 		loadStoreList,
 		loadLoginStore,
 		loadAfterLogin,
+		refreshCurrentStore,
 		selectStore
 	};
 });

src/types/Store.ts

@@ -1,7 +1,7 @@
 import type { BasePage, Model } from "timi-web";
 
 export type StoreStatus = "ACTIVE" | "INACTIVE" | "DELETED";
-export type StoreBusinessDayOpenStatus = "OPEN" | "CLOSED";
+export type StoreBusinessDayStatus = "OPEN" | "CLOSED";
 
 export type Store = {
 	code?: string;
@@ -10,13 +10,14 @@ export type Store = {
 	telephone?: string;
 	address?: string;
 	remark?: string;
+	autoClosedDay?: boolean;
 	sort?: number;
 } & Model;
 
 export type StoreBusinessDay = {
 	storeId?: string;
 	dateValue?: number;
-	openStatus?: StoreBusinessDayOpenStatus;
+	status?: StoreBusinessDayStatus;
 	businessDayNo?: number;
 	reason?: string;
 } & Model;

src/utils/store.ts

@@ -1,4 +1,4 @@
-import type { StoreBusinessDayOpenStatus, StoreStatus } from "@/types/Store";
+import type { StoreBusinessDayStatus, StoreStatus } from "@/types/Store";
 import { permissionCodes } from "@/utils/permission";
 import { type Page, useUserStore } from "timi-web";
 
@@ -85,15 +85,15 @@ export function getStoreStatusTheme(status?: StoreStatus): "success" | "warning"
 	return "default";
 }
 
-export function getBusinessDayStatusText(status?: StoreBusinessDayOpenStatus): string {
+export function getBusinessDayStatusText(status?: StoreBusinessDayStatus): string {
-	const map: Record<StoreBusinessDayOpenStatus, string> = {
+	const map: Record<StoreBusinessDayStatus, string> = {
 		OPEN: "营业",
 		CLOSED: "休息"
 	};
 	return status ? map[status] : "未配置";
 }
 
-export function getBusinessDayStatusTheme(status?: StoreBusinessDayOpenStatus): "success" | "warning" | "default" {
+export function getBusinessDayStatusTheme(status?: StoreBusinessDayStatus): "success" | "warning" | "default" {
 	if (status === "OPEN") {
 		return "success";
 	}