update permission and product

2026-09-04 23:07:59 +08:00
parent 1df5748f54
commit fc9e6a5023
48 changed files with 1670 additions and 2475 deletions
@@ -50,19 +50,18 @@
 				class="event-selector"
 				:event-list="eventList"
 				:disabled="isEditMode"
-				:selection-mode="isPackagePurchaseSelected ? 'single' : 'multiple'"
+				selection-mode="multiple"
 				required-mark
 				@update:model-value="handleEventSelectionChange"
 			/>
 			<event-option-selector
-				v-if="!isPackagePurchaseSelected"
 				class="option-selector"
 				v-model="selectedOptionSelectionMap"
 				:event-list="eventList"
 				:selected-event-id-list="selectedEventIdList"
 				:disabled="isSaving"
 			/>
-			<div v-if="!isEditMode && !isPackagePurchaseSelected && selectedNumberEventList.length" class="event-value-list">
+			<div v-if="!isEditMode && selectedNumberEventList.length" class="event-value-list">
 				<t-form-item
 					v-for="item in selectedNumberEventList"
 					:key="item.id"
@@ -79,25 +78,6 @@
 					/>
 				</t-form-item>
 			</div>
-			<package-purchase-form
-				v-if="isPackagePurchaseSelected"
-				v-model:item-list="packagePurchaseItemList"
-				v-model:sale-amount="saleAmountText"
-				:can-price-override="canPriceOverride"
-				:package-config="selectedPackageConfig"
-			/>
-			<t-form-item v-if="showSourceValueInput" label="积分动作">
-				<span class="picker-text" v-text="getPointActionText(sourceValueAction)" />
-			</t-form-item>
-			<t-form-item v-if="showSourceValueInput" label="积分数量" required-mark>
-				<t-input
-					v-model.trim="pointValueText"
-					type="number"
-					align="right"
-					borderless
-					:placeholder="sourceValuePlaceholder"
-				/>
-			</t-form-item>
 			<t-form-item v-if="!isEditMode" label="登记时间" content-align="right">
 				<div class="time-actions">
 					<t-button
@@ -120,7 +100,7 @@
 			<t-form-item v-else label="登记时间" content-align="right">
 				<span class="readonly-time" v-text="registeredAtText || '此刻'" />
 			</t-form-item>
-			<t-form-item :label="isPackagePurchaseSelected ? '购买备注' : '登记备注'">
+			<t-form-item label="登记备注">
 				<t-textarea
 					v-model.trim="note"
 					class="textarea"
@@ -166,7 +146,7 @@
 			v-if="!isEditMode"
 			v-model="selectedCustomerIdList"
 			v-model:visible="selectorVisible"
-			:selection-mode="isEditMode || isPackagePurchaseSelected ? 'single' : 'multiple'"
+			:selection-mode="isEditMode ? 'single' : 'multiple'"
 			@change="handleCustomerChange"
 		/>
 		<t-popup v-model="selectedCustomerListVisible" placement="bottom">
@@ -222,21 +202,17 @@ import CustomerSelector from "@/components/CustomerSelector.vue";
 import EventOptionSelector from "@/components/EventOptionSelector.vue";
 import PhotoScroller from "@/components/PhotoScroller.vue";
 import EventSelector from "@/components/EventSelector.vue";
-import PackagePurchaseForm from "@/pages/event/component/PackagePurchaseForm.vue";
 import { useEventRecordPhoto } from "@/pages/event/component/useEventRecordPhoto";
-import { usePackagePurchaseRecord } from "@/pages/event/component/usePackagePurchaseRecord";
 import { useNavBarStore } from "@/store/navBarStore";
 import { useSettingStore } from "@/store/settingStore";
 import type { Customer } from "@/types/Customer";
 import type { EventItem, EventOptionSelectionMap } from "@/types/EventItem";
 import type { EventRecord } from "@/types/EventRecord";
-import type { PointAction } from "@/types/Point";
-import { isPackagePurchaseEvent } from "@/utils/event";
+import { isRetiredEvent } from "@/utils/event";
 import { buildEventOptionSelectionMap, resolveSelectedOptionGroupList, validateEventOptionSelection } from "@/utils/eventOption";
 import { getEventRecordPhotoURL, hasPhotoAttachment } from "@/utils/eventRecord";
 import { getEventNumberValuePlaceholder, resolveEventNumberValue } from "@/utils/eventValue";
 import { permissionCodes } from "@/utils/permission";
