From d8cf18efb7df0a1f2e037acb078d85967d2927cb Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 29 Mar 2025 18:05:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Select/SelectMch.vue           |  3 ++
 src/components/Select/SelectMchRule.vue       |  2 +-
 .../mch/mch-manage/mch-rule-config-form.vue   | 52 ++++++++-----------
 src/views/mch/mch-manage/mch-rule-config.vue  | 45 +++++++++++-----
 src/views/mch/mch-manage/setting.vue          | 17 ++++--
 .../rule-price-config/form.vue                |  0
 .../rule-price-config/index.vue               |  0
 7 files changed, 71 insertions(+), 48 deletions(-)
 rename src/views/{wallet => mch}/rule-price-config/form.vue (100%)
 rename src/views/{wallet => mch}/rule-price-config/index.vue (100%)

diff --git a/src/components/Select/SelectMch.vue b/src/components/Select/SelectMch.vue
index f935a38..bed8d9a 100644
--- a/src/components/Select/SelectMch.vue
+++ b/src/components/Select/SelectMch.vue
@@ -7,6 +7,7 @@
 		remote-show-suffix
 		filterable
 		remote
+		:disabled="props.disabled"
 		:remote-method="remoteSearch"
 		:loading="state.loading"
 		@visible-change="(e: boolean) => e && getOptions()"
@@ -34,10 +35,12 @@ const props = withDefaults(
 	defineProps<{
 		placeholder?: string
 		apiParams?: any
+		disabled?: boolean
 	}>(),
 	{
 		placeholder: "请选择",
 		apiParams: {},
+		disabled: false,
 	},
 )
 
diff --git a/src/components/Select/SelectMchRule.vue b/src/components/Select/SelectMchRule.vue
index d09b853..db21d9d 100644
--- a/src/components/Select/SelectMchRule.vue
+++ b/src/components/Select/SelectMchRule.vue
@@ -11,7 +11,7 @@
 		:loading="state.loading"
 		@visible-change="(e: boolean) => e && getOptions()"
 	>
-		<el-option v-for="v in state.options" :key="v.id" :label="getDictById(v.rulePriceType, v)" :value="v.rulePriceType">
+		<el-option v-for="v in state.options" :key="v.id" :label="getDictById(v.rulePriceType, v)" :value="v.id">
 			<div class="flex items-center">
 				<div class="flex items-center ml5">
 					<dict-tag :options="state.walletRulePriceType" :value="v.rulePriceType" />
diff --git a/src/views/mch/mch-manage/mch-rule-config-form.vue b/src/views/mch/mch-manage/mch-rule-config-form.vue
index 260436b..0fc2896 100644
--- a/src/views/mch/mch-manage/mch-rule-config-form.vue
+++ b/src/views/mch/mch-manage/mch-rule-config-form.vue
@@ -9,7 +9,7 @@
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="源商户" prop="sourceMchId">
-						<select-mch v-model="form.sourceMchId" :apiParams="{ types: '1' }" />
+						<select-mch disabled v-model="form.sourceMchId" :apiParams="{ types: '1' }" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
@@ -19,10 +19,13 @@
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-alert title="提示" type="info" :closable="false">
-						<span class="color-primary">老县府</span>
+						<span class="color-primary">{{ form.sourceMchName ? form.sourceMchName : "???" }}</span>
 						<span>到</span>
-						<span class="color-primary">新县府</span>
-						<span>消费</span>
+						<span class="color-primary">{{ form.targetMchName ? form.targetMchName : "???" }}</span>
+						<span>消费,超过</span>
+						<span class="color-success">{{ form.basePrice ? displayPrice(form.basePrice) : "???" }}</span>
+						<span>额外支付</span>
+						<span class="color-danger">{{ form.multiple ? form.multiple : "???" }}%</span>
 					</el-alert>
 				</el-col>
 			</el-row>
@@ -37,10 +40,10 @@
 </template>
 
 <script setup lang="ts" name="WalletRuleMchConfigFormDialog">
-import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
 import * as walletRuleMchConfigApi from "/@/api/wallet/mch-rule-join"
-import { rule } from "/@/utils/validate"
+import { displayPrice } from "/@/utils/formatMoney"
+
 const emit = defineEmits(["refresh"])
 
 // 定义变量内容
