交互

王飞
1 parent 61f89c44
Showing 7 changed files with 647 additions and 317 deletions
.env.development
src/api/account.js
src/api/index.js
src/filters/index.js
src/views/account/index.vue
src/views/dashboard/index.vue
src/views/order/index.vue
@@ -2,9 +2,9 @@
 ENV = 'development'
 # base api '/dev-api'
-#VUE_APP_BASE_API = 'http://test.renniting.cn/bcp/'
+VUE_APP_BASE_API = 'http://test.renniting.cn/bcp/'
-VUE_APP_BASE_API = 'http://127.0.0.1:8099'
+#VUE_APP_BASE_API = 'http://127.0.0.1:8099'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
+import request from '@/utils/request'
+
+/**
+ * 获取车主账户
+ * @param param
+ */
+export function getAcctPersonGroupByAcctType(param) {
+  return request({
+    url: '/personPc/acct/getAcctPersonGroupByAcctType',
+    method: 'post',
+    data:param
+  })
+}
+/**
+ * 分页查询车主支出详情
+ * @param param
+ */
+export function queryAcctPayOutForPage(param) {
+  return request({
+    url: '/personPc/acct/queryAcctPayOutForPage',
+    method: 'post',
+    data:param
+  })
+}
+/**
+ * 分页查询车主收费端充值的收入详情"
+ * @param param
+ */
+export function queryCustRechargeFeeStaticMsg(param) {
+  return request({
+    url: '/personPc/acct/queryCustRechargeFeeStaticMsg',
+    method: 'post',
+    data:param
+  })
+}
+import request from '@/utils/request'
+
+/**
+ * 获取车主首页卡片信息
+ * @param param
+ */
+export function getCustIndexBaseInfo(param) {
+  return request({
+    url: '/personPc/index/getCustIndexBaseInfo',
+    method: 'post',
+    data:param
+  })
+}
+/**
+ * 获取车主月支出
+ * @param param
+ */
+export function queryOwnerPayOutByMonth(param) {
+  return request({
+    url: '/personPc/index/queryOwnerPayOutByMonth',
+    method: 'post',
+    data:param
+  })
+}
+/**
+ * 获取车主停车记录
+ * @param param
+ */
+export function queryOwnerParkRecord(param) {
+  return request({
+    url: '/personPc/index/queryOwnerParkRecord',
+    method: 'post',
+    data:param
+  })
+}
@@ -235,3 +235,110 @@ export function payOrderTypeFomatter(row,value){
     return '未知';
   }
 };
+
+/**
+ * 订单状态
+ * @param row
+ * @param value
+ * @returns {string}
+ */
+export function inOutStateFormatter(row, value) {
+
+  let orderState = row.orderState;
+  //停车状态 10:在场 ,20:离场，30:预订
+  let parkState = row.parkState;
+  if (null == parkState) {
+    if (null != row.parkOutTime) {
+      parkState = 20;
+    } else {
+      parkState = 10;
+    }
+  }
+
+  if (parkState == 10) {
+    return "在场";
+  }
+
+  if (parkState == 20) {
+
+    if (orderState == 52) {
+      return "欠费";
+    } else {
+      return "离场";
+    }
+  }
+};
+
+/**
+ * 停车时长
+ * @param row
+ * @param value
+ * @returns {*}
+ */
+export function parkingDurationFormatter (row, value) {
+  //
+  let parkState = row.parkState;
+  if (null == parkState) {
+    if (null != row.parkOutTime) {
+      parkState = 20;
+    } else {
+      parkState = 10;
+    }
+  }
+
+  let inTime = row.parkInTime;
+  if (parkState == 10) {
+    let thisTime = new Date().getTime();
+    let parkDuration = (thisTime - inTime) / 1000;
+    return formatSeconds(parkDuration);
+  }
+
+
+  if (value == null) {
+    return "";
+  } else {
+    return formatSeconds(value);
+  }
+};
+function formatSeconds(value) {
+  let theTime = parseInt(value);// 秒
+  let theTime1 = 0;// 分
+  let theTime2 = 0;// 小时
+  let theTime3 = 0;//天
+  if (theTime < 60) {
+    return theTime + '秒';
+  }
+  if (theTime > 60) {
+    theTime1 = parseInt(theTime / 60);
+    theTime = parseInt(theTime % 60);
+
+
+  }
+
+  if (theTime1 > 60) {
+    theTime2 = parseInt(theTime1 / 60);
+    theTime1 = parseInt(theTime1 % 60);
+  }
+
+  if (theTime2 > 24) {
+    theTime3 = parseInt(theTime2 / 24);
+    theTime2 = parseInt(theTime2 % 24);
+  }
+
+  let result = '';
+  if (theTime1 == 0 && theTime2 == 0 && theTime3 == 0) {
+    result = parseInt(theTime) + "秒"
+  }
+
+  if (theTime1 > 0) {
+    result = "" + parseInt(theTime1) + "分钟" + result;
+  }
+  if (theTime2 > 0) {
+    result = "" + parseInt(theTime2) + "小时" + result;
+  }
+
+  if (theTime3 > 0) {
+    result = "" + parseInt(theTime3) + "天" + result;
+  }
+  return result;
+};
@@ -10,7 +10,7 @@
             </el-col>
             <el-col :span="12" :offset="4">
               <el-row :gutter="16"><el-col :span="24">充值账户(元)</el-col></el-row>
