|
@@ -6,7 +6,7 @@
|
6
|
6
|
<el-row>
|
7
|
7
|
<el-col :span="6">
|
8
|
8
|
<el-form-item label="车场名称: ">
|
9
|
|
- <el-select clearable filterable v-model="formInline1.parkLotId" placeholder="请选择">
|
|
9
|
+ <el-select clearable filterable v-model="formInline1.parkId" placeholder="请选择">
|
10
|
10
|
<el-option
|
11
|
11
|
v-for="(item,index) in carParkingNameOptions"
|
12
|
12
|
:key="index"
|
|
@@ -15,14 +15,26 @@
|
15
|
15
|
</el-select>
|
16
|
16
|
</el-form-item>
|
17
|
17
|
</el-col>
|
18
|
|
- <el-col :span="6">
|
|
18
|
+ <el-col :span="5">
|
19
|
19
|
<el-form-item label="车牌号: ">
|
20
|
|
- <el-input v-model="formInline1.plateNo" placeholder="请输入"></el-input>
|
|
20
|
+ <el-input v-model="formInline1.carno" placeholder="请输入"></el-input>
|
21
|
21
|
</el-form-item>
|
22
|
22
|
</el-col>
|
23
|
|
- <el-col :span="6">
|
|
23
|
+ <el-col :span="5">
|
24
|
24
|
<el-form-item label="车位号: ">
|
25
|
|
- <el-input v-model="formInline1.parkingNo" placeholder="请输入"></el-input>
|
|
25
|
+ <el-input v-model="formInline1.parkingSpaceNo" placeholder="请输入"></el-input>
|
|
26
|
+ </el-form-item>
|
|
27
|
+ </el-col>
|
|
28
|
+ <el-col :span="8">
|
|
29
|
+ <el-form-item label="查询时间">
|
|
30
|
+ <el-date-picker
|
|
31
|
+ v-model="formInline1.time"
|
|
32
|
+ type="datetimerange"
|
|
33
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
34
|
+ range-separator="至"
|
|
35
|
+ start-placeholder="开始时间"
|
|
36
|
+ end-placeholder="结束时间">
|
|
37
|
+ </el-date-picker>
|
26
|
38
|
</el-form-item>
|
27
|
39
|
</el-col>
|
28
|
40
|
<el-col :span="5">
|
|
@@ -38,7 +50,7 @@
|
38
|
50
|
<el-table border :row-class-name="rowClassName" :data="tableData1" v-loading="loading1">
|
39
|
51
|
<el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
|
40
|
52
|
</el-table-column>
|
41
|
|
- <el-table-column
|
|
53
|
+ <!-- <el-table-column
|
42
|
54
|
label="操作"
|
43
|
55
|
width="200">
|
44
|
56
|
<template slot-scope="scope" style="display: inline-block">
|
|
@@ -47,7 +59,7 @@
|
47
|
59
|
<el-button type="danger" slot="reference">删除</el-button>
|
48
|
60
|
</el-popconfirm>
|
49
|
61
|
</template>
|
50
|
|
- </el-table-column>
|
|
62
|
+ </el-table-column> -->
|
51
|
63
|
</el-table>
|
52
|
64
|
<div class="table-pagination">
|
53
|
65
|
<el-pagination layout="total, prev, pager, next, jumper" :total="total1" @current-change="handlePageChange1"
|
|
@@ -307,6 +319,8 @@
|
307
|
319
|
import api_z from "@/api/article_z.js";
|
308
|
320
|
import {vehicleNumber, validateInput, validateAmount, validateHour} from '@/util/common'
|
309
|
321
|
import options from '@/util/options'
|
|
322
|
+
|
|
323
|
+const date = new Date;
|
310
|
324
|
export default {
|
311
|
325
|
components: {},
|
312
|
326
|
data() {
|
|
@@ -343,9 +357,10 @@ export default {
|
343
|
357
|
pageSize1: 10,
|
344
|
358
|
pageNum1: 1,
|
345
|
359
|
formInline1: {
|
346
|
|
- parkLotId: '',
|
347
|
|
- plateNo: '',
|
348
|
|
- parkingNo: '',
|
|
360
|
+ parkId: '',
|
|
361
|
+ carno: '',
|
|
362
|
+ parkingSpaceNo: '',
|
|
363
|
+ time: [date.getFullYear() + "-" + ((date.getMonth() + 1) >= 10 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)) + "-" + (date.getDate() > 10 ? date.getDate() : '0' + date.getDate()) + ' 00:00:00', date.getFullYear() + "-" + ((date.getMonth() + 1) >= 10 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)) + "-" + (date.getDate() > 10 ? date.getDate() : '0' + date.getDate() + ' 23:59:59')],
|
349
|
364
|
},
|
350
|
365
|
carParkingNameValue: '',
|
351
|
366
|
carParkingNameOptions: [],
|
|
@@ -715,7 +730,16 @@ export default {
|
715
|
730
|
getTableData1() {
|
716
|
731
|
this.loading1 = true
|
717
|
732
|
const {pageNum1, pageSize1} = this
|
718
|
|
- api_z.queryBusinessRecordInoutByPage('carno=&parkId=100105547,100105554,100105564,100105577,100105585,100106097,100106280,31290002®ionId=&inTime=2024-04-03 00:00:00&outTime=2024-04-03 23:59:59&ioFlag=&parkingSpaceNo=&plateColor=&pageSize=15&curPage=1&sortName=&sortOrder=').then(res => {
|
|
733
|
+ let params = {...this.formInline1}
|
|
734
|
+ if (
|
|
735
|
+ params.time && params.time.length === 2 &&
|
|
736
|
+ params.time[1] !== ""
|
|
737
|
+ ) {
|
|
738
|
+ params.inTime= params.time[0]
|
|
739
|
+ params.outTime = params.time[1]
|
|
740
|
+ }
|
|
741
|
+ delete params.time
|
|
742
|
+ api_z.queryBusinessRecordInoutByPage(`carno=${params.carno}&parkId=${params.parkId}&inTime=${params.inTime}&parkingSpaceNo=${params.parkingSpaceNo}&outTime=${params.outTime}&pageSize=${pageSize1}&curPage=${pageNum1}&sortName=&sortOrder=`).then(res => {
|
719
|
743
|
this.tableData1 = res.data.data || []
|
720
|
744
|
this.total1 = res.data.totalRows
|
721
|
745
|
this.loading1 = false
|