+
+
-
-
-
-
- {{ row.groupNo }}
-
-
-
-
-
- {{ dictConvert('channel', row.channel) }}
-
-
-
- {{ row.totalRate }}%
-
-
-
- 是
- 否
-
-
-
-
-
- 接收方配置
-
-
- 更多
-
-
-
- 设为默认
-
-
- 取消默认
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ row.groupNo }}
+
+
+
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+
+ {{ row.totalRate }}%
+
+
+
+ 是
+ 否
+
+
+
+
+
+ 接收方配置
+
+
+ 更多
+
+
+
+ 设为默认
+
+
+ 取消默认
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
-
+
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
index 4f053c445..071596fc6 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
@@ -1,14 +1,6 @@
-
-
+
+
-
-
-
-
- {{ row.receiverNo }}
-
-
-
-
- {{ dictConvert('channel', row.channel) }}
-
-
-
-
- {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-
-
-
-
-
-
- {{ dictConvert('alloc_relation_type', row.relationType) }}
-
-
-
-
- 查看
-
- 删除
-
-
-
+
+
+
+
+
+ {{ row.receiverNo }}
+
+
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+
+
+ {{ dictConvert('alloc_receiver_type', row.receiverType) }}
+
+
+
+
+
+
+ {{ dictConvert('alloc_relation_type', row.relationType) }}
+
+
+
+
+ 查看
+
+ 删除
+
+
+
+
-
+
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index d2600bb23..f40be7a76 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -67,14 +67,8 @@
码牌配置
-
-
-
- 分账接收方
-
-
- 分账组
+ 分账配置
删除应用
@@ -99,8 +93,7 @@
-
-
+
@@ -120,10 +113,9 @@
import ChannelConfigList from '@/views/daxpay/common/merchant/channel/ChannelConfigList.vue'
import MerchantNotifyConfigList from '@/views/daxpay/common/merchant/notify/MerchantNotifyConfigList.vue'
import Icon from '@/components/Icon/Icon.vue'
- import AllocationReceiverList from '@/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue'
- import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
import CashierCodeConfigList from '@/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue'
import CheckoutConfigModel from '@/views/daxpay/common/config/checkout/CheckoutConfigModel.vue'
+ import AllocationConfigModel from '@/views/daxpay/common/allocation/AllocationConfigModel.vue'
// 使用hooks
const {
@@ -152,8 +144,7 @@
const merchantNotifyConfigList = ref
()
const cashierCodeConfigList = ref()
const checkoutConfigModel = ref()
- const allocationReceiverList = ref()
- const allocationGroupList = ref()
+ const allocationConfigModel = ref()
onMounted(() => {
vxeBind()
@@ -222,19 +213,7 @@
* 分账配置
*/
function showAllocConfig(record) {
- createMessage.warn('暂未开放')
- }
- /**
- * 分账接收方
- */
- function showAllocReceiver(record) {
- allocationReceiverList.value.init(record.appId)
- }
- /**
- * 分账组
- */
- function showAllocGroup(record) {
- allocationGroupList.value.init(record.appId)
+ allocationConfigModel.value.init(record.appId)
}
/**
* 删除