商品订单-预约停车订单改为平台接口

src/api/audit.js

@@ -42,6 +42,9 @@ export default {
   orderListByPage(params) {
     return axios1.post('/reformer-blessing-b/pontus/parking/platform/appointment/record', params)
   },
+  orderListByPage1(params) {
+    return axios.get('/opt/appointment/rules/order/page', {params})
+  },
   // 预约订单-退款记录
   refundListByPage(params) {
     return axios.get('/opt/appointment/rules/refund/page', {params})

src/pages/index/components/appointment_rules.vue

@@ -121,8 +121,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="停车场名称:">
-                <el-select filterable v-model="formInline2.parkId" placeholder="请选择" clearable>
+              <el-form-item label="停车场:">
+                <el-select filterable v-model="formInline2.car_park_id" placeholder="请选择" clearable>
                   <el-option
                     v-for="(item,index) in parkDic"
                     :key="index"
@@ -157,7 +157,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="停车场名称:">
+              <el-form-item label="停车场:">
                 <el-select filterable v-model="formInline3.parkId" placeholder="请选择" clearable>
                   <el-option
                     v-for="(item,index) in parkDic"

src/pages/index/components/parking_order.vue

@@ -287,7 +287,7 @@ export default {
     getTableData4() {
       this.loading4= true
       const {pageNum4, pageSize4} = this
-      api.orderListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
+      api.orderListByPage1({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
         this.tableData4 = res.data.records || []
         this.total4 = res.data.total
         this.loading4 = false

src/pages/index/components/product_order.vue

@@ -81,13 +81,24 @@
         <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.orderNo" placeholder="请输入"></el-input>
+              <el-form-item label="手机号:">
+                <el-input v-model="formInline3.user_phone" 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-input v-model="formInline3.plate_no" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="停车场:">
+                <el-select filterable v-model="formInline3.car_park_id" placeholder="请选择" clearable>
+                  <el-option
+                    v-for="(item,index) in parkDic"
+                    :key="index"
+                    :label="item.parkName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="5">
@@ -203,36 +214,40 @@ export default {
       },
       columns3: [
         {
-          label: '订单号',
-          key: 'orderNo'
+          label: '手机号',
+          key: 'appointment_phone'
         },
         {
           label: '车牌号',
-          key: 'plateNo'
+          key: 'plate_no'
         },
         {
-          label: '所属停车场',
-          key: 'parkName'
+          label: '车场',
+          key: 'car_park_name'
+        },
+        {
+          label: '车位',
+          key: 'parking_space'
         },
         {
           label: '预约时间',
-          key: 'appointmentTime'
+          key: 'appointment_time'
         },
         {
-          label: '金额',
-          key: 'payAmount'
+          label: '状态',
+          key: 'appointment_status'
         },
         {
-          label: '支付方式',
-          key: 'payWay'
+          label: '取消方',
+          key: 'cancel_type'
         },
         {
-          label: '支付状态',
-          key: 'payStatus'
+          label: '取消原因',
+          key: 'cancel_reason'
         },
         {
-          label: '支付时间',
-          key: 'payTime'
+          label: '最后更新时间',
+          key: 'latest_time'
         },
       ],
       tableData3: [],
@@ -240,13 +255,21 @@ export default {
       pageSize3: 10,
       pageNum3: 1,
       formInline3: {
-        orderNo:'',
-        berthCode:'',
-        plateNo: ''
+        user_phone: '',
+        plate_no: '',
+        car_park_id:'',
+      },
+      appointmentMap: {
+        0: '进行中',
+        1: '已完成',
+        2: '已取消',
+        3: '已违约'
       },
+      parkDic: []
     }
   },
   mounted() {
+    this.getParkDic()
     this.getTableData1()
     this.getTableData2()
     this.getTableData3()
@@ -254,6 +277,12 @@ export default {
   watch: {
   },
   methods: {
+    //车场
+    getParkDic() {
+      api.parkDic().then(res => {
+        this.parkDic = res.data || []
+      })
+    },
     rowClassName({ rowIndex }) {
       // 偶数行和奇数行分别返回不同的类名，也可以根据实际需求基于rowData进行条件判断
       return rowIndex % 2 === 0 ? 'even-row' : 'odd-row';
@@ -308,10 +337,9 @@ export default {
     },
     getTableData3() {
       this.loading3 = true
-      const {pageNum3, pageSize3} = this
-      api.orderListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
-        this.tableData3 = res.data.records || []
-        this.total3 = res.data.total
+      api.orderListByPage({cur_page: pageNum3, page_size: pageSize3, ...this.formInline3}).then(res => {
+        this.tableData3 = res.data.data.map(item => ({...item, cancel_type: item.cancel_type === 1 ? '平台':'用户',appointment_status: this.appointmentMap[item.appointment_status]})) || []
+        this.total3 = res.data.totalRows
         this.loading3 = false
       })
     },