Merge branch 'zhangyong/feature-20260113094820-现金重构' into milestone-20251215-多语言二期2

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -56,7 +56,7 @@ const transformTree = (nodes) => {
       ? transformTree([child])
       : null;
     return {
-      value: child.name,
+      value: child.id,
       label: child.name,
       children: grandchildren
     };

src/views/moneyManage/financialAccount/performanceAttribution.vue

@@ -59,7 +59,7 @@ const transformTree = (nodes) => {
       ? transformTree([child])
       : null;
     return {
-      value: child.name,
+      value: child.id,
       label: child.name,
       children: grandchildren
     };
@@ -72,6 +72,7 @@ const getMarket = async () => {
     const result = await request({ url: '/market/selectMarket' });
     if (result && result.data) {
       marketOptions.value = transformTree(result.data)
+      console.log('地区树:', marketOptions.value)
     }
   } catch (error) {
     console.error('获取地区失败', error)
@@ -301,28 +302,28 @@ onMounted(() => {
 
     <!-- 表格区域 -->
     <el-card class="table-card">
-      <el-table :data="tableData" v-loading="loading" style="width: 100%; flex: 1;"  :header-cell-style="{ background: '#F3FAFE', color: '#333' }">
-        <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="120" show-overflow-tooltip />
-        <el-table-column prop="market" label="所属地区" width="120" show-overflow-tooltip />
-        <el-table-column prop="orderCode" label="系统交易号" width="180" show-overflow-tooltip />
+      <el-table :data="tableData" v-loading="loading" style="width: 100%; flex: 1;" :cell-style="{ textAlign: 'center' }"  :header-cell-style="{ background: '#F3FAFE', color: '#333',textAlign: 'center' }">
+        <el-table-column type="index" label="序号" min-width="60" align="center" fixed="left" />
+        <el-table-column prop="jwcode" label="精网号" min-width="120" fixed="left" />
+        <el-table-column prop="name" label="姓名" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="marketName" label="所属地区" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="orderCode" label="系统交易号" min-width="280" show-overflow-tooltip />
         
-        <el-table-column prop="paymentAmount" label="付款金额" width="150" align="right">
+        <el-table-column prop="paymentAmount" label="付款金额" min-width="150" align="right">
           <!-- <template #default="{ row }">
             {{ row.paymentAmount }} {{ row.paymentCurrency }}
           </template> -->
         </el-table-column>
-        <el-table-column prop="paymentCurrency" label="付款币种" width="180" show-overflow-tooltip />
+        <el-table-column prop="paymentCurrency" label="付款币种" min-width="180" show-overflow-tooltip />
         
-        <el-table-column prop="receivedAmount" label="到账金额" width="150" align="right">
+        <el-table-column prop="receivedAmount" label="到账金额" min-width="150" align="right">
           <!-- <template #default="{ row }">
             {{ row.receivedAmount }} {{ row.receivedCurrency }}
           </template> -->
         </el-table-column>
-        <el-table-column prop="receivedCurrency" label="到账币种" width="180" show-overflow-tooltip />
+        <el-table-column prop="receivedCurrency" label="到账币种" min-width="180" show-overflow-tooltip />
         
-        <el-table-column prop="handlingCharge" label="手续费" width="100" align="right" />
+        <el-table-column prop="handlingCharge" label="手续费" min-width="100" align="right" />
       </el-table>
 
       <!-- 分页 -->