@@ -50,23 +53,20 @@ const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
-const form = reactive({
+const defaultForm = {
 	id: "",
 	sourceMchId: "",
 	targetMchId: "",
 	targetDeptId: "",
 	rulePriceConfigId: "",
-})
-
-const detail = reactive({
-	id: "",
-	sourceMchId: "",
-	tragetDeptId: "",
-	rulePriceConfigId: "",
-	basePrice: "",
-	multiple: "",
 	sourceMchName: "",
 	targetMchName: "",
+	basePrice: "",
+	multiple: "",
+}
+
+const form = reactive({
+	...defaultForm,
 })
 
 // 定义校验规则
@@ -77,10 +77,12 @@ const dataRules = ref({
 })
 
 // 打开弹窗
-const openDialog = (id: string) => {
+const openDialog = (id: string, sourceMchId: string) => {
 	visible.value = true
-	form.id = ""
-
+	Object.assign(form, defaultForm)
+	if (sourceMchId) {
+		form.sourceMchId = sourceMchId
+	}
 	// 重置表单数据
 	nextTick(() => {
 		dataFormRef.value?.resetFields()
@@ -104,7 +106,6 @@ const onSubmit = async () => {
 		// visible.value = false
 		// 更新
 		await getwalletRuleMchConfigData(data)
-		await getDetails(data)
 		emit("refresh")
 	} catch (err: any) {
 		useMessage().error(err.msg)
@@ -118,7 +119,7 @@ const getwalletRuleMchConfigData = async (id: string) => {
 	// 获取数据
 	loading.value = true
 	try {
-		const { data } = await walletRuleMchConfigApi.getObj(id)
+		const { data } = await walletRuleMchConfigApi.getJoinDetail(id)
 		Object.assign(form, data)
 	} catch (err) {
 		console.error(err)
@@ -127,15 +128,6 @@ const getwalletRuleMchConfigData = async (id: string) => {
 	}
 }
 
-const getDetails = async (id: any) => {
-	try {
-		const { data } = await walletRuleMchConfigApi.getJoinDetail(id)
-		Object.assign(detail, data)
-	} catch (e) {
-		console.log(e)
-	}
-}
-
 // 暴露变量
 defineExpose({
 	openDialog,
diff --git a/src/views/mch/mch-manage/mch-rule-config.vue b/src/views/mch/mch-manage/mch-rule-config.vue
index 6ee405b..ab31da0 100644
--- a/src/views/mch/mch-manage/mch-rule-config.vue
+++ b/src/views/mch/mch-manage/mch-rule-config.vue
@@ -2,15 +2,7 @@
 	<div>
 		<el-row>
 			<div class="mb8" style="width: 100%">
-				<el-button
-					icon="folder-add"
-					type="primary"
-					class="ml10"
-					@click="WalletRuleMchConfigFormDialogRef.openDialog()"
-					v-auth="'dzc_walletRuleMchConfig_add'"
-				>
-					新 增
-				</el-button>
+				<el-button icon="folder-add" type="primary" class="ml10" @click="doAdd" v-auth="'dzc_walletRuleMchConfig_add'"> 新 增 </el-button>
 			</div>
 		</el-row>
 		<el-table
@@ -24,8 +16,8 @@
 		>
 			<el-table-column type="selection" width="40" align="center" />
 			<el-table-column type="index" label="#" width="80" />
-			<el-table-column prop="sourceMchId" label="源商户" />
-			<el-table-column prop="tragetDeptId" label="目标部门" />
+			<el-table-column prop="sourceMchName" label="源商户" />
+			<el-table-column prop="targetMchName" label="目标商户" />
 			<el-table-column prop="rulePriceConfigId" label="规则名">
 				<template #default="{ row }">
 					<dict-tag :options="wallet_rule_price_type" :value="row.rulePriceType" />
@@ -41,6 +33,17 @@
 					<span class="color-primary">{{ row.multiple }}%</span>
 				</template>
 			</el-table-column>
+			<el-table-column min-width="300" label="描述">
+				<template #default="{ row }">
+					<span class="color-primary">{{ row.sourceMchName ? row.sourceMchName : "???" }}</span>
+					<span>到</span>
+					<span class="color-primary">{{ row.targetMchName ? row.targetMchName : "???" }}</span>
+					<span>消费,超过</span>
+					<span class="color-success">{{ row.basePrice ? displayPrice(row.basePrice) : "???" }}</span>
+					<span>额外支付</span>
+					<span class="color-danger">{{ row.multiple ? row.multiple : "???" }}%</span>
+				</template>
+			</el-table-column>
 			<el-table-column label="操作" width="150">
 				<template #default="{ row }">
 					<el-button
@@ -58,7 +61,7 @@
 			</el-table-column>
 		</el-table>
 		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-		<wallet-rule-mch-config-form-dialog ref="WalletRuleMchConfigFormDialogRef" />
+		<wallet-rule-mch-config-form-dialog ref="WalletRuleMchConfigFormDialogRef" @refresh="getDataList(false)" />
 	</div>
 </template>
 
@@ -71,6 +74,13 @@ import { displayPrice } from "/@/utils/formatMoney"
 
 const WalletRuleMchConfigFormDialog = defineAsyncComponent(() => import("./mch-rule-config-form.vue"))
 
+export type Props = {
+	sourceMchId?: string
+}
+const props = withDefaults(defineProps<Props>(), {
+	sourceMchId: "",
+})
+
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
@@ -82,6 +92,7 @@ const WalletRuleMchConfigFormDialogRef = ref()
 const { wallet_rule_price_type } = useDict("wallet_rule_price_type")
 
 const state: BasicTableProps = reactive<BasicTableProps>({
+	createdIsNeed: false,
 	queryForm: {},
 	pageList: walletRuleMchConfigApi.pageJoin,
 })
@@ -95,6 +106,11 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
+// 新增
+const doAdd = () => {
+	WalletRuleMchConfigFormDialogRef.value.openDialog(null, props.sourceMchId)
+}
+
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
@@ -110,4 +126,9 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+onMounted(() => {
+	state.queryForm.sourceMchId = props.sourceMchId
+	getDataList()
+})
 </script>
diff --git a/src/views/mch/mch-manage/setting.vue b/src/views/mch/mch-manage/setting.vue
index 31571cc..67ba755 100644
--- a/src/views/mch/mch-manage/setting.vue
+++ b/src/views/mch/mch-manage/setting.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-dialog width="60%" v-model="visible" :close-on-click-modal="false" draggable>
+	<el-dialog width="80%" v-model="visible" :close-on-click-modal="false" @closed="dialogClosed" draggable>
 		<div>
 			<el-tabs v-model="form.activeTab" class="demo-tabs">
 				<div v-for="v in data.tabList" :key="v.id">
@@ -15,7 +15,7 @@
 					</el-col>
 				</el-row>
 			</el-form>
-			<mch-rule-config-dialog v-if="form.activeTab == 20 && form.merchantType == '1'" />
+			<mch-rule-config-dialog :sourceMchId="form.id" v-if="form.activeTab == 20 && form.merchantType == '1'" />
 		</div>
 		<template #footer>
 			<el-button @click="visible = false">取消</el-button>
@@ -43,13 +43,15 @@ const data = reactive({
 	],
 })
 
-// 提交表单数据
-const form = reactive({
+const defualtForm = {
 	activeTab: data.tabList[0].id,
 	id: "",
 	merchantType: "",
 	defaultWalletTypeId: "",
-})
+}
+
+// 提交表单数据
+const form = reactive({ ...defualtForm })
 
 // 定义校验规则
 const dataRules = ref({
@@ -69,6 +71,11 @@ const openDialog = (id: string) => {
 	getmerchantInfoData(id)
 }
 
+// 关闭弹框
+const dialogClosed = () => {
+	Object.assign(form, defualtForm)
+}
+
 // 初始化表单数据
 const getmerchantInfoData = async (id: string) => {
 	// 获取数据
diff --git a/src/views/wallet/rule-price-config/form.vue b/src/views/mch/rule-price-config/form.vue
similarity index 100%
rename from src/views/wallet/rule-price-config/form.vue
rename to src/views/mch/rule-price-config/form.vue
diff --git a/src/views/wallet/rule-price-config/index.vue b/src/views/mch/rule-price-config/index.vue
similarity index 100%
rename from src/views/wallet/rule-price-config/index.vue
rename to src/views/mch/rule-price-config/index.vue