-              <el-row :gutter="16" class="common-color font-size24" style="margin-top: 4px"><el-col :span="24">240.0</el-col></el-row>
+              <el-row :gutter="16" class="common-color font-size24" style="margin-top: 4px"><el-col :span="24">{{rechargeBalance|fen2Yuan}}</el-col></el-row>
             </el-col>
           </el-row>
         </el-card>
@@ -23,7 +23,7 @@
             </el-col>
             <el-col :span="12" :offset="4">
               <el-row :gutter="16"><el-col :span="24">赠送账户(元)</el-col></el-row>
-              <el-row :gutter="16" class="common-color font-size24" style="margin-top: 4px"><el-col :span="24">140.0</el-col></el-row>
+              <el-row :gutter="16" class="common-color font-size24" style="margin-top: 4px"><el-col :span="24">{{presentBalance|fen2Yuan}}</el-col></el-row>
             </el-col>
           </el-row>
         </el-card>
@@ -34,70 +34,114 @@
       <el-tabs :tab-position="tabPosition" >
         <el-tab-pane label="充值记录">
           <el-table
-            :data="paytableData"
+            :data="rechargeTableData"
             style="width: 100%;"
             :show-overflow-tooltip="true">
             <el-table-column
-              prop="parkName"
+              prop="acctType"
               label="账户类型"
               :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span v-if="scope.row.acctType == 1">账户余额</span>
+                <span v-if="scope.row.acctType == 7">充值赠送</span>
+              </template>
             </el-table-column>
             <el-table-column
-              prop="license"
+              prop="rechargeFee"
               label="充值金额"
               :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span>{{(scope.row.rechargeFee) |fen2Yuan}} </span>
+              </template>
             </el-table-column>
             <el-table-column
-              prop="money"
+              prop="rechargeBalance"
               label="充值后余额">
+              <template slot-scope="scope">
+                <span>{{(scope.row.rechargeBalance) |fen2Yuan}} </span>
+              </template>
             </el-table-column>
             <el-table-column
-              prop="inTime"
+              prop="rechargeTime"
               label="充值时间"
               :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span>{{(scope.row.rechargeTime) |string2Date(7)}} </span>
+              </template>
             </el-table-column>
           </el-table>
           <el-pagination
             :page-size="10"
             :pager-count="11"
             layout="prev, pager, next"
-            :total="total">
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleSizeChange"
+            @prev-click="handleSizeChange"
+            @next-click="handleSizeChange">
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="支出记录">
           <el-table
-            :data="outtableData"
+            :data="payOutTableData"
             style="width: 100%;"
             :show-overflow-tooltip="true">
             <el-table-column
-              prop="parkName"
+              prop="acctType"
               label="账户类型"
               :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span v-if="scope.row.acctType == 1">账户余额</span>
+                <span v-if="scope.row.acctType == 7">充值赠送</span>
+              </template>
             </el-table-column>
             <el-table-column
-              prop="license"
+              prop="tradeFee"
               label="交易金额"
               :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span>{{(scope.row.tradeFee) |fen2Yuan}} </span>
+              </template>
             </el-table-column>
             <el-table-column
-              prop="money"
+              prop="tradeBalance"
               label="交易后余额">
