From 9dfb9511cfc738398d648f57da8f2e42c6c94adf Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 14 Jul 2026 16:06:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=B9=B3=E5=8F=B0=E6=B5=81=E6=B0=B4?=
=?UTF-8?q?=E6=8A=BD=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hard-sh/components/hard-sh-by-day.vue | 10 ++-
.../hard-sh/components/hard-sh-by-month.vue | 10 ++-
src/views/mch/mch-manage/form.vue | 88 +++++++++----------
src/views/mch/mch-manage/index.vue | 5 ++
4 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/src/views/hard/hard-sh/components/hard-sh-by-day.vue b/src/views/hard/hard-sh/components/hard-sh-by-day.vue
index e35102e..42af029 100644
--- a/src/views/hard/hard-sh/components/hard-sh-by-day.vue
+++ b/src/views/hard/hard-sh/components/hard-sh-by-day.vue
@@ -48,6 +48,14 @@
+
+
+
+ {{ displayPrice(row.mchPlatformRankePrice) }}({{ row?.mchPlatformRanke ?? 0 }}%)
+
+
+
@@ -103,7 +111,7 @@ const selectionChangHandle = (objs: { id: string }[]) => {
const getSummaries = (param: any) => {
const { columns, data } = param
- const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
+ const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount", "mchPlatformRankePrice"]
const totalRow = Array.from({ length: columns.length })
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
diff --git a/src/views/hard/hard-sh/components/hard-sh-by-month.vue b/src/views/hard/hard-sh/components/hard-sh-by-month.vue
index 7e34913..7d5febc 100644
--- a/src/views/hard/hard-sh/components/hard-sh-by-month.vue
+++ b/src/views/hard/hard-sh/components/hard-sh-by-month.vue
@@ -53,6 +53,14 @@
+
+
+
+ {{ displayPrice(row.mchPlatformRankePrice) }}({{ row?.mchPlatformRanke ?? 0 }}%)
+
+
+
@@ -85,7 +93,7 @@ const selectionChangHandle = (objs: { id: string }[]) => {
const getSummaries = (param: any) => {
const { columns, data } = param
- const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
+ const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount", "mchPlatformRankePrice"]
const totalRow = Array.from({ length: columns.length })
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue
index 67eddef..1b1f52a 100644
--- a/src/views/mch/mch-manage/form.vue
+++ b/src/views/mch/mch-manage/form.vue
@@ -15,14 +15,9 @@
-
+
{{ item.label }}
@@ -30,15 +25,17 @@
-
- {{ item.label }}
+
+ {{ item.label }}
- {{ item.label }}
+ {{
+ item.label }}
@@ -98,43 +95,35 @@
+
+
+
+ 平台抽成：
+
+
+
+
+ %
+
+
+
+
+
-
+
-
+
-
+
@@ -165,8 +154,7 @@ const loading = ref(false)
// 定义字典
const { merchant_type, wallet_mch_sup_type, yes_no_type } = useDict("merchant_type", "wallet_mch_sup_type", "yes_no_type")
-// 提交表单数据
-const form = reactive({
+const defaultForm = {
id: "",
deptId: "",
name: "",
@@ -186,7 +174,11 @@ const form = reactive({
parentId: "",
catgoryId: "",
discountsPrice: "",
-})
+ platformRanke: '0',
+}
+
+// 提交表单数据
+const form = reactive({ ...defaultForm })
const jobTime = reactive<{
[key: string]: string[]
}>({
@@ -239,9 +231,8 @@ watch(
// 提交
const onSubmit = async () => {
- const valid = await dataFormRef.value.validate().catch(() => {})
+ const valid = await dataFormRef.value.validate().catch(() => { })
if (!valid) return false
-
const _pa = {
...form,
isSyncZy: form.isSyncZy ? "1" : "0",
@@ -249,11 +240,9 @@ const onSubmit = async () => {
cooperationStatus: form.types == "2" && form.supType == "10" ? null : form.cooperationStatus,
parentId: form.types == "2" && form.supType == "10" ? -1 : form.parentId,
}
-
if (_pa.parentId == "") {
_pa.parentId = -1
}
-
try {
loading.value = true
form.id ? await putObj(_pa) : await addObj(_pa)
@@ -281,6 +270,9 @@ const getmerchantInfoData = async (id: string) => {
if (form.canteenIsOpen == undefined) {
form.canteenIsOpen = "0"
}
+ if (form.platformRanke == undefined) {
+ form.platformRanke = defaultForm.platformRanke
+ }
jobTime.morning = resJobTime[0]?.split("-") ?? []
jobTime.noon = resJobTime[1]?.split("-") ?? []
jobTime.evening = resJobTime[2]?.split("-") ?? []
diff --git a/src/views/mch/mch-manage/index.vue b/src/views/mch/mch-manage/index.vue
index dbada8a..56e423a 100644
--- a/src/views/mch/mch-manage/index.vue
+++ b/src/views/mch/mch-manage/index.vue
@@ -93,6 +93,11 @@
+
+
+ {{ row?.platformRanke ?? 0 }}%
+
+