|
@@ -5,27 +5,27 @@
|
5
|
5
|
<el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
|
6
|
6
|
<el-row>
|
7
|
7
|
<el-col :span="6">
|
8
|
|
- <el-form-item label="停车场名称:">
|
9
|
|
- <el-input v-model="formInline1.carParkName" placeholder="请输入"></el-input>
|
|
8
|
+ <el-form-item label="停车场:">
|
|
9
|
+ <el-select filterable v-model="formInline1.parkId" placeholder="请选择" clearable>
|
|
10
|
+ <el-option
|
|
11
|
+ v-for="(item,index) in parkDic"
|
|
12
|
+ :key="index"
|
|
13
|
+ :label="item.parkName"
|
|
14
|
+ :value="item.id" />
|
|
15
|
+ </el-select>
|
10
|
16
|
</el-form-item>
|
11
|
17
|
</el-col>
|
12
|
|
- <el-col :span="6">
|
13
|
|
- <el-form-item label="起始时间:">
|
|
18
|
+ <el-col :span="12">
|
|
19
|
+ <el-form-item label="生效时间:">
|
14
|
20
|
<el-date-picker
|
15
|
|
- v-model="formInline1.startTime"
|
16
|
|
- type="date"
|
|
21
|
+ v-model="formInline1.time"
|
|
22
|
+ type="daterange"
|
|
23
|
+ align="right"
|
|
24
|
+ unlink-panels
|
|
25
|
+ range-separator="-"
|
17
|
26
|
value-format="yyyy-MM-dd HH:mm:ss"
|
18
|
|
- placeholder="选择日期">
|
19
|
|
- </el-date-picker>
|
20
|
|
- </el-form-item>
|
21
|
|
- </el-col>
|
22
|
|
- <el-col :span="6">
|
23
|
|
- <el-form-item label="结束时间:">
|
24
|
|
- <el-date-picker
|
25
|
|
- v-model="formInline1.endTime"
|
26
|
|
- type="date"
|
27
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
28
|
|
- placeholder="选择日期">
|
|
27
|
+ start-placeholder="开始时间"
|
|
28
|
+ end-placeholder="结束时间">
|
29
|
29
|
</el-date-picker>
|
30
|
30
|
</el-form-item>
|
31
|
31
|
</el-col>
|
|
@@ -79,7 +79,7 @@
|
79
|
79
|
</el-form-item>
|
80
|
80
|
<el-form-item label="起始时间">
|
81
|
81
|
<el-date-picker
|
82
|
|
- v-model="formLabelAlign.startTime"
|
|
82
|
+ v-model="formLabelAlign.startStartTime"
|
83
|
83
|
type="date"
|
84
|
84
|
value-format="yyyy-MM-dd HH:mm:ss"
|
85
|
85
|
placeholder="选择日期">
|
|
@@ -87,7 +87,7 @@
|
87
|
87
|
</el-form-item>
|
88
|
88
|
<el-form-item label="结束时间">
|
89
|
89
|
<el-date-picker
|
90
|
|
- v-model="formLabelAlign.endTime"
|
|
90
|
+ v-model="formLabelAlign.endStartTime"
|
91
|
91
|
type="date"
|
92
|
92
|
value-format="yyyy-MM-dd HH:mm:ss"
|
93
|
93
|
placeholder="选择日期">
|
|
@@ -117,7 +117,13 @@
|
117
|
117
|
</el-col>
|
118
|
118
|
<el-col :span="6">
|
119
|
119
|
<el-form-item label="停车场名称:">
|
120
|
|
- <el-input v-model="formInline2.carParkName" placeholder="请输入"></el-input>
|
|
120
|
+ <el-select filterable v-model="formInline2.parkId" placeholder="请选择" clearable>
|
|
121
|
+ <el-option
|
|
122
|
+ v-for="(item,index) in parkDic"
|
|
123
|
+ :key="index"
|
|
124
|
+ :label="item.parkName"
|
|
125
|
+ :value="item.id" />
|
|
126
|
+ </el-select>
|
121
|
127
|
</el-form-item>
|
122
|
128
|
</el-col>
|
123
|
129
|
<el-col :span="5">
|
|
@@ -147,7 +153,13 @@
|
147
|
153
|
</el-col>
|
148
|
154
|
<el-col :span="6">
|
149
|
155
|
<el-form-item label="停车场名称:">
|
150
|
|
- <el-input v-model="formInline3.carParkName" placeholder="请输入"></el-input>
|
|
156
|
+ <el-select filterable v-model="formInline3.parkId" placeholder="请选择" clearable>
|
|
157
|
+ <el-option
|
|
158
|
+ v-for="(item,index) in parkDic"
|
|
159
|
+ :key="index"
|
|
160
|
+ :label="item.parkName"
|
|
161
|
+ :value="item.id" />
|
|
162
|
+ </el-select>
|
151
|
163
|
</el-form-item>
|
152
|
164
|
</el-col>
|
153
|
165
|
<el-col :span="6">
|
|
@@ -245,16 +257,15 @@ export default {
|
245
|
257
|
pageNum1: 1,
|
246
|
258
|
formInline1: {
|
247
|
259
|
parkId: '',
|
248
|
|
- startTime:'',
|
249
|
|
- endTime:''
|
|
260
|
+ time: []
|
250
|
261
|
},
|
251
|
262
|
title:'',
|
252
|
263
|
dialogVisible:false,
|
253
|
264
|
formLabelAlign: {
|
254
|
265
|
ruleName: '',
|
255
|
266
|
parkId: '',
|
256
|
|
- startTime: '',
|
257
|
|
- endTime: '',
|
|
267
|
+ startStartTime: '',
|
|
268
|
+ endStartTime: '',
|
258
|
269
|
price: '',
|
259
|
270
|
largeTimes: ''
|
260
|
271
|
},
|
|
@@ -286,7 +297,7 @@ export default {
|
286
|
297
|
pageNum2: 1,
|
287
|
298
|
formInline2: {
|
288
|
299
|
plateNo: '',
|
289
|
|
- carParkName:'',
|
|
300
|
+ parkId:'',
|
290
|
301
|
},
|
291
|
302
|
columns3: [
|
292
|
303
|
{
|
|
@@ -312,7 +323,7 @@ export default {
|
312
|
323
|
pageNum3: 1,
|
313
|
324
|
formInline3: {
|
314
|
325
|
plateNo: '',
|
315
|
|
- carParkName:'',
|
|
326
|
+ parkId:'',
|
316
|
327
|
},
|
317
|
328
|
dialogVisible3:false,
|
318
|
329
|
formLabelAlign3: {
|
|
@@ -322,6 +333,7 @@ export default {
|
322
|
333
|
refundTime: '',
|
323
|
334
|
refundMoney: '',
|
324
|
335
|
},
|
|
336
|
+ parkDic: []
|
325
|
337
|
}
|
326
|
338
|
},
|
327
|
339
|
mounted() {
|
|
@@ -409,7 +421,13 @@ export default {
|
409
|
421
|
getTableData1() {
|
410
|
422
|
this.loading1 = true
|
411
|
423
|
const {pageNum1, pageSize1} = this
|
412
|
|
- api.yytcListByPage({current: pageNum1, size: pageSize1, ...this.formInline1, endTime: this.formInline1.endTime ? this.formInline1.endTime.substring(0, 10) + " 23:59:59" : ''}).then(res => {
|
|
424
|
+ let params = {...this.formInline1}
|
|
425
|
+ if (params.time && params.time.length === 2) {
|
|
426
|
+ params.startStartTime = params.time[0].substring(0, 10) + " 00:00:00";
|
|
427
|
+ params.endStartTime = params.time[1].substring(0, 10) + " 23:59:59"
|
|
428
|
+ }
|
|
429
|
+ delete params.time
|
|
430
|
+ api.yytcListByPage({current: pageNum1, size: pageSize1, ...params}).then(res => {
|
413
|
431
|
this.tableData1 = (res.data.records || [])
|
414
|
432
|
this.total1 = res.data.total
|
415
|
433
|
this.loading1 = false
|