fix cancel order payment

src/api/SalesOrderAPI.ts

@@ -62,4 +62,29 @@ async function fundRecordDetail(id: string): Promise<FundRecord> {
 	return await axios.post(`${FUND_URI}/detail`, undefined, { params: { id } });
 }
 
-export default { list, detail, createDirectProduct, update, cancel, receivePayment, verifyPayment, rejectPayment, cancelPayment, refund, confirmNoRefund, revokeFund, fundRecordList, fundRecordDetail };
+async function myReceiveRecordList(page: FundRecordPage): Promise<SalesOrderPageResult<FundRecord>> {
+	return await axios.post(`${FUND_URI}/my-receive/list`, withCurrentStoreId(page));
+}
+
+async function myReceiveRecordDetail(id: string): Promise<FundRecord> {
+	return await axios.post(`${FUND_URI}/my-receive/detail`, undefined, { params: { id } });
+}
+
+export default {
+	list,
+	detail,
+	createDirectProduct,
+	update,
+	cancel,
+	receivePayment,
+	verifyPayment,
+	rejectPayment,
+	cancelPayment,
+	refund,
+	confirmNoRefund,
+	revokeFund,
+	fundRecordList,
+	fundRecordDetail,
+	myReceiveRecordList,
+	myReceiveRecordDetail
+};

src/pages/salesOrder/FundRecordDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div v-can="permissionCodes.fundRecord.read" class="package-record-detail">
+	<div v-can="pageAccess" class="package-record-detail">
 		<template v-if="record">
 			<section class="hero" v-entrance-transition>
 				<div class="header">
@@ -150,9 +150,12 @@ const isOperating = ref(false);
 
 const record = ref<FundRecord>();
 const isLoading = ref(false);
+const pageAccess = computed(() => [permissionCodes.fundRecord.read, permissionCodes.fundReceive.create]);
 const isPendingReceive = computed(() => record.value?.operationType === "RECEIVE" && record.value.status === "PENDING");
 const canVerifyReceive = computed(() => isPendingReceive.value && userStore.hasPermissions(permissionCodes.fundReceive.verify));
