-
¥
-
+
+
+ 订单总价
+ ¥
+
+
+
+ 剩余待收
+ ¥
+
+
+
+ 流水金额
+ ¥
+
+
@@ -72,7 +87,7 @@ import { useNavBarStore } from "@/store/navBarStore";
import type { FundOperationType, FundRecord, FundRecordStatus } from "@/types/SalesOrder";
import { getErrorMessage } from "@/utils/error";
import { formatPackageAmount } from "@/utils/package";
-import { getFundBizTypeText, getFundOperationText, getFundStatusText } from "@/utils/salesOrder";
+import { getFundOperationText, getFundStatusText } from "@/utils/salesOrder";
import { Message } from "@/utils/message";
import { permissionCodes } from "@/utils/permission";
import { PassTimeLabel } from "timi-web";
@@ -166,6 +181,14 @@ function getStatusTheme(statusValue?: FundRecordStatus): "success" | "warning" |
return statusValue === "VERIFIED" ? "success" : statusValue === "PENDING" ? "warning" : statusValue === "REJECTED" ? "danger" : "default";
}
+function getRecordStatusText(item: FundRecord): string {
+ return item.revokeRecordId ? "已被冲正" : getFundStatusText(item.status);
+}
+
+function getRecordStatusTheme(item: FundRecord): "success" | "warning" | "danger" | "default" {
+ return item.revokeRecordId ? "danger" : getStatusTheme(item.status);
+}
+
async function toDetail(item: FundRecord): Promise
{
if (item.id) {
await router.push({
@@ -256,7 +279,7 @@ onUnmounted(() => navBarStore.clearRight());
gap: 0;
color: var(--td-text-color-secondary);
display: flex;
- font-size: .8125rem;
+ font-size: .75rem;
flex-wrap: wrap;
line-height: 1.5;
flex-direction: column;
@@ -277,9 +300,26 @@ onUnmounted(() => navBarStore.clearRight());
}
}
- .amount {
+ .amounts {
+ display: flex;
+ font-size: .75rem;
+ align-items: end;
+ flex-direction: column;
- .value {
+ .label {
+ color: var(--td-text-color-placeholder);
+ }
+
+ .order-amount,
+ .unpaid-amount,
+ .record-amount {
+ gap: .125rem;
+ display: flex;
+ align-items: baseline;
+ white-space: nowrap;
+ }
+
+ .record-amount .value {
font-size: 1.25rem;
}
}
diff --git a/src/pages/salesOrder/FundRecordRevoke.vue b/src/pages/salesOrder/FundRecordRevoke.vue
index 8b7c586..a00fbe9 100644
--- a/src/pages/salesOrder/FundRecordRevoke.vue
+++ b/src/pages/salesOrder/FundRecordRevoke.vue
@@ -2,33 +2,89 @@
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+