diff --git a/src/views/daxpay/admin/merchant/info/MerchantList.vue b/src/views/daxpay/admin/merchant/info/MerchantList.vue index 298d22adb..7a1eb2c53 100644 --- a/src/views/daxpay/admin/merchant/info/MerchantList.vue +++ b/src/views/daxpay/admin/merchant/info/MerchantList.vue @@ -32,10 +32,12 @@ - + @@ -64,6 +66,7 @@ /> + @@ -80,6 +83,7 @@ import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table' import ALink from '@/components/Link/Link.vue' import MerchantCreateAdmin from './MerchantCreateAdmin.vue' + import UserShow from '@/views/iam/user/UserShow.vue' // 使用hooks const { @@ -100,6 +104,7 @@ const xTable = ref() const xToolbar = ref() const merchantEdit = ref() + const userShow = ref() const merchantCreateAdmin = ref() onMounted(() => { @@ -156,6 +161,13 @@ function createAdmin(record) { merchantCreateAdmin.value.init(record) } + + /** + * + */ + function showAdmin(record) { + userShow.value.init(record.adminUserId) + } diff --git a/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue b/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue index 6f063eadf..e7f9a5f2f 100644 --- a/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue +++ b/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue @@ -11,46 +11,54 @@
- - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + +