停车订单

src/api/article_z.js

@@ -83,4 +83,12 @@ export default {
   deleteExceptionHandingClean(params) {
     return axios.post(`/opt/exception/handing/clean/delete`, params)
   },
+  // 停车订单查询——获取欠费订单分页
+  queryParkingOrderArrearsByPage(params) {
+    return axios.get(`/opt/parking/order/arrears/page`, {params})
+  },
+  // 停车订单查询——获取支付订单分页
+  queryParkingOrderByPage(params) {
+    return axios.get(`/opt/parking/order/page`, {params})
+  },
 }

src/pages/index/components/parking_order.vue

@@ -6,20 +6,15 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="订单号:">
-                <el-input v-model="formInline1.orderCode" placeholder="请输入"></el-input>
+                <el-input v-model="formInline1.orderNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="日期:">
+              <el-form-item label="支付日期:">
                 <el-date-picker
-                  v-model="formInline1.time"
-                  type="daterange"
-                  align="right"
-                  unlink-panels
-                  range-separator="-"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  v-model="formInline1.payTime"
+                  type="date"
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -45,7 +40,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="订单号: ">
-                <el-input v-model="formInline2.orderCode" placeholder="请输入"></el-input>
+                <el-input v-model="formInline2.orderNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -70,60 +65,20 @@
           </el-pagination>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="查询欠费订单信息" name="查询欠费订单信息">
-        <el-form class="form-wrapper" :inline="true" :model="formInline3" style="margin-bottom: 20px;">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="订单号:">
-                <el-input v-model="formInline3.orderCode" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="泊位号:">
-                <el-input v-model="formInline3.berthCode" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="车牌号:">
-                <el-input v-model="formInline3.plateNo" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item>
-                <el-button type="primary" class="query-btn" @click="onSubmit3">查询</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-table :data="tableData3">
-          <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
-          </el-table-column>
-        </el-table>
-        <div class="table-pagination">
-          <el-pagination layout="prev, pager, next" :total="total3" @current-change="handlePageChange3"
-                         :current-page.sync="pageNum3" :page-size.sync="pageSize3">
-          </el-pagination>
-        </div>
-      </el-tab-pane>
       <el-tab-pane label="查询预付订单信息" name="查询预付订单信息">
         <el-form class="form-wrapper" :inline="true" :model="formInline4" style="margin-bottom: 20px;">
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="订单号:">
-                <el-input v-model="formInline4.orderCode" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="泊位号:">
-                <el-input v-model="formInline4.berthCode" placeholder="请输入"></el-input>
+                <el-input v-model="formInline4.orderNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="车牌号:">
                 <el-input v-model="formInline4.plateNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="8">
               <el-form-item>
                 <el-button type="primary" class="query-btn" @click="onSubmit4">查询</el-button>
               </el-form-item>
@@ -146,6 +101,7 @@
 <script>
 import api from "@/api/audit.js";
 import dictionary from "@/util/dictionary";
+import api_z from "@/api/article_z.js";
 
 export default {
   components: {},
@@ -155,31 +111,31 @@ export default {
       columns1: [
         {
           label: '订单号',
-          key: 'orderCode'
+          key: 'orderNo'
         },
         {
           label: '支付日期',
-          key: ''
+          key: 'payTime'
         },
         {
           label: '支付金额',
-          key: ''
+          key: 'payAmount'
         },
         {
           label: '泊位号',
-          key: ''
+          key: 'parkingNo'
         },
         {
           label: '车牌号',
-          key: ''
+          key: 'plateNo'
         },
         {
           label: '入场日期',
-          key: ''
+          key: 'inTime'
         },
         {
           label: '出场日期',
-          key: ''
+          key: 'outTime'
         }
       ],
       tableData1: [],
@@ -187,21 +143,21 @@ export default {
       pageSize1: 10,
       pageNum1: 1,
       formInline1: {
-        orderCode: '',
-        time:''
+        orderNo: '',
+        payTime:''
       },
       columns2: [
         {
           label: '欠费订单号',
-          key: ''
+          key: 'orderNo'
         },
         {
           label: '车牌号',
-          key: ''
+          key: 'plateNo'
         },
         {
           label: '修改日期',
-          key: ''
+          key: 'updateTime'
         },
         {
           label: '欠费金额',
@@ -213,52 +169,41 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        orderCode: '',
+        orderNo: '',
         plateNo:''
       },
-      columns3: [
+      columns4: [
         {
           label: '订单号',
-          key: ''
+          key: 'orderNo'
         },
         {
-          label: '泊位号',
-          key: ''
+          label: '车牌号',
+          key: 'plateNo'
         },
         {
-          label: '车牌号',
-          key: ''
+          label: '所属停车场',
+          key: 'carParkName'
         },
         {
-          label: '应付金额',
-          key: ''
+          label: '预约时间',
+          key: 'appointmentTime'
         },
-      ],
-      tableData3: [],
-      total3: 0,
-      pageSize3: 10,
-      pageNum3: 1,
-      formInline3: {
-        orderCode:'',
-        berthCode:'',
-        plateNo: ''
-      },
-      columns4: [
         {
-          label: '订单号',
-          key: ''
+          label: '金额',
+          key: 'payAmount'
         },
         {
-          label: '泊位号',
-          key: ''
+          label: '支付方式',
+          key: 'payWay'
         },
         {
-          label: '车牌号',
-          key: ''
+          label: '支付状态',
+          key: 'payStatus'
         },
         {
-          label: '预付金额',
-          key: ''
+          label: '支付时间',
+          key: 'payTime'
         },
       ],
       tableData4: [],
@@ -266,16 +211,15 @@ export default {
       pageSize4: 10,
       pageNum4: 1,
       formInline4: {
-        orderCode:'',
-        berthCode:'',
+        orderNo:'',
         plateNo: ''
       }
     }
   },
   mounted() {
-    // this.getTableData1()
-    // this.getTableData2()
-    // this.getTableData3()
+    this.getTableData1()
+    this.getTableData2()
+    this.getTableData4()
   },
   watch: {
   },
@@ -288,10 +232,6 @@ export default {
       this.pageNum2 = 1
       this.getTableData2()
     },
-    onSubmit3() {
-      this.pageNum3 = 1
-      this.getTableData3()
-    },
     onSubmit4() {
       this.pageNum4 = 1
       this.getTableData4()
@@ -301,7 +241,7 @@ export default {
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
+      api_z.queryParkingOrderByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
         this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
         this.total1 = res.data.total
       })
@@ -311,27 +251,17 @@ export default {
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
+      api_z.queryParkingOrderArrearsByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
         this.tableData2 = res.data.records || []
         this.total2 = res.data.total
       })
     },
-    handlePageChange3() {
-      this.getTableData3()
-    },
-    getTableData3() {
-      const {pageNum3, pageSize3} = this
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
-        this.tableData3 = res.data.records || []
-        this.total3 = res.data.total
-      })
-    },
     handlePageChange4() {
       this.getTableData3()
     },
     getTableData4() {
       const {pageNum4, pageSize4} = this
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
+      api.orderListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
         this.tableData4 = res.data.records || []
         this.total4 = res.data.total
       })