1

src/components/FinancialModule/ReportForm/dianshangyeardata.vue

@@ -38,9 +38,12 @@
       </div>
       <div style="padding: 15px ;background: #FFF;">
    
-        <el-table :data="DataList" v-loading="loading"  header-cell-class-name="headClass" style="width: 100%;" border :row-class-name="tableRowClassName" :cell-style="columnStyle">
+        <el-table :data="DataList" v-loading="loading"  header-cell-class-name="headClass" header-row-class-name='angclass' style="width: 100%;" border :row-class-name="tableRowClassName" :cell-style="columnStyle">
           <el-table-column label="月份" prop="Date" width='80' fixed>
-           
+            <template slot-scope="scope">
+              <span v-if="scope.row.Date == '平均/总计'" >平均</span>
+              <span v-else>{{scope.row.Date}}</span>
+            </template>
           </el-table-column>
           <el-table-column label="平均付款人数(天)" prop='MAvgPeopleNum' width='125'>
             <template slot-scope="scope">
@@ -132,7 +135,14 @@
               <span v-else>{{scope.row.PAvgProfitRate}}</span>
             </template>
           </el-table-column>       
-
+      </el-table>
+      <el-table :data="DataList" v-loading="loading"  header-cell-class-name="headClass" header-row-class-name='angclass' style="width: 100%;margin-top: 20px;" border :row-class-name="tableRowClassName2" :cell-style="columnStyle">
+        <el-table-column label="月份" prop="Date" width='80' fixed>
+          <template slot-scope="scope">
+            <span v-if="scope.row.Date == '平均/总计'" >总计</span>
+            <span v-else>{{scope.row.Date}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="付款人数累计" prop="PeopleNum" width='120'>
           <template slot-scope="scope">
             <span v-if="getisred(scope.row.PeopleNum) == true" style="color: #FD0F05;">{{scope.row.PeopleNum}}</span>
@@ -358,6 +368,7 @@
             return
           }
           this.loading = true;
+          this.RateList=[];
           this.mallapipost("/api/LiveHouse/GetDSMoreMonthStatistics", this.msg, res => {
             this.loading = false;
             if (res.data.resultCode == 1) {
@@ -411,12 +422,19 @@
 
         },
         tableRowClassName({row, rowIndex}){
-          if(row.hasOwnProperty('Date') && row.Date=='平均' ){
+          if(row.hasOwnProperty('Date') && row.Date=='平均/总计' ){
             return 'huanbichengz'
           }else{
             return 'monthstyel'
           }
         },
+        tableRowClassName2({row, rowIndex}){
+          if(row.hasOwnProperty('Date') && row.Date=='平均/总计' ){
+            return 'monthstyel2'
+          }else{
+            return 'monthstyel3'
+          }
+        },
         columnStyle({row, column, rowIndex, columnIndex}){
           if(row.hasOwnProperty('DateStr') && (columnIndex==1|| columnIndex==2||columnIndex==3||columnIndex==4)){
               return 'background:#FFF;'
@@ -558,7 +576,7 @@
       flex-direction: column;
       align-items: center;
     }
-    .dianshangyeardata .el-table .angclass{
+    .dianshangyeardata  .angclass{
       background: #FDC022;
     }
     .dianshangyeardata .el-table .huanbichengz{
@@ -571,6 +589,13 @@
     .dianshangyeardata .el-table .monthstyel{
       background: #F6C8AB;
     }
+    .dianshangyeardata .el-table .monthstyel2{
+      background: #F6CAAD;
+    }
+    .dianshangyeardata .el-table .monthstyel3{
+      background: #FE9A6B;
+    }
+    
     .dianshangyeardata .el-table .whitestyle{
       background: #FFF;
     }

src/router/config.js

@@ -3956,9 +3956,18 @@ export default {
               name: 'dianshangyeardata',
               component: resolve => require(['@/components/FinancialModule/ReportForm/dianshangyeardata'], resolve),
               meta: {
-                title: '电商数据'
+                title: '年度电商数据'
+              },
             },
+            { //财务 电商年度比数据
+              path: '/dianshangannualRatio',
+              name: 'dianshangannualRatio',
+              component: resolve => require(['@/components/FinancialModule/ReportForm/dianshangannualRatio'], resolve),
+              meta: {
+                title: '电商年度比数据'
               },
+            },
+            
             { //财务 线路收客
               path: '/LineReceiver',
               name: 'LineReceiver',