+              <template slot-scope="scope">
+                <span>{{(scope.row.tradeBalance) |fen2Yuan}} </span>
+              </template>
             </el-table-column>
             <el-table-column
-              prop="outtype"
+              prop="tradeDetialType"
               label="交易类型">
+              <template slot-scope="scope">
+                <span v-if="scope.row.tradeDetialType == 101">停车支付</span>
+                <span v-if="scope.row.tradeDetialType == 102">停车预付</span>
+                <span v-if="scope.row.tradeDetialType == 103">停车补缴</span>
+                <span v-if="scope.row.tradeDetialType == 104">共享车位</span>
+                <span v-if="scope.row.tradeDetialType == 201">余额充值</span>
+                <span v-if="scope.row.tradeDetialType == 202">押金充值</span>
+                <span v-if="scope.row.tradeDetialType == 301">会员卡购买</span>
+                <span v-if="scope.row.tradeDetialType == 302">会员卡续费</span>
+              </template>
             </el-table-column>
             <el-table-column
-              prop="inTime"
+              prop="tradeTime"
               label="交易时间"
               :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span>{{(scope.row.tradeTime) |string2Date(7)}} </span>
+              </template>
             </el-table-column>
           </el-table>
           <el-pagination
             :page-size="10"
             :pager-count="21"
             layout="prev, pager, next"
-            :total="total">
+            :total="total2"
+            @size-change="handleSizeChange2"
+            @current-change="handleSizeChange2"
+            @prev-click="handleSizeChange2"
+            @next-click="handleSizeChange2">
           </el-pagination>
         </el-tab-pane>
       </el-tabs>
@@ -111,7 +155,8 @@
 import pagination from '@/components/Pagination/index.vue';
 import LoadingBar from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-
