diff --git a/src/filters/index.js b/src/filters/index.js
index bfcf90e..4de8085 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -131,6 +131,9 @@ export  function date2Long (date) {
  * @return 解析后的Date对象
  */
 export  function string2Date(date,formatType) {
+  if(date == null || date == undefined){
+    return "";
+  }
   let dateTime;
   switch (formatType) {
     case 0 :
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0eedd5c..b0b30bc 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -109,7 +109,7 @@
     </div>
 
     <div class="table-wrap">
-      <p class="table-title">最新订单</p>
+      <p class="table-title">最新订单(近三个月)</p>
       <el-table
         :data="orderData"
         style="width: 100%;"
@@ -125,8 +125,15 @@
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
+          prop="orderTotalFee"
+          label="应收费用">
+          <template slot-scope="scope">
+            <span>{{(scope.row.orderTotalFee) |fen2Yuan}} </span>
+          </template>
+        </el-table-column>
+        <el-table-column
           prop="orderActFee"
-          label="停车费">
+          label="实收费用">
           <template slot-scope="scope">
             <span>{{(scope.row.orderActFee) |fen2Yuan}} </span>
           </template>
@@ -203,7 +210,7 @@
           totalScore: 0,
           validScore: 0,
         },
-        total: 15,
+        total: 0,
         currentPage: 1,
         pageSize: 10,
         moneyData: [{
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 23a6a83..ab33c30 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -50,8 +50,15 @@
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
+          prop="orderTotalFee"
+          label="应收费用">
+          <template slot-scope="scope">
+            <span>{{(scope.row.orderTotalFee) |fen2Yuan}} </span>
+          </template>
+        </el-table-column>
+        <el-table-column
           prop="orderActFee"
-          label="停车费">
+          label="实收费用">
           <template slot-scope="scope">
             <span>{{(scope.row.orderActFee) |fen2Yuan}} </span>
           </template>
diff --git a/src/views/payback/index.vue b/src/views/payback/index.vue
index 9b31717..5efbf75 100644
--- a/src/views/payback/index.vue
+++ b/src/views/payback/index.vue
@@ -16,162 +16,208 @@
     </div>
 
     <div class="table-wrap">
-      <p class="table-title">订单详情</p>
+      <el-row :gutter="20">
+        <el-col :xs="8" :sm="6" :md="3" :lg="22" :xl="1">
+          <p class="table-title">订单详情</p>
+        </el-col>
+        <el-col :xs="8" :sm="3" :md="3" :lg="2" :xl="1">
+          <el-button style="margin-top: 8px" size="small" type="primary" @click="toBackSubmit">补缴</el-button>
+        </el-col>
+      </el-row>
       <el-table
         :data="orderData"
         style="width: 100%;"
-        :show-overflow-tooltip="true">
+        :show-overflow-tooltip="true"
+        @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection">
+        </el-table-column>
         <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"
-          label="停车费">
+          prop="orderTotalFee"
+          label="应收费用">
+          <template slot-scope="scope">
+            <span>{{(scope.row.orderTotalFee) |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>
+    <!--补缴对话框-->
+    <el-dialog
+      title="补缴"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :close-on-click-modal="false">
+      <span>这是二维码</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      },
-      total: 55,
-      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: '完成'
+  import {queryOwnerParkRecord} from '@/api/index';
+  import {fen2Yuan,string2Date,inOutStateFormatter,parkingDurationFormatter} from '@/filters/index';
+  export default {
+    data() {
+      return {
+        form: {
+          plNos: null,
+          carNum: null,
+
         },
-      ]
-    }
-  },
-  methods: {
-    onSubmit() {
-      this.$message('submit!')
+        total: 0,
+        currentPage: 1,
+        pageSize: 10,
+        orderData: [
+        ],
+        multipleSelection:[],
+        dialogVisible:false,
+      }
     },
-    onCancel() {
-      this.$message({
-        message: 'cancel!',
-        type: 'warning'
-      })
+    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',
+          orderStates:[52],
+          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();
+
+      },
+      //多选
+      handleSelectionChange:function(val) {
+        this.multipleSelection = val;
+
+      },
+      toBackSubmit:function(){
+        let selects = this.multipleSelection;
+        if(selects == null || selects.length < 1){
+          this.$message({
+            message: '请至少选择一行数据!',
+            type: 'warning'
+          });
+          return;
+        }
+        let backs = [];
+        selects.forEach(item=>{
+          backs.push({orderId:item.orderId,carNumber:item.carNumber});
+        });
+        console.log(backs);
+        //TODO 调用后台接口获取二维码信息
+
+        this.dialogVisible = true;
+      },
+
+      onSubmit:function() {
+        this.queryOwnerParkRecord();
+      },
+      onCancel:function() {
+        this.$message({
+          message: 'cancel!',
+          type: 'warning'
+        })
+      }
     }
   }
-}
 </script>
 
 <style scoped>