From 6a2c06d1086b7a625005f5a200169d8c0b5579cf Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sun, 18 Jan 2026 14:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F=E9=80=82?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/financialAccount/cashFlow.vue   | 19 ++++++++-----------
 .../financialAccount/performanceAttribution.vue       |  8 +++-----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue
index 9a3e016..fa475e2 100644
--- a/src/views/moneyManage/financialAccount/cashFlow.vue
+++ b/src/views/moneyManage/financialAccount/cashFlow.vue
@@ -294,12 +294,8 @@ onMounted(() => {
             <span class="label">订单号：</span>
             <el-input v-model="queryParams.orderCode" placeholder="请输入订单号" clearable />
           </div>
-        </div>
-        
-        <!-- 第二行 -->
-        <div class="search-row">
-          
-          <div class="search-item" style="width: auto;">
+
+            <div class="search-item" style="width: auto;">
             <span class="label">付款时间：</span>
             <el-date-picker
               v-model="queryParams.timeRange"
@@ -318,7 +314,8 @@ onMounted(() => {
             <el-button type="success" @click="handleReset">{{ t('common.reset') }}</el-button>
           </div>
         </div>
-      </div>
+        </div>
+        
     </el-card>
 
     <!-- 表格区域 -->
@@ -327,7 +324,7 @@ onMounted(() => {
         <el-table-column type="index" label="序号" width="60" align="center" fixed="left" />
         <el-table-column prop="jwcode" label="精网号" width="120" fixed="left" />
         <el-table-column prop="name" label="姓名" width="150" show-overflow-tooltip />
-        <el-table-column prop="market" label="所属地区" width="120" show-overflow-tooltip />
+        <el-table-column prop="marketName" label="所属地区" width="120" show-overflow-tooltip />
         <el-table-column prop="orderCode" label="系统交易号" width="280" show-overflow-tooltip />
         
         <el-table-column prop="paymentAmount" label="付款金额" width="150" align="right">
@@ -335,14 +332,14 @@ onMounted(() => {
             {{ row.paymentAmount }} {{ row.paymentCurrency }}
           </template> -->
         </el-table-column>
-        <el-table-column prop="paymentCurrency" label="付款币种" width="120" show-overflow-tooltip />
+        <el-table-column prop="paymentCurrencyName" label="付款币种" width="120" show-overflow-tooltip />
         
         <el-table-column prop="receivedAmount" label="到账金额" width="150" align="right">
           <!-- <template #default="{ row }">
             {{ row.receivedAmount }} {{ row.receivedCurrency }}
           </template> -->
         </el-table-column>
-        <el-table-column prop="receivedCurrency" label="到账币种" width="120" show-overflow-tooltip />
+        <el-table-column prop="receivedCurrencyName" label="到账币种" width="120" show-overflow-tooltip />
         
         <el-table-column prop="handlingCharge" label="手续费" width="100" align="right" />
         <el-table-column prop="payType" label="支付方式" width="120" align="center" />
@@ -469,7 +466,7 @@ onMounted(() => {
 }
 
 .search-btn-group {
-  margin-left: auto; // 靠右对齐
+  margin-left: 20px; // 靠右对齐
   display: flex;
   gap: 10px;
 }
diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue
index 63a18eb..b98da7b 100644
--- a/src/views/moneyManage/financialAccount/performanceAttribution.vue
+++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue
@@ -273,7 +273,7 @@ onMounted(() => {
               collapse-tags-tooltip
               placeholder="请选择地区"
               clearable
-              style="width: 220px;"
+              style="width: 8vw;"
             />
           </div>
           
@@ -286,16 +286,14 @@ onMounted(() => {
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-              style="width: 350px;"
+              style="width: 18vw;"
             />
           </div>
 
-           <div class="search-btn-group">
             <el-button type="primary" @click="handleSearch">{{ t('common.search') }}</el-button>
             <el-button type="primary" @click="handleExport">{{ t('common.exportExcel') }}</el-button>
             <el-button type="primary" @click="openExportList">{{ t('common.viewExportList') }}</el-button>
             <el-button type="success" @click="handleReset">{{ t('common.reset') }}</el-button>
-          </div>
         </div>
       </div>
     </el-card>
@@ -419,7 +417,7 @@ onMounted(() => {
   }
 
   .el-input, .el-select {
-    width: 200px;
+    width: 8vw;
   }
 }