+import {getAcctPersonGroupByAcctType,queryCustRechargeFeeStaticMsg,queryAcctPayOutForPage} from '@/api/account';
+import {fen2Yuan,string2Date} from '@/filters/index';
 export default {
   components:{
     'i-pagination': pagination
@@ -121,101 +166,140 @@ export default {
   },
   data() {
     return {
+      rechargeBalance:0,
+      presentBalance:0,
       list: null,
       tabPosition:'top',
       listLoading: true,
       btnLoading:false,
       loading:false,
-      paytableData: [
-        {
-          parkName: '个人账户',
-          license: '21',
-          money: '31',
-          inTime: '2019-06-02 09:00:00',
-        },
-        {
-          parkName: '个人账户',
-          license: '10',
-          money: '31',
-          inTime: '2019-06-02 00:23:00',
-        },
-        {
-          parkName: '个人账户',
-          license: '21',
-          money: '31',
-          inTime: '2019-06-02 09:00:00',
-        },
-        {
-          parkName: '个人账户',
-          license: '10',
-          money: '31',
-          inTime: '2019-06-02 00:23:00',
-        },{
-          parkName: '个人账户',
-          license: '10',
-          money: '31',
-          inTime: '2019-06-02 00:23:00',
-        },
+      rechargeTableData: [
       ],
-      outtableData: [
-        {
-          parkName: '个人账户',
-          license: '21',
-          money: '31',
-          outtype: '停车支付',
-          inTime: '2019-06-02 09:00:00',
-        },
-        {
-          parkName: '个人账户',
-          license: '10',
-          money: '31',
-          outtype: '停车支付',
-          inTime: '2019-06-02 00:23:00',
-        },
-        {
-          parkName: '个人账户',
-          license: '21',
-          money: '31',
-          outtype: '停车支付',
-          inTime: '2019-06-02 09:00:00',
-        },
-        {
-          parkName: '个人账户',
-          license: '10',
-          money: '31',
-          outtype: '停车支付',
-          inTime: '2019-06-02 00:23:00',
-        },
+      payOutTableData: [
       ],
       /** 分页*/
-      total: 32,
+      total: 0,
       currentPage: 1,
       pageSize: 10,
+      total2: 0,
+      currentPage2: 1,
+      pageSize2: 10,
     }
   },
-  computed: {
+  mounted: function() {
+    this.getAcctPersonGroupByAcctType();
+    this.queryCustRechargeFeeStaticMsg();
+    this.queryAcctPayOutForPage();
   },
-  created() {
-  },
-  mounted:function () {
-  },
   methods: {
-    queryBtn:function () {
-      LoadingBar.start();
-      this.btnLoading=true;
-      this.loading = true;
+    /**
+     * 获取查询参数
+     */
+    getQueryParams: function() {
+      let userInfo = this.$store.state.user.userInfo;
+      let beginTime = new Date();
+      let endTime = new Date();
+      beginTime.setFullYear(2017);
+
+      let req = {
+        beginTime:beginTime,
+        endTime:endTime,
+        sysCode:'10003',
+        custId:userInfo.custId,
+        // custId:'501519113641649119232',//账户支出
+        //custId:'501522943145292840960',//账户充值
+
+      }
+      return req;
+    },
+    /**
+     * 查询车主账户信息
+     */
+    getAcctPersonGroupByAcctType: function() {
+      let req = this.getQueryParams();
+      getAcctPersonGroupByAcctType(req).then(response =>{
+        if(response.code=='8888'){
+          let data = response.data;
+          let rechargeBalance = 0;
+          let presentBalance = 0;
+          data.forEach(item=>{
+            if(item.acctType == 1){
+              rechargeBalance += item.acctBalance;
+            }
+            if(item.acctType == 7){
+              presentBalance += item.acctBalance;
+            }
+          });
+          this.rechargeBalance = rechargeBalance;
+          this.presentBalance = presentBalance;
+        }else{
+          console.log(response);
+        }
+      });
     },
-    /**获取子组件页码方法*/
-    handleSizeChange: function(pages) {
-      this.currentPage = pages.page;
-      this.pageSize = pages.limit;
+    /**
+     * 查询车主充值记录
+     */
+    queryCustRechargeFeeStaticMsg: function() {
+      let req = this.getQueryParams();
+      req.baseRequest={
+        pageNum:this.currentPage,
+        pageSize:this.pageSize,
+      },
+      queryCustRechargeFeeStaticMsg(req).then(response =>{
+        if(response.code=='8888'){
+          this.rechargeTableData = response.data.rows;
+          this.total = response.data.total;
+        }else{
+          console.log(response);
+        }
+
+      });
+    },
+
+    /**
+     * 查询车主支出记录
+     */
+    queryAcctPayOutForPage: function() {
+      let req = this.getQueryParams();
+
+      req.baseRequest={
+        pageNum:this.currentPage2,
+        pageSize:this.pageSize2,
+      },
+        queryAcctPayOutForPage (req).then(response =>{
+          if(response.code=='8888'){
+            this.payOutTableData = response.data.rows;
+            this.total2 = response.data.total;
+          }else{
+            console.log(response);
+          }
+
+        });
+    },
+    // 获取子组件页码方法
+    handleSizeChange: function(page) {
+      console.log(page)
+      this.currentPage = page;
       /** 调用表格数据.*/
-      this.queryBtn();
+      this.queryCustRechargeFeeStaticMsg();
+
     },
+    // 获取子组件页码方法
+    handleSizeChange2: function(page) {
+      console.log(page)
+      this.currentPage2 = page;
+      /** 调用表格数据.*/
+      this.queryAcctPayOutForPage();
+
+    },
+
+  },
+
+
-  }
 }
 </script>
 <style lang="scss" scoped >
@@ -8,10 +8,10 @@
           </div>
           <div class="card-panel-description">
             <div class="card-panel-text">
-              本月订单： 21
+              本月订单： {{cardData.monthOrderNum}}
             </div>
             <div class="card-panel-text">
-              订单总量： 1231
+              订单总量： {{cardData.totalOrderNum}}
             </div>
           </div>
         </div>
@@ -23,10 +23,10 @@
           </div>
           <div class="card-panel-description">
             <div class="card-panel-text">
-              可用卡券： 101
+              可用卡券： {{cardData.validCouponNum}}
             </div>
             <div class="card-panel-text">
-              卡券总量： 332
+              卡券总量： {{cardData.totalCouponNum}}
             </div>
           </div>
         </div>
@@ -38,10 +38,10 @@
           </div>
           <div class="card-panel-description">
             <div class="card-panel-text">
-              可用积分： 21
+              可用积分： {{cardData.validScore}}
             </div>
             <div class="card-panel-text">
-              全部积分： 231
+              全部积分： {{cardData.totalScore}}
             </div>
           </div>
         </div>
@@ -115,158 +115,230 @@
         style="width: 100%;"
         :show-overflow-tooltip="true">
         <el-table-column
-          prop="parkName"
+          prop="plName"
           label="停车场"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="license"
+          prop="carNumber"
           label="车牌"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="money"
+          prop="orderActFee"
           label="停车费">
+          <template slot-scope="scope">
+            <span>{{(scope.row.orderActFee) |fen2Yuan}} </span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="inTime"
+          prop="parkInTime"
           label="入场时间"
           :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{(scope.row.parkInTime) |string2Date(7)}} </span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="outTime"
+          prop="parkOutTime"
           label="出场时间"
           :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{(scope.row.parkOutTime) |string2Date(7)}} </span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="duration"
+          prop="parkingDuration"
           label="停车时长"
           :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{(scope.row) |parkingDurationFormatter(scope.row.parkingDuration)}} </span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="berthNum"
+          prop="berthNo"
           label="泊位编号">
         </el-table-column>
         <el-table-column
-          prop="status"
+          prop="orderState"
           label="订单状态">
+          <template slot-scope="scope">
+            <span>{{(scope.row) |inOutStateFormatter}} </span>
+          </template>
         </el-table-column>
       </el-table>
       <el-pagination
         :page-size="10"
         :pager-count="11"
         layout="prev, pager, next"
-        :total="total">
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleSizeChange"
+        @prev-click="handleSizeChange"
+        @next-click="handleSizeChange"
+      >
       </el-pagination>
     </div>
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'Dashboard',
-  computed: {
-    ...mapGetters([
-      'name'
-    ])
-  },
-  data() {
-    return {
-      total: 15,
-      currentPage: 1,
-      pageSize: 10,
-      moneyData: [{
-        name: '消费金额',
-        january: '123411',
-        february: '9787162',
-        march: '123097',
-        april: '82713',
-        may: '1239789',
-        june: '81273',
-        july: '129387',
-        august: '1298778',
-        september: '1239878',
-        october: '76765',
-        november: '123124',
-        december: '12341'
-      }],
-      orderData: [
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
+  import { mapGetters } from 'vuex'
+  import {getCustIndexBaseInfo,queryOwnerPayOutByMonth,queryOwnerParkRecord} from '@/api/index';
+  import {fen2Yuan,string2Date,inOutStateFormatter,parkingDurationFormatter} from '@/filters/index';
+  export default {
+    name: 'Dashboard',
+    computed: {
+      ...mapGetters([
+        'name'
+      ])
+    },
+    data() {
+      return {
+        cardData: {
+          totalOrderNum: 0,
+          monthOrderNum: 0,
+          totalCouponNum: 0,
+          validCouponNum: 0,
+          totalScore: 0,
+          validScore: 0,
         },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
+        total: 15,
+        currentPage: 1,
+        pageSize: 10,
+        moneyData: [{
+          name: '消费金额',
+          january: '0',
+          february: '0',
+          march: '0',
+          april: '0',
+          may: '0',
+          june: '0',
+          july: '0',
+          august: '0',
+          september: '0',
+          october: '0',
+          november: '0',
+          december: '0'
+        }],
+        orderData: [],
+      }
+    },
+
+    mounted: function() {
+      this.getCustIndexBaseInfo();
+      this.queryOwnerPayOutByMonth();
+      this.queryOwnerParkRecord();
+    },
+
+    methods: {
+      /**
+       * 获取查询参数
+       */
+      getQueryParams: function() {
+        let userInfo = this.$store.state.user.userInfo;
+        let beginTime = new Date();
+        let endTime = new Date();
+        beginTime.setMonth(0);
+        beginTime.setDate(1);
+        endTime.setMonth(11);
+        endTime.setDate(31);
+
+        let req = {
+          custId:userInfo.custId,
+          //custId:'501519113641649119232',
+          beginTime:beginTime,
+          endTime:endTime,
+        }
+        return req;
+      },
+      /**
+       * 查询首页卡片信息
+       */
+      getCustIndexBaseInfo: function() {
+        let req = this.getQueryParams();
+        getCustIndexBaseInfo(req).then(response =>{
+          if(response.code=='8888'){
+            let data = response.data;
+            this.cardData.totalOrderNum = data.totalOrderNum == null ? 0: data.totalOrderNum;
+            this.cardData.monthOrderNum = data.monthOrderNum == null ? 0: data.monthOrderNum;
+            this.cardData.totalCouponNum = data.totalCouponNum == null ? 0: data.totalCouponNum;
+            this.cardData.validCouponNum = data.validCouponNum == null ? 0: data.validCouponNum;
+            this.cardData.totalScore = data.totalScore == null ? 0: data.totalScore;
+            this.cardData.validScore = data.validScore == null ? 0: data.validScore;
+          }else{
+            console.log(response);
+          }
+
+        });
+      },
+      /**
+       * 查询首页月支出信息
+       */
+      queryOwnerPayOutByMonth: function() {
+        let req = this.getQueryParams();
+
+        queryOwnerPayOutByMonth(req).then(response =>{
+          if(response.code=='8888'){
+            let data = response.data;
+            this.moneyData[0].january = fen2Yuan(data[0].fee);
+            this.moneyData[0]. february = fen2Yuan(data[1].fee);
+            this.moneyData[0]. march = fen2Yuan(data[2].fee);
+            this.moneyData[0]. april = fen2Yuan(data[3].fee);
+            this.moneyData[0]. may = fen2Yuan(data[4].fee);
+            this.moneyData[0]. june = fen2Yuan(data[5].fee);
+            this.moneyData[0]. july = fen2Yuan(data[6].fee);
+            this.moneyData[0]. august = fen2Yuan(data[7].fee);
+            this.moneyData[0]. september = fen2Yuan(data[8].fee);
+            this.moneyData[0]. october = fen2Yuan(data[9].fee);
+            this.moneyData[0]. november =fen2Yuan( data[10].fee);
+            this.moneyData[0]. december = fen2Yuan(data[11].fee);
+
+          }else{
+            console.log(response);
+          }
+
+        });
+      },
+
+      /**
+       * 查询首页订单信息
+       */
+      queryOwnerParkRecord: function() {
+        let req = this.getQueryParams();
+        //查询最近三个月的
+        let beginTime = new Date();
+        let endTime = new Date();
+        beginTime.setMonth(beginTime.getMonth() - 3);
+        req.beginTime = beginTime;
+        req.endTime = endTime;
+        req.baseRequest={
+            pageNum:this.currentPage,
+            pageSize:this.pageSize,
         },
-      ]
-    }
+        queryOwnerParkRecord (req).then(response =>{
+          if(response.code=='8888'){
+              this.orderData = response.data.dataList;
+              this.total = response.data.pageTotals;
+          }else{
+            console.log(response);
+          }
+
+        });
+      },
+      // 获取子组件页码方法
+      handleSizeChange: function(page) {
+        console.log(page)
+        this.currentPage = page;
+        /** 调用表格数据.*/
+        this.queryOwnerParkRecord();
+
+      },
+
+
+    },
+
   }
-}
 </script>
 <style lang="scss" scoped>
@@ -3,30 +3,30 @@
     <div class="serch-wrap">
       <el-row :gutter="20">
         <el-form ref="form" :model="form" label-width="60px" label-position="left">
-          <el-col :xs="8" :sm="6" :md="7" :lg="7" :xl="1">
+          <!--<el-col :xs="8" :sm="6" :md="7" :lg="7" :xl="1">-->
-            <el-form-item label="停车场">
-              <el-select v-model="form.region" placeholder="请选择停车场">
-                <el-option label="停车场BA" value="shanghai"/>
-                <el-option label="停车场" value="beijing"/>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item label="停车场">-->
+              <!--<el-select v-model="form.plNos" placeholder="请选择停车场">-->
+                <!--<el-option label="停车场BA" value="shanghai"/>-->
+                <!--<el-option label="停车场" value="beijing"/>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
-          </el-col>
+          <!--</el-col>-->
           <el-col :xs="8" :sm="6" :md="7" :lg="7" :xl="1">
             <el-form-item label="车牌">
-              <el-input v-model="form.name" maxlength="10" />
+              <el-input v-model="form.carNum" maxlength="10" />
             </el-form-item>
           </el-col>
-          <el-col :xs="8" :sm="6" :md="7" :lg="7" :xl="1">
-            <el-form-item label="类型">
-              <el-select v-model="form.region" placeholder="请选择类型">
-                <el-option label="室内停车场" value="shanghai"/>
-                <el-option label="路侧停车场" value="beijing"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="8" :sm="6" :md="3" :lg="3" :xl="1">
+          <!--<el-col :xs="8" :sm="6" :md="7" :lg="7" :xl="1">-->
+            <!--<el-form-item label="类型">-->
+              <!--<el-select v-model="form.region" placeholder="请选择类型">-->
+                <!--<el-option label="室内停车场" value="shanghai"/>-->
+                <!--<el-option label="路侧停车场" value="beijing"/>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+          <el-col :xs="8" :sm="6" :md="3" :lg="3" :xl="1" >
             <el-button type="primary" @click="onSubmit">查询</el-button>
           </el-col>
         </el-form>
@@ -40,147 +40,144 @@
         style="width: 100%;"
         :show-overflow-tooltip="true">
         <el-table-column
-          prop="parkName"
+          prop="plName"
           label="停车场"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="license"
+          prop="carNumber"
           label="车牌"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="money"
+          prop="orderActFee"
           label="停车费">
+          <template slot-scope="scope">
+            <span>{{(scope.row.orderActFee) |fen2Yuan}} </span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="inTime"
-          label="进场时间"
+          prop="parkInTime"
+          label="入场时间"
           :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{(scope.row.parkInTime) |string2Date(7)}} </span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="outTime"
+          prop="parkOutTime"
           label="出场时间"
           :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{(scope.row.parkOutTime) |string2Date(7)}} </span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="duration"
