From a12250ead76ce067c768b98185c4e8d83f4497b5 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 29 Aug 2024 19:07:38 +0800
Subject: [PATCH] =?UTF-8?q?style=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/merchant/info/MerchantList.vue      | 18 +++-
 .../record/sync/TradeSyncRecordList.vue       | 90 ++++++++++---------
 2 files changed, 64 insertions(+), 44 deletions(-)

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 @@
           <vxe-column field="companyName" title="公司名称" :min-width="180" />
           <vxe-column field="companyContact" title="联系方式" :min-width="120" />
           <vxe-column field="companyCode" title="信用编码" :min-width="180" />
-          <vxe-column field="administrator" title="关联管理员" :min-width="120">
+          <vxe-column field="administrator" title="关联管理员" :min-width="120" align="center">
             <template #default="{ row }">
-              <a-tag v-if="row.administrator" color="green">已关联</a-tag>
-              <a-link danger @click="createAdmin(row)" v-else>创建管理员</a-link>
+              <a-tag v-if="row.administrator" @click="showAdmin(row)" color="green"
+                ><a-link>查看管理员</a-link></a-tag
+              >
+              <a-tag v-else><a-link danger @click="createAdmin(row)">创建管理员</a-link></a-tag>
             </template>
           </vxe-column>
           <vxe-column field="createTime" title="创建时间" :min-width="170" />
@@ -64,6 +66,7 @@
       />
       <MerchantEdit ref="merchantEdit" @ok="queryPage" />
       <MerchantCreateAdmin ref="merchantCreateAdmin" />
+      <UserShow ref="userShow" />
     </div>
   </div>
 </template>
@@ -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<VxeTableInstance>()
   const xToolbar = ref<VxeToolbarInstance>()
   const merchantEdit = ref<any>()
+  const userShow = ref<any>()
   const merchantCreateAdmin = ref<any>()
 
   onMounted(() => {
@@ -156,6 +161,13 @@
   function createAdmin(record) {
     merchantCreateAdmin.value.init(record)
   }
+
+  /**
+   *
+   */
+  function showAdmin(record) {
+    userShow.value.init(record.adminUserId)
+  }
 </script>
 
 <style lang="less" scoped></style>
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 @@
     </div>
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-      <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="tradeNo" title="平台交易号" :min-width="230">
-          <template #default="{ row }">
-            <a @click="showOrder(row)">
-              {{ row.tradeNo }}
-            </a>
-          </template>
-        </vxe-column>
-        <vxe-column field="bizTradeNo" title="商户交易号" :min-width="230" />
-        <vxe-column field="outTradeNo" title="通道交易号" :min-width="250" />
-        <vxe-column field="type" title="同步类型" :min-width="120">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('trade_type', row.tradeType) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="channel" title="同步通道" :min-width="100">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="outTradeStatus" title="通道状态" :min-width="150" />
-        <vxe-column field="repairOrder" title="是否调整" width="170">
-          <template #default="{ row }">
-            <a-tag v-if="row.adjust" color="green"> 已调整 </a-tag>
-            <a-tag v-else>未调整</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="errorMsg" title="错误消息" :min-width="160" />
-        <vxe-column field="createTime" title="同步时间" :min-width="170" />
-        <vxe-column field="mchNo" title="商户号" :min-width="150" />
-        <vxe-column field="appId" title="应用号" :min-width="150" />
-        <vxe-column fixed="right" :min-width="50" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <span>
-              <a-link @click="show(row)">查看</a-link>
-            </span>
-          </template>
-        </vxe-column>
-      </vxe-table>
+      <div class="h-65vh">
+        <vxe-table
+          height="auto"
+          row-id="id"
+          ref="xTable"
+          :data="pagination.records"
+          :loading="loading"
+        >
+          <vxe-column type="seq" title="序号" width="60" />
+          <vxe-column field="tradeNo" title="平台交易号" :min-width="230">
+            <template #default="{ row }">
+              <a @click="showOrder(row)">
+                {{ row.tradeNo }}
+              </a>
+            </template>
+          </vxe-column>
+          <vxe-column field="bizTradeNo" title="商户交易号" :min-width="230" />
+          <vxe-column field="outTradeNo" title="通道交易号" :min-width="250" />
+          <vxe-column field="type" title="同步类型" :min-width="120">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('trade_type', row.tradeType) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="channel" title="同步通道" :min-width="100">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="outTradeStatus" title="通道状态" :min-width="150" />
+          <vxe-column field="repairOrder" title="是否调整" width="170">
+            <template #default="{ row }">
+              <a-tag v-if="row.adjust" color="green"> 已调整 </a-tag>
+              <a-tag v-else>未调整</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="errorMsg" title="错误消息" :min-width="160" />
+          <vxe-column field="createTime" title="同步时间" :min-width="170" />
+          <vxe-column field="mchNo" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
+          <vxe-column fixed="right" :min-width="50" :showOverflow="false" title="操作">
+            <template #default="{ row }">
+              <span>
+                <a-link @click="show(row)">查看</a-link>
+              </span>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
       <vxe-pager
         size="medium"
         :loading="loading"
@@ -71,7 +79,7 @@
   import { computed, onMounted, ref, watch } from 'vue'
   import { page, TradeSyncRecord } from './TradeSyncRecord.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
-  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import BQuery from '@/components/Bootx/Query/BQuery.vue'
   import { LIST, QueryField, STRING } from '@/components/Bootx/Query/Query'
   import { useDict } from '@/hooks/bootx/useDict'