Merge branch 'zhangyong/feature-20260211100322-日常优化2.0' into milestone-20260212-日常优化2.0

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -408,16 +408,9 @@ onMounted(async () => {
           <div class="search-item">
             <span class="label">{{ t('common.market') }}：</span>
             <!-- 下拉多选，使用 el-cascader 匹配地区树结构 -->
-            <el-cascader
-              v-model="queryParams.markets"
-              :options="marketOptions"
-              :props="{ multiple: true, emitPath: false }"
-              collapse-tags
-              collapse-tags-tooltip
-              :placeholder="t('common.marketPlaceholder')"
-              clearable
-              style="width: 220px;"
-            />
+            <el-cascader v-model="queryParams.markets" :options="marketOptions"
+              :props="{ multiple: true, emitPath: false }" collapse-tags collapse-tags-tooltip
+              :placeholder="t('common.marketPlaceholder')" clearable style="width: 220px;" />
           </div>
           <div class="search-item">
             <span class="label">{{ t('common.payPlatform1') }}：</span>
@@ -438,15 +431,9 @@ onMounted(async () => {
 
           <div class="search-item" style="width: auto;">
             <span class="label">{{ t('common.payTime2') }}：</span>
-            <el-date-picker
-              v-model="queryParams.timeRange"
-              type="datetimerange"
-              :range-separator="t('common.to')"
-              :start-placeholder="t('common.startTime')"
-              :end-placeholder="t('common.endTime')"
-              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-              style="width: 350px;"
-            />
+            <el-date-picker v-model="queryParams.timeRange" type="datetimerange" :range-separator="t('common.to')"
+              :start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')"
+              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]" style="width: 350px;" />
           </div>
           <div class="search-btn-group">
             <el-button type="primary" @click="handleSearch">{{ t('common.search') }}</el-button>
@@ -461,8 +448,14 @@ onMounted(async () => {
 
     <!-- 表格区域 -->
     <el-card class="table-card">
-      <el-table ref="tableRef" :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="t('common_list.id')" width="60" align="center" fixed="left" />
+      <el-table ref="tableRef" :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="t('common_list.id')" width="60" align="center" fixed="left">
+          <template #default="scope">
+            <span>{{ scope.$index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="120" fixed="left" />
         <el-table-column prop="name" :label="t('common_list.name')" width="150" show-overflow-tooltip />
         <el-table-column prop="marketName" :label="t('common_list.market')" width="120" show-overflow-tooltip />
@@ -473,14 +466,16 @@ onMounted(async () => {
             {{ row.paymentAmount }} {{ row.paymentCurrency }}
           </template> -->
         </el-table-column>
-        <el-table-column prop="paymentCurrencyName" :label="t('common_list.payCurrency')" width="120" show-overflow-tooltip />
+        <el-table-column prop="paymentCurrencyName" :label="t('common_list.payCurrency')" width="120"
+          show-overflow-tooltip />
 
         <el-table-column prop="receivedAmount" :label="t('common_list.receiveAmount')" width="150" align="right">
           <!-- <template #default="{ row }">
             {{ row.receivedAmount }} {{ row.receivedCurrency }}
           </template> -->
         </el-table-column>
-        <el-table-column prop="receivedCurrencyName" :label="t('common_list.receiveCurrency')" width="120" show-overflow-tooltip />
+        <el-table-column prop="receivedCurrencyName" :label="t('common_list.receiveCurrency')" width="120"
+          show-overflow-tooltip />
 
         <el-table-column prop="handlingCharge" :label="t('common_list.fee')" width="100" align="right" />
         <el-table-column prop="payType" :label="t('common_list.payModel')" width="120" align="center" />
@@ -492,13 +487,8 @@ onMounted(async () => {
               <el-tag :type="row.status === 4 ? 'success' : 'warning'" effect="plain">
                 {{ row.status === 4 ? t('common_list.received') : t('common_list.refunded') }}
               </el-tag>
-            <el-popover
-              trigger="hover"
-              placement="top"
-              popper-class="refund-popover"
-              width="auto"
-              v-if="row.status === 6"
-            >
+              <el-popover trigger="hover" placement="top" popper-class="refund-popover" width="auto"
+                v-if="row.status === 6">
                 <div class="popover-content">
                   <div class="popover-title">{{ t('common_list.refundDetail') }}</div>
                   <div class="popover-item">
@@ -511,11 +501,8 @@ onMounted(async () => {
                   </div>
                 </div>
                 <template #reference>
-          <img 
-            @click.stop      
-            src="@/assets/SvgIcons/consume.svg" 
-            style="width: 15px; height: 15px; margin-left: 5px; cursor: pointer; display: inline-block;"
-          >
+                  <img @click.stop src="@/assets/SvgIcons/consume.svg"
+                    style="width: 15px; height: 15px; margin-left: 5px; cursor: pointer; display: inline-block;">
                 </template>
               </el-popover>
             </div>
@@ -706,6 +693,7 @@ onMounted(async () => {
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
   width: 100px;
   min-width: none;
+
   .el-popper__arrow::before {
     background-color: #EEF5FE !important;
     border-color: #EEF5FE !important;
@@ -713,7 +701,6 @@ onMounted(async () => {
 }
 </style>
 <style scoped lang="scss">
-
 .popover-content {
   .popover-title {
     color: #409EFF;
@@ -721,6 +708,7 @@ onMounted(async () => {
     font-size: 14px;
     margin-bottom: 8px;
   }
+
   .popover-item {
     display: flex;
     font-size: 13px;
@@ -730,15 +718,18 @@ onMounted(async () => {
     &:last-child {
       margin-bottom: 0;
     }
+
     .label {
       color: #606266;
     }
+
     .value {
       color: #606266;
       margin-left: 4px;
     }
   }
 }
+
 .cash-flow-container {
   display: flex;
   flex-direction: column;

src/views/moneyManage/financialAccount/performanceAttribution.vue

@@ -319,7 +319,11 @@ onMounted( async() => {
     <!-- 表格区域 -->
     <el-card class="table-card">
       <el-table ref="tableRef" :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="t('common_list.id')" min-width="60" align="center" fixed="left" />
+        <el-table-column type="index" :label="t('common_list.id')" min-width="60" align="center" fixed="left" >
+          <template #default="scope">
+            <span>{{ scope.$index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="jwcode" :label="t('common_list.jwcode')" min-width="120" fixed="left" />
         <el-table-column prop="name" :label="t('common_list.name')" min-width="150" show-overflow-tooltip />
         <el-table-column prop="marketName" :label="t('common_list.market')" min-width="120" show-overflow-tooltip />