修复弹窗

shaofan
1 parent 1f9c1b4a
Showing 1 changed file with 20 additions and 17 deletions
src/views/merchant/FundReconciliation.vue
@@ -116,7 +116,7 @@
       </div>
     </a-card>
-    <a-modal v-model:open="detailVisible" :title="detailTitle" :footer="null" width="920px">
+    <a-modal v-model:open="detailVisible" :title="detailTitle" :footer="null" width="1120px">
       <div class="soft-page-stack">
         <div class="soft-note-card">
           <strong>{{ detailTitle }}</strong>
@@ -129,6 +129,7 @@
           :loading="detailLoading"
           rowKey="orderId"
           :pagination="detailPagination"
+          :scroll="detailTableScroll"
           @change="handleDetailTableChange"
         >
           <template #bodyCell="{ column, record }">
@@ -237,28 +238,30 @@ const riderColumns = [
 const detailColumns = computed(() => {
   if (activeDetailTab.value === 'merchant') {
     return [
-      { title: '订单ID', dataIndex: 'orderId', width: 100 },
-      { title: '订单号', dataIndex: 'orderNo', ellipsis: true },
-      { title: '支付时间', key: 'payTime', width: 170 },
-      { title: '完成时间', key: 'completeTime', width: 170 },
-      { title: '状态', key: 'status', width: 120 },
-      { title: '订单金额', key: 'orderAmount', width: 120 },
-      { title: '配送费', key: 'deliveryAmount', width: 120 },
-      { title: '退款金额', key: 'refundAmount', width: 120 },
+      { title: '订单ID', dataIndex: 'orderId', width: 90 },
+      { title: '订单号', dataIndex: 'orderNo', ellipsis: true, width: 180 },
+      { title: '支付时间', key: 'payTime', width: 160 },
+      { title: '完成时间', key: 'completeTime', width: 160 },
+      { title: '状态', key: 'status', width: 100 },
+      { title: '订单金额', key: 'orderAmount', width: 110 },
+      { title: '配送费', key: 'deliveryAmount', width: 110 },
+      { title: '退款金额', key: 'refundAmount', width: 110 },
     ]
   }
   return [
-    { title: '订单ID', dataIndex: 'orderId', width: 100 },
-    { title: '订单号', dataIndex: 'orderNo', ellipsis: true },
-    { title: '完成时间', key: 'completeTime', width: 170 },
-    { title: '状态', key: 'status', width: 120 },
-    { title: '配送费', key: 'deliveryAmount', width: 120 },
-    { title: '骑手收入', key: 'riderIncomeAmount', width: 120 },
-    { title: '退款影响金额', key: 'refundAmount', width: 130 },
-    { title: '可结算参考金额', key: 'settleableAmount', width: 140 },
+    { title: '订单ID', dataIndex: 'orderId', width: 90 },
+    { title: '订单号', dataIndex: 'orderNo', ellipsis: true, width: 180 },
+    { title: '完成时间', key: 'completeTime', width: 160 },
+    { title: '状态', key: 'status', width: 100 },
+    { title: '配送费', key: 'deliveryAmount', width: 110 },
+    { title: '骑手收入', key: 'riderIncomeAmount', width: 110 },
+    { title: '退款影响金额', key: 'refundAmount', width: 120 },
+    { title: '可结算参考金额', key: 'settleableAmount', width: 130 },
   ]
 })
+const detailTableScroll = computed(() => ({ x: activeDetailTab.value === 'merchant' ? 1020 : 1000 }))
+
 const pagination = computed<TablePaginationConfig>(() => ({
   current: currentPage.value,
   pageSize: pageSize.value,