-const canCancelReceive = computed(() => isPendingReceive.value && userStore.hasPermissions(permissionCodes.fundReceive.create));
+const loginUserId = computed(() => userStore.loginUser.user?.id || userStore.loginUser.id || "");
+const canCancelReceive = computed(() => isPendingReceive.value && (userStore.hasPermissions(permissionCodes.fundRecord.read)
+	|| (userStore.hasPermissions(permissionCodes.fundReceive.create) && record.value?.operatorUserId === loginUserId.value)));
 const canRevoke = computed(() => record.value?.status === "VERIFIED"
 	&& record.value.operationType !== "REVOKE"
 	&& !record.value.revokeRecordId
@@ -177,7 +180,9 @@ async function loadData(): Promise<void> {
 	}
 	isLoading.value = true;
 	try {
-		record.value = await SalesOrderAPI.fundRecordDetail(id);
+		record.value = userStore.hasPermissions(permissionCodes.fundRecord.read)
+			? await SalesOrderAPI.fundRecordDetail(id)
+			: await SalesOrderAPI.myReceiveRecordDetail(id);
 	} catch (error) {
 		Message.error(getErrorMessage(error, "资金记录加载失败"));
 	} finally {

src/pages/salesOrder/FundRecordList.vue

@@ -1,8 +1,9 @@
 <template>
-	<div v-can="permissionCodes.fundRecord.read" class="sales-order-record-list">
+	<div v-can="pageAccess" class="sales-order-record-list">
 		<div class="filters">
 			<t-dropdown-menu class="menus">
 				<t-dropdown-item
+					v-if="!isSelfReceiveOnly"
 					v-model="operationType"
 					label="操作类型"
 					:options="operationOptions"
@@ -82,6 +83,7 @@
 
 <script setup lang="ts">
 import { type DropdownValue } from "tdesign-mobile-vue";
+import { useUserStore } from "timi-web-api";
 import SalesOrderAPI from "@/api/SalesOrderAPI";
 import { useNavBarStore } from "@/store/navBarStore";
 import type { FundOperationType, FundRecord, FundRecordStatus } from "@/types/SalesOrder";
@@ -97,6 +99,7 @@ defineOptions({ name: "FundRecordList" });
 const route = useRoute();
 const router = useRouter();
 const navBarStore = useNavBarStore();
+const userStore = useUserStore();
 const recordList = ref<FundRecord[]>([]);
 const operationType = ref(route.query.operationType === "RECEIVE" ? "RECEIVE" : "ALL");
 const status = ref(route.query.status === "PENDING" ? "PENDING" : "ALL");
@@ -105,6 +108,9 @@ const total = ref(0);
 const loading = ref(false);
 const isRefreshing = ref(false);
 const noMore = ref(false);
+const isSelfReceiveOnly = computed(() => !userStore.hasPermissions(permissionCodes.fundRecord.read)
+	&& userStore.hasPermissions(permissionCodes.fundReceive.create));
+const pageAccess = computed(() => [permissionCodes.fundRecord.read, permissionCodes.fundReceive.create]);
 const operationOptions = [
 	{ label: "全部类型", value: "ALL" },
 	{ label: "线下收款", value: "RECEIVE" },
@@ -127,13 +133,16 @@ async function loadMore(): Promise<void> {
 	}
 	loading.value = true;
 	try {
-		const result = await SalesOrderAPI.fundRecordList({
+		const page = {
 			index: pageIndex.value,
 			size: 15,
 			salesOrderId: String(route.query.salesOrderId || "") || undefined,
-			operationType: operationType.value === "ALL" ? undefined : operationType.value as FundOperationType,
+			operationType: isSelfReceiveOnly.value || operationType.value === "ALL" ? undefined : operationType.value as FundOperationType,
 			status: status.value === "ALL" ? undefined : status.value as FundRecordStatus
-		});
+		};
+		const result = isSelfReceiveOnly.value
+			? await SalesOrderAPI.myReceiveRecordList(page)
+			: await SalesOrderAPI.fundRecordList(page);
 		const list = result.list || [];
 		recordList.value = recordList.value.concat(list);
 		total.value = result.total || 0;

src/pages/salesOrder/SalesOrderCreate.vue

@@ -46,7 +46,7 @@
 						<strong>购买产品</strong>
 						<span v-text="`${items.length} 项`" />
 					</div>
-					<div class="tips">同一 SKU 单位不能重复，数量最多三位小数</div>
+					<div class="tips">同一 SKU 单位不能重复</div>
 					<div class="items">
 						<div v-for="(item, index) in items" :key="item.clientKey" class="item">
 							<div class="header">
@@ -74,6 +74,13 @@
 									:readonly="!canPriceOverride"
 									:placeholder="getItemUnitPricePlaceholder(item)"
 								/>
+								<template #help>
+									<span
+										v-if="item.skuId && item.unitPriceText"
+										class="price-tips gray"
+										v-text="getItemUnitPricePlaceholder(item)"
+									/>
+								</template>
 							</t-form-item>
 							<t-form-item label="数量" content-align="right">
 								<t-stepper
@@ -293,7 +300,7 @@ function getItemUnitPrice(item: FormItem): number | undefined {
 }
 function getItemUnitPricePlaceholder(item: FormItem): string {
 	const salePrice = getUnit(item)?.salePrice;
-	return salePrice === undefined || salePrice === null ? "产品价" : `产品价：${formatProductAmount(salePrice)}`;
+	return salePrice === undefined || salePrice === null ? "产品定价" : `产品定价：${formatProductAmount(salePrice)}`;
 }
 function calculateItemAmount(item: FormItem): number | undefined {
 	const quantity = normalizePackageQuantity(item.quantity ?? "");
@@ -526,6 +533,11 @@ onUnmounted(() => navBarStore.clearRight());
 						}
 					}
 
+					.price-tips {
+						flex: 1;
+						text-align: right;
+					}
+
 					.unit-list {
 						gap: .5rem;
 						width: 100%;

src/pages/salesOrder/SalesOrderDetail.vue

@@ -179,7 +179,12 @@
 				<t-cell title="收款状态" :note="getSalesPaymentStatusText(order.paymentStatus)" />
 				<t-cell v-if="order.paymentStatus === 'PAID'" title="全额实收时间" :note="getPaidAtText(order.paidAt)" />
 				<t-cell title="退款状态" :note="getSalesRefundStatusText(order.refundStatus)" />
-				<t-cell v-if="canReadFund" title="查看全部资金流水" arrow @click="toFundRecords" />
+				<t-cell
+					v-if="canReadFund || canReadMyReceive"
+					:title="canReadFund ? '查看全部资金流水' : '查看我的收款申请'"
+					arrow
+					@click="toFundRecords"
+				/>
 			</t-cell-group>
 			<t-cell-group v-if="order.status === 'CANCELLED'" class="cancel-info" title="取消记录" theme="card">
 				<t-cell title="取消时间" :note="order.cancelledAt ? Time.toDateTime(order.cancelledAt) : '未知'" />
@@ -252,6 +257,7 @@ const isSaving = ref(false);
 const editRemark = ref("");
 const photoItems = ref<PhotoItem[]>([]);
 const canReadFund = computed(() => userStore.hasPermissions(permissionCodes.fundRecord.read));
+const canReadMyReceive = computed(() => userStore.hasPermissions(permissionCodes.fundReceive.create));
 const canUpdate = computed(() => userStore.hasPermissions(permissionCodes.salesOrder.update));
 const canCreateFulfillment = computed(() => userStore.hasPermissions(permissionCodes.orderFulfillment.create));
 const canOperateStock = computed(() => userStore.hasPermissions(permissionCodes.productStock.create));

src/pages/salesOrder/SalesOrderList.vue

@@ -89,14 +89,14 @@ const actions = computed(() => [
 	...(canCreate.value ? [{
 		key: "create",
 		text: "直接产品下单",
-		icon: "add",
+		icon: "task",
 		theme: "primary" as const,
 		action: toCreate
 	}] : []),
 	...(canCreatePackageOrder.value ? [{
 		key: "create-package-order",
 		text: "创建客户套餐",
-		icon: "add-circle",
+		icon: "layers",
 		theme: "primary" as const,
 		action: toCreatePackageOrder
 	}] : [])

src/pages/salesOrder/SalesOrderPayment.vue

@@ -160,7 +160,7 @@ async function save(): Promise<void> {
 	if (!requestNo.value) requestNo.value = createPackageRequestNo();
 	saving.value = true;
 	try {
-		await SalesOrderAPI.receivePayment({
+		const record = await SalesOrderAPI.receivePayment({
 			salesOrderId: order.value.id,
 			requestNo: requestNo.value,
 			amount,
@@ -169,7 +169,9 @@ async function save(): Promise<void> {
 			remark: remark.value.trim() || null
 		});
 		Message.success("收款登记已提交");
-		await router.replace(`/management/sales-orders/${order.value.id}`);
+		await router.replace(record.id && userStore.hasPermissions(permissionCodes.fundReceive.create)
+			? `/management/fund-records/${record.id}`
+			: `/management/sales-orders/${order.value.id}`);
 	} catch (error) {
 		Message.error(getErrorMessage(error, "收款登记失败，重试会复用同一请求号"));
 	} finally {