-import { loadSourceValueConfig, type SourceValueConfig } from "@/utils/point";

 defineOptions({
 	name: "EventRecordEdit"
@@ -274,9 +250,6 @@ const customerDisplayText = computed(() => {

 async function handleCustomerChange(value: string | string[]): Promise<void> {
 	selectedCustomerIdList.value = Array.isArray(value) ? value : [value];
-	if (isPackagePurchaseSelected.value) {
-		resetPackageRequestNo();
-	}
 	await loadSelectedCustomerList();
 	await loadRecentRecordList();
 }
@@ -334,10 +307,10 @@ async function loadSelectedCustomer(): Promise<void> {
 	}

 	if (customer.id) {
-		selectedCustomerIdList.value = isEditMode.value || isPackagePurchaseSelected.value
+		selectedCustomerIdList.value = isEditMode.value
 			? [customer.id]
 			: [...new Set([...selectedCustomerIdList.value, customer.id])];
-		selectedCustomerList.value = isEditMode.value || isPackagePurchaseSelected.value
+		selectedCustomerList.value = isEditMode.value
 			? [customer]
 			: [...selectedCustomerList.value.filter(item => item.id !== customer.id), customer];
 	}
@@ -449,6 +422,10 @@ function appendRecordEvent(record: EventRecord): void {
 	eventList.value = [record.event, ...eventList.value];
 }

+function handleEventSelectionChange(eventIdList: string[]): void {
+	selectedEventIdList.value = eventIdList;
+}
+
 function resolveRecordOptionGroupList(eventId: string) {
 	const event = eventList.value.find(item => item.id === eventId);
 	return event ? resolveSelectedOptionGroupList(event, selectedOptionSelectionMap) : [];
@@ -494,52 +471,6 @@ function validateNumberValueList(): boolean {
 	return true;
 }

-// ---------- 积分规则联动 ----------
-
-const pointValueText = ref("");
-const sourceValueConfig = ref<SourceValueConfig>();
-const sourceValueAction = ref<PointAction>("EARN");
-let sourceValueLoadToken = 0;
-
-const showSourceValueInput = computed(() => (
-	!isEditMode.value
-	&& !isPackagePurchaseSelected.value
-	&& userStore.hasPermissions(permissionCodes.point.sourceValue)
-	&& !!sourceValueConfig.value
-));
-const sourceValuePlaceholder = computed(() => {
-	const range = sourceValueConfig.value?.range;
-	return range ? `请输入 ${range[0]}-${range[1]} 的数量` : "请输入数量";
-});
-
-async function loadSourceValueRule(): Promise<void> {
-	const token = sourceValueLoadToken + 1;
-	sourceValueLoadToken = token;
-	sourceValueConfig.value = undefined;
-	if (isEditMode.value || isPackagePurchaseSelected.value || !userStore.hasPermissions(permissionCodes.point.sourceValue) || !selectedEventIdList.value.length) {
-		return;
-	}
-
-	try {
-		sourceValueConfig.value = await loadSourceValueConfig(selectedEventIdList.value);
-		sourceValueAction.value = sourceValueConfig.value?.action || "EARN";
-		if (token !== sourceValueLoadToken) {
-			return;
-		}
-	} catch {
-		sourceValueConfig.value = undefined;
-	}
-}
-
-function resolveSourceValue(): number | undefined {
-	const value = Number(pointValueText.value);
-	return Number.isSafeInteger(value) && 0 < value ? sourceValueAction.value === "CONSUME" ? -value : value : undefined;
-}
-
-function getPointActionText(action: PointAction): string {
-	return action === "CONSUME" ? "消耗积分" : "发放积分";
-}
-
 // ---------- 照片 ----------

 const {
@@ -594,29 +525,6 @@ function parseDateTime(value: string): Date {
 // ---------- 提交 ----------

 const note = ref("");
-const {
-	selectedPackageEvent,
-	isPackagePurchaseSelected,
-	selectedPackageConfig,
-	canPriceOverride,
-	saleAmountText,
-	packagePurchaseItemList,
-	handleEventSelectionChange,
-	applySelectedPackageEvent,
-	resetPackagePurchaseForm,
-	resetPackageRequestNo,
-	submitPackagePurchase,
-	validatePackagePurchaseForm
-} = usePackagePurchaseRecord({
-	eventList,
-	selectedEventIdList,
-	selectedCustomerIdList,
-	selectedCustomerList,
-	note,
-	hasPermission: permissionCode => userStore.hasPermissions(permissionCode),
-	buildRegisteredAt,
-	buildTempFileIdList
-});
 const isSaving = ref(false);
 const editingRecord = ref<EventRecord>();

@@ -639,21 +547,14 @@ async function submitRecord(): Promise<void> {
 			return;
 		}

-		const packageResult = isPackagePurchaseSelected.value ? await submitPackagePurchase() : undefined;
-		const success = isPackagePurchaseSelected.value
-			? !!packageResult?.id
-			: await submitEventRecords();
+		const success = await submitEventRecords();
 		if (!success) {
 			return;
 		}
 		resetCreateForm();
 		await loadRecentRecordList();
 		await settingStore.playRegisterSuccessSound();
-		Message.success(isPackagePurchaseSelected.value ? "套餐购买已提交" : "登记已提交");
-		if (packageResult?.id) {
-			await router.replace(`/management/customer-packages/${packageResult.id}`);
-			return;
-		}
+		Message.success("登记已提交");
 		await router.replace("/customers");
 	} finally {
 		isSaving.value = false;
@@ -668,7 +569,6 @@ async function submitEventRecords(): Promise<boolean> {
 		selectedOptionGroupList: resolveRecordOptionGroupList(eventId),
 		remark: note.value || "客户现场登记",
 		registeredAt: buildRegisteredAt(),
-		pointValue: showSourceValueInput.value ? resolveSourceValue() : undefined,
 		numberValue: resolveNumberValue(eventId),
 		attachmentList: buildTempFileIdList().map(tempFileId => ({
 			tempFileId,
@@ -682,7 +582,6 @@ function resetCreateForm(): void {
 	selectedCustomerList.value = [];
 	selectedCustomerIdList.value = [];
 	note.value = "";
-	pointValueText.value = "";
 	photoItemList.value = [];
 	for (const eventId of Object.keys(numberValueTextMap)) {
 		delete numberValueTextMap[eventId];
@@ -690,11 +589,6 @@ function resetCreateForm(): void {
 	for (const eventId of Object.keys(selectedOptionSelectionMap)) {
 		delete selectedOptionSelectionMap[eventId];
 	}
-	if (selectedPackageEvent.value) {
-		applySelectedPackageEvent(selectedPackageEvent.value);
-	} else {
-		resetPackagePurchaseForm();
-	}
 }

 function validateForm(): boolean {
@@ -706,9 +600,6 @@ function validateForm(): boolean {
 		Message.warning("请至少选择一个登记事件");
 		return false;
 	}
-	if (isPackagePurchaseSelected.value) {
-		return validatePackagePurchaseForm() && validateRequiredPhotoList();
-	}
 	for (const eventId of selectedEventIdList.value) {
 		const event = eventList.value.find(item => item.id === eventId);
 		if (!event) {
@@ -726,14 +617,6 @@ function validateForm(): boolean {
 	if (!isEditMode.value && !validateNumberValueList()) {
 		return false;
 	}
-	if (showSourceValueInput.value) {
-		const pointValue = resolveSourceValue();
-		const range = sourceValueConfig.value?.range;
-		if (!pointValue || !range || Math.abs(pointValue) < range[0] || range[1] < Math.abs(pointValue)) {
-			Message.warning(`积分数量必须是 ${range?.[0] || 1}-${range?.[1] || 0} 的正整数`);
-			return false;
-		}
-	}

 	return true;
 }
@@ -767,20 +650,21 @@ async function updateRecord(): Promise<void> {
 // ---------- 页面数据 ----------

 async function loadPageData(): Promise<void> {
-	eventList.value = await EventAPI.listValid();
+	// 套餐购买不再走事件登记，退役消费事件也不可登记
+	eventList.value = (await EventAPI.listValid()).filter(item => !isRetiredEvent(item));
 	if (isEditMode.value) {
 		await loadRecordForEdit();
 		return;
 	}

-	const defaultEvent = eventList.value.find(item => !isPackagePurchaseEvent(item));
+	const defaultEvent = eventList.value[0];
 	selectedEventIdList.value = defaultEvent?.id ? [defaultEvent.id] : [];
 }

 async function loadRecordForEdit(): Promise<void> {
 	const record = await EventRecordAPI.detail(routeId.value);
-	if (isPackagePurchaseEvent(record.event)) {
-		Message.warning("套餐购买记录不能通过普通登记页编辑，请在客户套餐详情中查看");
+	if (isRetiredEvent(record.event)) {
+		Message.warning("退役事件记录仅支持历史查看，不能编辑");
 		await router.replace({ name: "EventRecordDetail", params: { id: routeId.value } });
 		return;
 	}
@@ -798,7 +682,6 @@ async function loadRecordForEdit(): Promise<void> {
 	}
 	registeredAtText.value = record.registeredAt ? Time.formatDateTime(new Date(record.registeredAt)) : "";
 	note.value = record.remark || "";
-	pointValueText.value = "";
 	setExistingPhotoList(record.attachmentList);
 	await loadRecentRecordList();
 }
@@ -816,10 +699,6 @@ onUnmounted(() => {
 	navBarStore.clearRight();
 });

-watch(selectedEventIdList, async () => {
-	await loadSourceValueRule();
-}, { deep: true });
-
 watch(customerCode, async (value) => {
 	if (!value) {
 		return;