Merge branch 'master' of http://47.92.161.104:10080/yanliming/jp-charging-station-portal

src/views/charging/chargingOrder-list.vue

@@ -120,6 +120,8 @@
       stripe
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
+      :summary-method="getSummaries"
+      show-summary
     >
       <el-table-column
         prop="outOrderNo"
@@ -138,7 +140,7 @@
         label="用户电话"
       ></el-table-column>
       <el-table-column
-        prop="totalFee"
+        prop="payFee"
         label="充值金额"
       ></el-table-column>
       <el-table-column
@@ -147,9 +149,9 @@
       ></el-table-column>
       <el-table-column  prop="payName"  label="支付方式">
         <template slot-scope="{row}">
-          <sapn v-if="row.payName=='wechat'">微信</sapn>
-          <sapn v-else-if="row.payName=='alipay'">支付宝</sapn>
-          <sapn v-else-if="row.payName=='give'">赠送</sapn>
+          <span v-if="row.payName=='wechat'">微信</span>
+          <span v-else-if="row.payName=='alipay'">支付宝</span>
+          <span v-else-if="row.payName=='give'">赠送</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -213,17 +215,29 @@ import chargingOrderDetail from "./chargingOrder-detail";
 import chargingOrderApi from "@/api/base/chargingOrder";
 import permissionApi from "@/api/sys/permission";
 import "nprogress/nprogress.css"; // progress bar style
+import moment from "moment";
 
 export default {
   name: "baseChargingOrderList",
   data() {
     var self = this;
 
+    const now = new Date();
+    const endTime = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate(),
+      23,
+      59,
+      59
+    );
+    const startTime = new Date(endTime.getTime() - 7 * 24 * 3600 * 1000 + 1000);
+
     return {
       queryModel: {
         phone: "",
         outOrderNo:"",
-        rangeTime:"",
+        rangeTime:[startTime, endTime],
         type:"",
         payName:"",
         payStatus:"20",
@@ -233,6 +247,7 @@ export default {
       },
       loading: false,
       tableData: [],
+      tableSummary: {},
       pageIndex: 1,
       pageSize: 10,
       totalPages: 0,
@@ -302,7 +317,16 @@ export default {
         var formData = new FormData();
 
         formData.append("pageIndex", self.pageIndex);
-        formData.append("rangeTime", self.queryModel.rangeTime);
+
+      if (self.queryModel.rangeTime != null) {
+        formData.append(
+          "rangeTime",
+          moment(self.queryModel.rangeTime[0]).format("yyyy-MM-DD HH:mm:ss") +
+            "," +
+            moment(self.queryModel.rangeTime[1]).format("yyyy-MM-DD HH:mm:ss")
+        );
+      }
+
         formData.append("phone", self.queryModel.phone);
         formData.append("outOrderNo", self.queryModel.outOrderNo);
         formData.append("type", self.queryModel.type);
@@ -330,7 +354,6 @@ export default {
             var jsonData = response.data;
             if(jsonData.result) {
                 if(exportFlag){
-
                     //导出
                     self.$message({
                         showClose: true,
@@ -347,6 +370,7 @@ export default {
                     self.tableData = page.data;
                     self.totalPages = page.totalPages;
                     self.totalElements = page.recordsTotal;
+                    self.tableSummary = page.summary;
                 }
             }
             else{
@@ -506,7 +530,22 @@ export default {
     },
     closeRefundDialog() {
       this.showRefundDialog = false;
-    }
+    },
+    getSummaries(param) {
+      console.log(param);
+      const { columns, data } = param;
+      const sums = [];
+
+      sums[0] = "汇总";
+
+      for (var i = 0; i < columns.length; i++) {
+        if (this.tableSummary[columns[i].property] != null) {
+          sums[i] = this.tableSummary[columns[i].property];
+        }
+      }
+
+      return sums;
+    },
   },
   created() {