+          prop="parkingDuration"
           label="停车时长"
           :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{(scope.row) |parkingDurationFormatter(scope.row.parkingDuration)}} </span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="berthNum"
+          prop="berthNo"
           label="泊位编号">
         </el-table-column>
         <el-table-column
-          prop="status"
+          prop="orderState"
           label="订单状态">
+          <template slot-scope="scope">
+            <span>{{(scope.row) |inOutStateFormatter}} </span>
+          </template>
         </el-table-column>
       </el-table>
       <el-pagination
         :page-size="10"
         :pager-count="11"
         layout="prev, pager, next"
-        :total="total">
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleSizeChange"
+        @prev-click="handleSizeChange"
+        @next-click="handleSizeChange"
+      >
       </el-pagination>
     </div>
   </div>
 </template>
 <script>
+  import {queryOwnerParkRecord} from '@/api/index';
+  import {fen2Yuan,string2Date,inOutStateFormatter,parkingDurationFormatter} from '@/filters/index';
 export default {
   data() {
     return {
       form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
+        plNos: null,
+        carNum: null,
+
       },
-      total: 55,
+      total: 0,
       currentPage: 1,
       pageSize: 10,
       orderData: [
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
-        {
-          parkName: '承德老二中停车场',
-          license: '冀H7517732',
-          money: '31',
-          inTime: '2019-06-02 00:00:00',
-          outTime: '2019-06-01 08:00:00',
-          duration: '2小时28分钟43秒',
-          berthNum: 'A1212231',
-          status: '完成'
-        },
       ]
     }
   },
