部分提交

src/api/audit.js

@@ -1,4 +1,5 @@
 import axios from "@/util/ajax";
+import axios1 from "@/util/ajax1"
 
 export default {
   //  停车场情况-列表
@@ -39,7 +40,7 @@ export default {
   },
   // 预约订单-预约订单分页列表
   orderListByPage(params) {
-    return axios.get('/opt/appointment/rules/order/page', {params})
+    return axios1.post('/reformer-blessing-b/pontus/parking/platform/appointment/record', params)
   },
   // 预约订单-退款记录
   refundListByPage(params) {
@@ -103,7 +104,7 @@ export default {
   },
   // 停车卡_查看订单分页列表
   tckOrderListByPage(params) {
-    return axios.get('/opt/parking/card/order/page', {params})
+    return axios.post('/reformer-blessing-b/card-mall-system/mall/queryList', params)
   },
   // 停车卡_统计信息
   tckTjxxListByPage(params) {

src/config/index.js

@@ -4,8 +4,8 @@
 const Config = {
   dev: {
 // BASE_API: 'https://172.16.36.211:8800', // http://172.16.36.211:8800
-    BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api', // http://172.16.36.211:8800
-    // BASE_API: 'http://localhost:16399/luohe2_ee/api'
+    // BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api', // http://172.16.36.211:8800
+    BASE_API: 'http://localhost:16399/luohe2_ee/api'
   },
   build: {
 //服务地址及端口配置

src/pages/index/components/appointment_rules.vue

@@ -110,9 +110,14 @@
       <el-tab-pane label="预约订单" name="预约订单">
         <el-form class="form-wrapper" :inline="true" :model="formInline2" style="margin-bottom: 20px;">
           <el-row>
+            <el-col :span="6">
+              <el-form-item label="手机号:">
+                <el-input v-model="formInline2.user_phone" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="车牌号:">
-                <el-input v-model="formInline2.plateNo" placeholder="请输入"></el-input>
+                <el-input v-model="formInline2.plate_no" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -138,7 +143,7 @@
           </el-table-column>
         </el-table>
         <div class="table-pagination">
-          <el-pagination layout="total, prev, pager, next, jumper" :total="total1" @current-change="handlePageChange2"
+          <el-pagination layout="total, prev, pager, next, jumper" :total="total2" @current-change="handlePageChange2"
                          :current-page.sync="pageNum2" :page-size.sync="pageSize2">
           </el-pagination>
         </div>
@@ -270,25 +275,41 @@ export default {
         largeTimes: ''
       },
       columns2: [
+        {
+          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: 'payStatus'
+          label: '状态',
+          key: 'appointment_status'
         },
         {
-          label: '退款状态',
-          key: 'refundStatus'
+          label: '取消方',
+          key: 'cancel_type'
+        },
+        {
+          label: '取消原因',
+          key: 'cancel_reason'
+        },
+        {
+          label: '最后更新时间',
+          key: 'latest_time'
         },
       ],
       tableData2: [],
@@ -296,8 +317,9 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        plateNo: '',
-        parkId:'',
+        user_phone: '',
+        plate_no: '',
+        car_park_id:'',
       },
       columns3: [
         {
@@ -333,7 +355,13 @@ export default {
         refundTime: '',
         refundMoney: '',
       },
-      parkDic: []
+      parkDic: [],
+      appointmentMap: {
+        0: '进行中',
+        1: '已完成',
+        2: '已取消',
+        3: '已违约'
+      }
     }
   },
   mounted() {
@@ -439,9 +467,9 @@ export default {
     getTableData2() {
       this.loading2 = true
       const {pageNum2, pageSize2} = this
-      api.orderListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
-        this.tableData2 = res.data.records || []
-        this.total2 = res.data.total
+      api.orderListByPage({cur_page: pageNum2, page_size: pageSize2, ...this.formInline2}).then(res => {
+        this.tableData2 = res.data.data.map(item => ({...item, cancel_type: item.cancel_type === 1 ? '平台':'用户',appointment_status: this.appointmentMap[item.appointment_status]})) || []
+        this.total2 = res.data.totalRows
         this.loading2 = false
       })
     },

src/pages/index/components/message_management.vue

@@ -128,13 +128,22 @@
         <el-form class="form-wrapper" :inline="true" :model="formInline4" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="设备报警:">
-                <el-input v-model="formInline4.equipmentAlarm" placeholder="请输入"></el-input>
+              <el-form-item label="车牌号:">
+                <el-input v-model="formInline4.plateNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="设备ID:">
+              <!-- <el-form-item label="设备ID:">
                 <el-input v-model="formInline4.equipmentID" placeholder="请输入"></el-input>
+              </el-form-item> -->
+              <el-form-item label="停车场: ">
+                <el-select filterable clearable v-model="formInline4.parkId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.parkName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -181,6 +190,7 @@
 </template>
 <script>
 import api from "@/api/audit.js";
+import api_z from "@/api/article_z.js";
 import api_l from "@/api/article_liao.js";
 
 export default {
@@ -324,7 +334,7 @@ export default {
       pageNum4: 1,
       formInline4: {
         plateNo: '',
-        deviceId: '',
+        parkId: '',
       },
       title4: '',
       dialogVisible4: false,
@@ -334,9 +344,11 @@ export default {
         equipmentID: '',
         alarmTime: '',
       },
+      carParkingNameOptions: [],
     }
   },
   mounted() {
+    this.getCarParkingName()
     this.getTableData1()
     this.getTableData2()
     this.getTableData3()
@@ -344,6 +356,12 @@ export default {
   },
   watch: {},
   methods: {
+    //车场
+    getCarParkingName() {
+      api_z.querySelectParkListByPage().then(res => {
+        this.carParkingNameOptions=res.data
+      })
+    },
     rowClassName({ rowIndex }) {
       // 偶数行和奇数行分别返回不同的类名，也可以根据实际需求基于rowData进行条件判断
       return rowIndex % 2 === 0 ? 'even-row' : 'odd-row';

src/pages/index/components/parking_card.vue

@@ -70,26 +70,35 @@
       <el-tab-pane label="查看订单" name="查看订单">
         <el-form class="form-wrapper" :inline="true" :model="formInline2" style="margin-bottom: 20px;">
           <el-row>
-            <el-col :span="5">
-              <el-form-item label="订单号: ">
-                <el-input v-model="formInline2.orderNo" placeholder="请输入"></el-input>
+            <el-col :span="6">
+              <el-form-item label="商品名称:">
+                <el-input v-model="formInline2.goods_name" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
-              <el-form-item label="选择订单状态:">
-                <el-select clearable v-model="formInline2.orderStatus" placeholder="订单状态" popper-class="cur-select">
+            <el-col :span="6">
+              <el-form-item label="发布状态:">
+                <el-select clearable v-model="formInline2.release_status" placeholder="请选择" popper-class="cur-select">
                   <el-option label="全部" value=""></el-option>
-                  <el-option label="已完成" value="已完成"></el-option>
-                  <el-option label="使用中" value="使用中"></el-option>
+                  <el-option label="上架" value="1"></el-option>
+                  <el-option label="下架" value="0"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <el-button type="primary" class="query-btn" @click="onSubmit2" icon="el-icon-search">查询</el-button>
+            <el-col :span="8">
+              <el-form-item label="可购买时间:">
+                <el-date-picker
+                  v-model="formInline2.time"
+                  type="daterange"
+                  range-separator="至"
+                  value-format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
               </el-form-item>
+            </el-col>
+            <el-col :span="4">
               <el-form-item>
-                <el-button type="success" @click="handleAdd2">添加规则</el-button>
+                <el-button type="primary" class="query-btn" @click="onSubmit2" icon="el-icon-search">查询</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -158,6 +167,7 @@
 <script>
 import api from "@/api/audit.js";
 import dictionary from "@/util/dictionary";
+import moment from "moment/moment";
 
 export default {
   components: {},
@@ -197,32 +207,36 @@ export default {
       },
       columns2: [
         {
-          label: '订单号',
-          key: 'orderNo'
+          label: '商品名称',
+          key: 'goods_name'
+        },
+        {
+          label: '所需金额（分）',
+          key: 'reality_price'
         },
         {
-          label: '停车卡编号',
-          key: 'cardId'
+          label: '总库存',
+          key: 'goods_total_number'
         },
         {
-          label: '下单人',
-          key: 'memberId'
+          label: '剩余库存量',
+          key: 'goods_number'
         },
-        // {
-        //   label: '下单时间',
-        //   key: 'placeOrderTime'
-        // },
         {
-          label: '支付金额',
-          key: 'buyWay'
+          label: '发布状态',
+          key: 'release_status'
         },
         {
-          label: '订单状态',
-          key: 'orderStatus'
+          label: '可购买时间',
+          key: 'good_range'
         },
         {
-          label: '购买方式',
-          key: 'buyWay'
+          label: '创建时间',
+          key: 'goods_create_time'
+        },
+        {
+          label: '最后修改时间',
+          key: 'goods_update_time'
         },
       ],
       tableData2: [],
@@ -230,8 +244,9 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        orderNo: '',
-        orderStatus:'',
+        goods_name: '',
+        release_status:'',
+        time: []
       },
       title2:'',
       dialogVisible2:false,
@@ -380,10 +395,19 @@ export default {
     },
     getTableData2() {
       this.loading2 = true
+      let params = {...this.formInline2}
+      if (
+        this.formInline2.time && this.formInline2.time.length === 2 &&
+        this.formInline2.time[1] !== ""
+      ) {
+        params.goods_start_time = this.formInline2.time[0].substring(0, 10) + " 00:00:00";
+        params.goods_end_time = this.formInline2.time[1].substring(0, 10) + " 23:59:59";
+      }
+      delete params.time
       const {pageNum2, pageSize2} = this
-      api.tckOrderListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
-        this.tableData2 = res.data.records || []
-        this.total2 = res.data.total
+      api.tckOrderListByPage({curPage: pageNum2, pageSize: pageSize2, ...params}).then(res => {
+        this.tableData2 = res.data.data.goods_list.map(item => ({...item, release_status: item.release_status === '1' ? '上架' : '下架', good_range: `${moment(item.goods_start_time).format('YYYY-MM-DD')}~${moment(item.goods_end_time).format('YYYY-MM-DD')}`})) || []
+        this.total2 = res.data.data.total_rows || 0
         this.loading2 = false
       })
     },

static/mung-local-config.js

@@ -1,7 +1,7 @@
 window.mungConfig = {
   dev: {
-    // BASE_API: "http://localhost:16399/luohe2_ee/api"
-    BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api'
+    BASE_API: "http://localhost:16399/luohe2_ee/api"
+    // BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api'
   },
   build: {
     BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"