1

src/components/FinancialModule/ReportForm/dianshangyeardata.vue

@@ -36,7 +36,7 @@
         </div>
      
       </div>
-      <div style="padding: 15px ;background: #FFF;">
+      <div style="padding: 15px ;background: #FFF;margin-bottom: 50px;">
    
         <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>
@@ -607,7 +607,9 @@
         background: rgb(255, 255, 255);
         margin-top: 20px;
     }   
-    
+    .dianshangyeardata tr{
+        height: 30px !important;
+    }
   
   </style>
   
\ No newline at end of file

src/components/FinancialModule/ReportForm/onlineRetailersdata.vue

@@ -31,42 +31,8 @@
         </div>
      
       </div>
-      <div style="padding: 15px ;background: #FFF;">
-        <!-- <el-table :data="averageData" v-loading="loading" header-cell-class-name="headClass" style="width: 100%" border header-row-class-name='angclass' row-class-name="angclass">
-          <el-table-column label="" prop="OrderNo" width='80' >
-            <template slot-scope="scope">
-              <span>平均</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="平均付款人数(天)" prop='AvgPeopleNum' width='125'></el-table-column>
-          <el-table-column label="平均付款单数" prop="AvgOrderNum" width='125'></el-table-column>
-          <el-table-column label="平均付款金额" prop="AvgPayMoney" width='120'></el-table-column>
-          <el-table-column label="平均购买件数" prop="AvgBuyNum" width='120'></el-table-column>
-  
-          <el-table-column label="平均每人购买单数" prop="AvgAvgOrderNum" width='125'></el-table-column>
-          <el-table-column label="平均每人购买件数" prop="AvgAvgBuyNum" width='125'></el-table-column>
-          <el-table-column label="平均每单单价" prop="AvgAvgUnitPrice" width='120'></el-table-column>
-          <el-table-column label="平均每人购买单价" prop="AvgAvgBuyPrice" width='125'></el-table-column>
-          <el-table-column label="平均会员累计数" prop="AvgMemberNum" width='120'></el-table-column>
-          <el-table-column label="平均付款累计人数" prop="AvgPaymentNum" width='125'></el-table-column>
-          <el-table-column label="平均会员下订单转换率" prop="AvgMOrderRate" width='155'>
-            <template slot-scope="scope">
-              <span>{{scope.row.AvgMOrderRate}}%</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="平均复购人数" prop="AvgReBuyNum" width='120'></el-table-column>
-          <el-table-column label="平均复购率" prop="AvgReBuyRate" width='120'>
-            <template slot-scope="scope">
-              <span>{{scope.row.AvgReBuyRate}}%</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="平均新人下单" prop="AvgNewPeopleNum" width='120'></el-table-column>
-          <el-table-column label="平均普象" prop="AvgPXNum" width='90'></el-table-column>
-          <el-table-column label="平均VIP" prop="AvgVipNum" width='90'></el-table-column>
-          <el-table-column label="平均银象" prop="AvgYXNum" width='90'></el-table-column>
-          <el-table-column label="平均金象" prop="AvgJXNum" width='90'></el-table-column>
-       
-      </el-table> -->
+      <div style="padding: 15px ;background: #FFF;margin-bottom: 50px;">
+     
         <el-table :data="RList" v-loading="loading"  header-cell-class-name="headClass" style="width: 100%;" border :row-class-name="tableRowClassName" :cell-style="columnStyle">
           <el-table-column label="" prop="DateStr" width='80' fixed>
             <template slot-scope="scope">
@@ -184,21 +150,30 @@
           </el-table-column>
        
       </el-table>
-        
-        <el-table :data="averageData" v-loading="loading" header-cell-class-name="headClass" style="width: 580px;margin-top: 20px;" border  header-row-class-name='angclass' row-class-name="angclass">
-          <el-table-column label="" prop="OrderNo" width='80' fixed>
-            <template slot-scope="scope">
-              <span>月小计</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="付款人数累计" prop='TotalPeopleNum' width='125'></el-table-column>
-          <el-table-column label="付款单数累计" prop="TotalOrderNum" width='125'></el-table-column>
-          <el-table-column label="付款金额累计" prop="TotalPayMoney" width='120'></el-table-column>
-          <el-table-column label="购买件数累计" prop="TotalBuyNum" ></el-table-column>
+        <div style="display: flex;margin-top: 20px;">
+          <el-table :data="averageData" v-loading="loading" header-cell-class-name="headClass" style="width: 580px !important;" border  header-row-class-name='angclass' row-class-name="angclass">
+            <el-table-column label="" prop="OrderNo"  fixed>
+              <template slot-scope="scope">
+                <span>月小计</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="付款人数累计" prop='TotalPeopleNum' ></el-table-column>
+            <el-table-column label="付款单数累计" prop="TotalOrderNum" ></el-table-column>
+            <el-table-column label="付款金额累计" prop="TotalPayMoney" ></el-table-column>
+            <el-table-column label="购买件数累计" prop="TotalBuyNum" ></el-table-column>
+        </el-table>
+        <el-table :data="averageData" v-loading="loading" header-cell-class-name="headClass" style="width: 580px !important;margin-left: 20px;" border  header-row-class-name='angclass' row-class-name="angclass">
+          <el-table-column label="普象累计" prop="TotalPXNum"  fixed></el-table-column>
+          <el-table-column label="VIP累计" prop='TotalVIPNum' ></el-table-column>
+          <el-table-column label="银象累計" prop="TotalYXNum" ></el-table-column>
+          <el-table-column label="金象累计" prop="TotalJXNum" ></el-table-column>
+          <el-table-column label="会员总数" prop="TotalBuyNum" ></el-table-column>
   
       
        
       </el-table>
+        </div>
+        
       </div>