+  mounted: function() {
+
+    this.queryOwnerParkRecord();
+  },
   methods: {
+    /**
+     * 获取查询参数
+     */
+    getQueryParams: function() {
+      let userInfo = this.$store.state.user.userInfo;
+      let plNos = [];
+      if(this.form.plNos != null && this.form.plNos != ''){
+        plNos.push(this.form.plNos);
+      }
+      let req = {
+        custId:userInfo.custId,
+        // custId:'501519113641649119232',
+        plNos:plNos,
+        carNum:this.form.carNum,
+      }
+      return req;
+    },
+    /**
+     * 查询订单信息
+     */
+    queryOwnerParkRecord: function() {
+      let req = this.getQueryParams();
+
+      req.baseRequest={
+        pageNum:this.currentPage,
+        pageSize:this.pageSize,
+      },
+        queryOwnerParkRecord (req).then(response =>{
+          if(response.code=='8888'){
+            this.orderData = response.data.dataList;
+            this.total = response.data.pageTotals;
+          }else{
+            console.log(response);
+          }
+
+        });
+    },
+    // 获取子组件页码方法
+    handleSizeChange: function(page) {
+      console.log(page)
+      this.currentPage = page;
+      /** 调用表格数据.*/
+      this.queryOwnerParkRecord();
+
+    },
+
     onSubmit() {
-      this.$message('submit!')
+      this.queryOwnerParkRecord();
     },
     onCancel() {
       this.$message({