Browse Source

7个页面的接口(两个页面有遗漏)

zbb 1 year ago
parent
commit
991604aef0

+ 142 - 6
src/api/article_z.js

@@ -191,12 +191,148 @@ export default {
191 191
   addInspectionManagement(params) {
192 192
     return axios.post(`/opt/inspection/management/add`, params)
193 193
   },
194
-  // 稽查管理——编辑稽查管理
195
-  editInspectionManagement(params) {
196
-    return axios.post(`/opt/inspection/management/edit`, params)
194
+  // 业务记录——获取停车记录分页
195
+  queryBusinessRecordInoutByPage(params) {
196
+    return axios.get(`/opt/business/record/inout/page`, {params})
197 197
   },
198
-  // 稽查管理——删除稽查管理
199
-  deleteInspectionManagement(params) {
200
-    return axios.post(`/opt/inspection/management/delete`, params)
198
+  // 业务记录——添加停车记录
199
+  addBusinessRecordInout(params) {
200
+    return axios.post(`/opt/business/record/inout/add`, params)
201
+  },
202
+  // 业务记录——编辑停车记录
203
+  editBusinessRecordInout(params) {
204
+    return axios.post(`/opt/business/record/inout/edit`, params)
205
+  },
206
+  // 业务记录——删除停车记录
207
+  deleteBusinessRecordInout(params) {
208
+    return axios.post(`/opt/business/record/inout/delete`, params)
209
+  },
210
+  // 业务记录——获取停车支付订单分页
211
+  queryBusinessRecordPaymentByPage(params) {
212
+    return axios.get(`/opt/business/record/payment/page`, {params})
213
+  },
214
+  // 业务记录——添加停车支付订单
215
+  addBusinessRecordPayment(params) {
216
+    return axios.post(`/opt/business/record/payment/add`, params)
217
+  },
218
+  // 业务记录——编辑停车支付订单
219
+  editBusinessRecordPayment(params) {
220
+    return axios.post(`/opt/business/record/payment/edit`, params)
221
+  },
222
+  // 业务记录——删除停车支付订单
223
+  deleteBusinessRecordPayment(params) {
224
+    return axios.post(`/opt/business/record/payment/delete`, params)
225
+  },
226
+  // 业务记录——获取停车欠费订单分页
227
+  queryBusinessRecordArrearsByPage(params) {
228
+    return axios.get(`/opt/business/record/arrears/page`, {params})
229
+  },
230
+  // 业务记录——添加停车欠费订单
231
+  addBusinessRecordArrears(params) {
232
+    return axios.post(`/opt/business/record/arrears/add`, params)
233
+  },
234
+  // 业务记录——编辑停车欠费订单
235
+  editBusinessRecordArrears(params) {
236
+    return axios.post(`/opt/business/record/arrears/edit`, params)
237
+  },
238
+  // 业务记录——删除停车欠费订单
239
+  deleteBusinessRecordArrears(params) {
240
+    return axios.post(`/opt/business/record/arrears/delete`, params)
241
+  },
242
+  // 基础配置——获取系统配置分页
243
+  queryBasicConfigurationSystemByPage(params) {
244
+    return axios.get(`/opt/basic/configuration/system/page`, {params})
245
+  },
246
+  // 基础配置——添加系统配置
247
+  addBasicConfigurationSystem(params) {
248
+    return axios.post(`/opt/basic/configuration/system/add`, params)
249
+  },
250
+  // 基础配置——编辑系统配置
251
+  editBasicConfigurationSystem(params) {
252
+    return axios.post(`/opt/basic/configuration/system/edit`, params)
253
+  },
254
+  // 基础配置——删除系统配置
255
+  deleteBasicConfigurationSystem(params) {
256
+    return axios.post(`/opt/basic/configuration/system/delete`, params)
257
+  },
258
+  // 基础配置——获取通道配置分页
259
+  queryBasicConfigurationLaneByPage(params) {
260
+    return axios.get(`/opt/basic/configuration/lane/page`, {params})
261
+  },
262
+  // 基础配置——添加通道配置
263
+  addBasicConfigurationLane(params) {
264
+    return axios.post(`/opt/basic/configuration/lane/add`, params)
265
+  },
266
+  // 基础配置——编辑通道配置
267
+  editBasicConfigurationLane(params) {
268
+    return axios.post(`/opt/basic/configuration/lane/edit`, params)
269
+  },
270
+  // 基础配置——删除通道配置
271
+  deleteBasicConfigurationLane(params) {
272
+    return axios.post(`/opt/basic/configuration/lane/delete`, params)
273
+  },
274
+  // 基础配置——获取设备信息分页
275
+  queryBasicConfigurationDeviceByPage(params) {
276
+    return axios.get(`/opt/basic/configuration/device/page`, {params})
277
+  },
278
+  // 基础配置——添加设备信息
279
+  addBasicConfigurationDevice(params) {
280
+    return axios.post(`/opt/basic/configuration/device/add`, params)
281
+  },
282
+  // 基础配置——编辑设备信息
283
+  editBasicConfigurationDevice(params) {
284
+    return axios.post(`/opt/basic/configuration/device/edit`, params)
285
+  },
286
+  // 基础配置——删除设备信息
287
+  deleteBasicConfigurationDevice(params) {
288
+    return axios.post(`/opt/basic/configuration/device/delete`, params)
289
+  },
290
+  // 商品订单查询——获取停车卡订单分页
291
+  queryProductOrderParkingByPage(params) {
292
+    return axios.get(`/opt/product/order/parking/page`, {params})
293
+  },
294
+  // 商品订单查询——获取错峰订单分页
295
+  queryProductOrderUnpeakByPage(params) {
296
+    return axios.get(`/opt/product/order/unpeak/page`, {params})
297
+  },
298
+  // 商品订单查询——获取错峰订单分页
299
+  queryProductOrderRefundByPage(params) {
300
+    return axios.get(`/opt/product/order/refund/page`, {params})
301
+  },
302
+  // 电话管理——获取电话管理分页
303
+  queryTelephoneManagementByPage(params) {
304
+    return axios.get(`/opt/telephone/management/page`, {params})
305
+  },
306
+  // 任务报表——获取任务追缴分页
307
+  queryTaskReportByPage(params) {
308
+    return axios.get(`/opt/task/report/page`, {params})
309
+  },
310
+  // 任务审核——获取任务追缴分页-电话
311
+  queryTaskAuditPhoneByPage(params) {
312
+    return axios.get(`/opt/task/audit/phone/page`, {params})
313
+  },
314
+  // 任务审核——获取任务追缴分页-短信
315
+  queryTaskAuditSmsByPage(params) {
316
+    return axios.get(`/opt/task/audit/sms/page`, {params})
317
+  },
318
+  // 任务追缴——获取任务追缴分页-电话
319
+  queryTaskRecoveryPhoneByPage(params) {
320
+    return axios.get(`/opt/task/recovery/phone/page`, {params})
321
+  },
322
+  // 任务追缴——获取任务追缴分页-短信
323
+  queryTaskRecoverySmsByPage(params) {
324
+    return axios.get(`/opt/task/recovery/sms/page`, {params})
325
+  },
326
+  // 基础配置——添加设备信息
327
+  addTaskRecovery(params) {
328
+    return axios.post(`/opt/task/recovery/add`, params)
329
+  },
330
+  // 基础配置——编辑设备信息
331
+  editTaskRecovery(params) {
332
+    return axios.post(`/opt/task/recovery/edit`, params)
333
+  },
334
+  // 基础配置——删除设备信息
335
+  deleteTaskRecovery(params) {
336
+    return axios.post(`/opt/task/recovery/delete`, params)
201 337
   },
202 338
 }

+ 80 - 44
src/pages/index/components/basic_configuration.vue

@@ -6,7 +6,7 @@
6 6
           <el-row>
7 7
             <el-col :span="8">
8 8
               <el-form-item label="配置名称:: ">
9
-                <el-input v-model="formInline1.configurationName" placeholder="请输入"></el-input>
9
+                <el-input v-model="formInline1.configName" placeholder="请输入"></el-input>
10 10
               </el-form-item>
11 11
             </el-col>
12 12
             <el-col :span="8">
@@ -46,10 +46,10 @@
46 46
           <div class="form-div">
47 47
             <el-form label-position="left" label-width="100px" :model="formLabelAlign">
48 48
               <el-form-item label="配置名称">
49
-                <el-input v-model="formLabelAlign.configurationName"></el-input>
49
+                <el-input v-model="formLabelAlign.configName"></el-input>
50 50
               </el-form-item>
51
-              <el-form-item label="车牌号">
52
-                <el-input v-model="formLabelAlign.plateNo"></el-input>
51
+              <el-form-item label="配置数值">
52
+                <el-input v-model="formLabelAlign.configValue"></el-input>
53 53
               </el-form-item>
54 54
             </el-form>
55 55
           </div>
@@ -64,7 +64,7 @@
64 64
           <el-row>
65 65
             <el-col :span="8">
66 66
               <el-form-item label="通道名称: ">
67
-                <el-input v-model="formInline2.channelName" placeholder="请输入"></el-input>
67
+                <el-input v-model="formInline2.laneName" placeholder="请输入"></el-input>
68 68
               </el-form-item>
69 69
             </el-col>
70 70
             <el-col :span="6">
@@ -104,10 +104,10 @@
104 104
           <div class="form-div">
105 105
             <el-form label-position="left" label-width="110px" :model="formLabelAlign2">
106 106
               <el-form-item label="通道名称">
107
-                <el-input v-model="formLabelAlign2.channelName"></el-input>
107
+                <el-input v-model="formLabelAlign2.laneName"></el-input>
108 108
               </el-form-item>
109 109
               <el-form-item label="通道类型">
110
-                <el-input v-model="formLabelAlign2.channelType"></el-input>
110
+                <el-input v-model="formLabelAlign2.laneType"></el-input>
111 111
               </el-form-item>
112 112
             </el-form>
113 113
           </div>
@@ -167,11 +167,26 @@
167 167
           custom-class="audit-dialog">
168 168
           <div class="form-div">
169 169
             <el-form label-position="left" label-width="100px" :model="formLabelAlign3">
170
+              <el-form-item label="设备编码">
171
+                <el-input v-model="formLabelAlign3.deviceCode"></el-input>
172
+              </el-form-item>
170 173
               <el-form-item label="设备名称">
171 174
                 <el-input v-model="formLabelAlign3.deviceName"></el-input>
172 175
               </el-form-item>
173 176
               <el-form-item label="设备类型">
174
-                <el-input v-model="formLabelAlign3.deviceTyoe"></el-input>
177
+                <el-input v-model="formLabelAlign3.deviceType"></el-input>
178
+              </el-form-item>
179
+              <el-form-item label="设备运行状态">
180
+                <el-input v-model="formLabelAlign3.deviceState"></el-input>
181
+              </el-form-item>
182
+              <el-form-item label="所在车场">
183
+                <el-select v-model="formLabelAlign3.parkName" placeholder="请选择">
184
+                  <el-option
185
+                    v-for="(item,index) in carParkingNameOptions"
186
+                    :key="index"
187
+                    :label="item.carParkName"
188
+                    :value="item.carParkName" />
189
+                </el-select>
175 190
               </el-form-item>
176 191
             </el-form>
177 192
           </div>
@@ -187,6 +202,7 @@
187 202
 <script>
188 203
 import api from "@/api/audit.js";
189 204
 import dictionary from "@/util/dictionary";
205
+import api_z from "@/api/article_z.js";
190 206
 
191 207
 export default {
192 208
   components: {},
@@ -196,52 +212,56 @@ export default {
196 212
       columns1: [
197 213
         {
198 214
           label: '配置名称',
199
-          key: 'configurationName'
215
+          key: 'configName'
200 216
         },
201 217
         {
202 218
           label: '配置数值',
203
-          key: 'configurationValue'
219
+          key: 'configValue'
204 220
         },
205 221
       ],
206
-      tableData1: [{carParkingName: 'sasa'}],
222
+      tableData1: [{}],
207 223
       total1: 0,
208 224
       pageSize1: 10,
209 225
       pageNum1: 1,
210 226
       formInline1: {
211
-        configurationName: '',
227
+        configName: '',
212 228
       },
213 229
       title: '',
214 230
       dialogVisible: false,
215 231
       formLabelAlign: {
216 232
         id: '',
217
-        configurationName: '',
218
-        configurationValue: '',
233
+        configName: '',
234
+        configValue: '',
219 235
       },
220 236
       columns2: [
221 237
         {
222 238
           label: '通道名称',
223
-          key: 'channelName'
239
+          key: 'laneName'
224 240
         },
225 241
         {
226 242
           label: '通道类型',
227
-          key: 'channelType'
243
+          key: 'laneType'
228 244
         },
229 245
       ],
230
-      tableData2: [{carParkingName: 'sasa1'}],
246
+      tableData2: [],
231 247
       total2: 0,
232 248
       pageSize2: 10,
233 249
       pageNum2: 1,
234 250
       formInline2: {
235
-        channelName: '',
251
+        laneName: '',
236 252
       },
237 253
       title2: '',
238 254
       dialogVisible2: false,
239 255
       formLabelAlign2: {
240 256
         id: '',
241
-        channelName: '',
242
-        channelType: '',
257
+        laneName: '',
258
+        laneType: '',
243 259
       },
244 260
       columns3: [
261
+        {
262
+          label: '设备编码',
263
+          key: 'deviceCode'
264
+        },
245 265
         {
246 266
           label: '设备名称',
247 267
           key: 'deviceName'
@@ -250,8 +270,16 @@ export default {
250 270
           label: '设备类型',
251 271
           key: 'deviceType'
252 272
         },
273
+        {
274
+          label: '设备运行状态',
275
+          key: 'deviceState'
276
+        },
277
+        {
278
+          label: '所在车场',
279
+          key: 'parkName'
280
+        },
253 281
       ],
254
-      tableData3: [{carParkingName: 'sasa111'}],
282
+      tableData3: [],
255 283
       total3: 0,
256 284
       pageSize3: 10,
257 285
       pageNum3: 1,
@@ -259,20 +287,25 @@ export default {
259 287
         deviceName: '',
260 288
         deviceType: '',
261 289
       },
290
+      carParkingNameValue: '',
291
+      carParkingNameOptions: [],
262 292
       title3: '',
263 293
       dialogVisible3: false,
264 294
       formLabelAlign3: {
265 295
         id: '',
296
+        deviceCode: '',
266 297
         deviceName: '',
267 298
         deviceType: '',
299
+        deviceState: '',
300
+        parkName: '',
268 301
       },
269 302
     }
270 303
   },
271 304
   mounted() {
272
-    // this.getTableData1()
273
-    // this.getTableData2()
274
-    // this.getTableData3()
275
-    // this.getTableData4()
305
+    this.getTableData1()
306
+    this.getTableData2()
307
+    this.getTableData3()
308
+    this.getCarParkingName()
276 309
   },
277 310
   watch: {},
278 311
   methods: {
@@ -282,8 +315,7 @@ export default {
282 315
     },
283 316
     handleAdd() {
284 317
       this.title = '添加'
285
-      this.formLabelAlign.configurationName = ''
286
-      this.formLabelAlign.configurationValue = ''
318
+      this.formLabelAlign = {}
287 319
       this.dialogVisible = true
288 320
     },
289 321
     handleEdit(row) {
@@ -292,7 +324,7 @@ export default {
292 324
       this.dialogVisible = true
293 325
     },
294 326
     deleteRow(record) {
295
-      api.deleteWhiteIp({id: record.id}).then(res => {
327
+      api_z.deleteBasicConfigurationSystem([{id: record.id}]).then(res => {
296 328
         if (res.code === 200) {
297 329
           this.$message({type: 'success', message: '删除成功!'})
298 330
           this.getTableData1()
@@ -301,7 +333,7 @@ export default {
301 333
     },
302 334
     handleConfirm() {
303 335
       if (this.title === '修改') {
304
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
336
+        api_z.editBasicConfigurationSystem({...this.formLabelAlign}).then(res => {
305 337
           if (res.code === 200) {
306 338
             this.dialogVisible = false
307 339
             this.$message({
@@ -312,7 +344,7 @@ export default {
312 344
           }
313 345
         })
314 346
       } else {
315
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
347
+        api_z.addBasicConfigurationSystem({...this.formLabelAlign}).then(res => {
316 348
           if (res.code === 200) {
317 349
             this.dialogVisible = false
318 350
             this.$message({
@@ -324,14 +356,19 @@ export default {
324 356
         })
325 357
       }
326 358
     },
359
+    //车场
360
+    getCarParkingName() {
361
+      api_z.querySelectParkListByPage().then(res => {
362
+        this.carParkingNameOptions=res.data
363
+      })
364
+    },
327 365
     onSubmit2() {
328 366
       this.pageNum2 = 1
329 367
       this.getTableData2()
330 368
     },
331 369
     handleAdd2() {
332 370
       this.title2 = '添加'
333
-      this.formLabelAlign2.channelName = ''
334
-      this.formLabelAlign2.channelType = ''
371
+      this.formLabelAlign2 = {}
335 372
       this.dialogVisible2 = true
336 373
     },
337 374
 
@@ -341,7 +378,7 @@ export default {
341 378
       this.dialogVisible2 = true
342 379
     },
343 380
     deleteRow2(record) {
344
-      api.deleteWhiteIp({id: record.id}).then(res => {
381
+      api_z.deleteBasicConfigurationLane([{id: record.id}]).then(res => {
345 382
         if (res.code === 200) {
346 383
           this.$message({type: 'success', message: '删除成功!'})
347 384
           this.getTableData2()
@@ -350,7 +387,7 @@ export default {
350 387
     },
351 388
     handleConfirm2() {
352 389
       if (this.title2 === '修改') {
353
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr, id: this.formLabelAlign2.id}).then(res => {
390
+        api_z.editBasicConfigurationLane({...this.formLabelAlign2}).then(res => {
354 391
           if (res.code === 200) {
355 392
             this.dialogVisible2 = false
356 393
             this.$message({
@@ -361,7 +398,7 @@ export default {
361 398
           }
362 399
         })
363 400
       } else {
364
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr}).then(res => {
401
+        api_z.addBasicConfigurationLane({...this.formLabelAlign2}).then(res => {
365 402
           if (res.code === 200) {
366 403
             this.dialogVisible2 = false
367 404
             this.$message({
@@ -379,8 +416,7 @@ export default {
379 416
     },
380 417
     handleAdd3() {
381 418
       this.title3 = '添加'
382
-      this.formLabelAlign3.deviceName = ''
383
-      this.formLabelAlign3.deviceType = ''
419
+      this.formLabelAlign3 = {}
384 420
       this.dialogVisible3 = true
385 421
     },
386 422
 
@@ -390,7 +426,7 @@ export default {
390 426
       this.dialogVisible3 = true
391 427
     },
392 428
     deleteRow3(record) {
393
-      api.deleteWhiteIp({id: record.id}).then(res => {
429
+      api_z.deleteBasicConfigurationDevice([{id: record.id}]).then(res => {
394 430
         if (res.code === 200) {
395 431
           this.$message({type: 'success', message: '删除成功!'})
396 432
           this.getTableData3()
@@ -399,7 +435,7 @@ export default {
399 435
     },
400 436
     handleConfirm3() {
401 437
       if (this.title3 === '修改') {
402
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr, id: this.formLabelAlign3.id}).then(res => {
438
+        api_z.editBasicConfigurationDevice({...this.formLabelAlign3}).then(res => {
403 439
           if (res.code === 200) {
404 440
             this.dialogVisible3 = false
405 441
             this.$message({
@@ -410,7 +446,7 @@ export default {
410 446
           }
411 447
         })
412 448
       } else {
413
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr}).then(res => {
449
+        api_z.addBasicConfigurationDevice({...this.formLabelAlign3}).then(res => {
414 450
           if (res.code === 200) {
415 451
             this.dialogVisible3 = false
416 452
             this.$message({
@@ -427,7 +463,7 @@ export default {
427 463
     },
428 464
     getTableData1() {
429 465
       const {pageNum1, pageSize1} = this
430
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
466
+      api_z.queryBasicConfigurationSystemByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
431 467
         this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
432 468
         this.total1 = res.data.total
433 469
       })
@@ -437,7 +473,7 @@ export default {
437 473
     },
438 474
     getTableData2() {
439 475
       const {pageNum2, pageSize2} = this
440
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
476
+      api_z.queryBasicConfigurationLaneByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
441 477
         this.tableData2 = res.data.records || []
442 478
         this.total2 = res.data.total
443 479
       })
@@ -447,7 +483,7 @@ export default {
447 483
     },
448 484
     getTableData3() {
449 485
       const {pageNum3, pageSize3} = this
450
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
486
+      api_z.queryBasicConfigurationDeviceByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
451 487
         this.tableData3 = res.data.records || []
452 488
         this.total3 = res.data.total
453 489
       })
@@ -489,7 +525,7 @@ export default {
489 525
     .form-div {
490 526
       /deep/ .el-input__inner {
491 527
         height: 35px;
492
-        width: 90%;
528
+        width: 99%;
493 529
         border: 1px solid #a6a5a5;
494 530
       }
495 531
     }

+ 138 - 88
src/pages/index/components/business_record.vue

@@ -6,7 +6,13 @@
6 6
           <el-row>
7 7
             <el-col :span="6">
8 8
               <el-form-item label="车场名称: ">
9
-                <el-input v-model="formInline1.carParkingName" placeholder="请输入"></el-input>
9
+                <el-select clearable v-model="formInline1.parkLotId" placeholder="请选择">
10
+                  <el-option
11
+                    v-for="(item,index) in carParkingNameOptions"
12
+                    :key="index"
13
+                    :label="item.carParkName"
14
+                    :value="item.parkId" />
15
+                </el-select>
10 16
               </el-form-item>
11 17
             </el-col>
12 18
             <el-col :span="6">
@@ -16,7 +22,7 @@
16 22
             </el-col>
17 23
             <el-col :span="6">
18 24
               <el-form-item label="车位号: ">
19
-                <el-input v-model="formInline1.code" placeholder="请输入"></el-input>
25
+                <el-input v-model="formInline1.parkingNo" placeholder="请输入"></el-input>
20 26
               </el-form-item>
21 27
             </el-col>
22 28
             <el-col :span="5">
@@ -56,19 +62,35 @@
56 62
           <div class="form-div">
57 63
             <el-form label-position="left" label-width="100px" :model="formLabelAlign">
58 64
               <el-form-item label="车场名称">
59
-                <el-input v-model="formLabelAlign.carParkingName"></el-input>
65
+                <el-select v-model="formLabelAlign.parkLotId" placeholder="请选择">
66
+                  <el-option
67
+                    v-for="(item,index) in carParkingNameOptions"
68
+                    :key="index"
69
+                    :label="item.carParkName"
70
+                    :value="item.parkId" />
71
+                </el-select>
60 72
               </el-form-item>
61 73
               <el-form-item label="车牌号">
62 74
                 <el-input v-model="formLabelAlign.plateNo"></el-input>
63 75
               </el-form-item>
64 76
               <el-form-item label="入场时间">
65
-                <el-input v-model="formLabelAlign.inTime"></el-input>
77
+                <el-date-picker
78
+                  v-model="formLabelAlign.inTime"
79
+                  type="datetime"
80
+                  value-format="yyyy-MM-dd HH:mm:ss"
81
+                  placeholder="选择日期时间">
82
+                </el-date-picker>
66 83
               </el-form-item>
67 84
               <el-form-item label="离场时间">
68
-                <el-input v-model="formLabelAlign.outTime"></el-input>
85
+                <el-date-picker
86
+                  v-model="formLabelAlign.outTime"
87
+                  type="datetime"
88
+                  value-format="yyyy-MM-dd HH:mm:ss"
89
+                  placeholder="选择日期时间">
90
+                </el-date-picker>
69 91
               </el-form-item>
70 92
               <el-form-item label="车位号">
71
-                <el-input v-model="formLabelAlign.code"></el-input>
93
+                <el-input v-model="formLabelAlign.parkingNo"></el-input>
72 94
               </el-form-item>
73 95
             </el-form>
74 96
           </div>
@@ -83,7 +105,13 @@
83 105
           <el-row>
84 106
             <el-col :span="8">
85 107
               <el-form-item label="车场名称: ">
86
-                <el-input v-model="formInline2.carParkingName" placeholder="请输入"></el-input>
108
+                <el-select clearable v-model="formInline2.parkLotId" placeholder="请选择">
109
+                  <el-option
110
+                    v-for="(item,index) in carParkingNameOptions"
111
+                    :key="index"
112
+                    :label="item.carParkName"
113
+                    :value="item.parkId" />
114
+                </el-select>
87 115
               </el-form-item>
88 116
             </el-col>
89 117
             <el-col :span="8">
@@ -128,22 +156,33 @@
128 156
           <div class="form-div">
129 157
             <el-form label-position="left" label-width="110px" :model="formLabelAlign2">
130 158
               <el-form-item label="车场名称">
131
-                <el-input v-model="formLabelAlign2.carParkingName"></el-input>
159
+                <el-select v-model="formLabelAlign2.parkLotId" placeholder="请选择">
160
+                  <el-option
161
+                    v-for="(item,index) in carParkingNameOptions"
162
+                    :key="index"
163
+                    :label="item.carParkName"
164
+                    :value="item.parkId" />
165
+                </el-select>
132 166
               </el-form-item>
133 167
               <el-form-item label="车牌号">
134 168
                 <el-input v-model="formLabelAlign2.plateNo"></el-input>
135 169
               </el-form-item>
136 170
               <el-form-item label="支付金额">
137
-                <el-input v-model="formLabelAlign2.payAmount"></el-input>
171
+                <el-input v-model="formLabelAlign2.paymentAmount"></el-input>
138 172
               </el-form-item>
139 173
               <el-form-item label="支付方式">
140
-                <el-input v-model="formLabelAlign2.payMethod"></el-input>
174
+                <el-input v-model="formLabelAlign2.paymentMethod"></el-input>
141 175
               </el-form-item>
142 176
               <el-form-item label="支付状态">
143
-                <el-input v-model="formLabelAlign2.payType"></el-input>
177
+                <el-input v-model="formLabelAlign2.paymentStatus"></el-input>
144 178
               </el-form-item>
145 179
               <el-form-item label="支付时间">
146
-                <el-input v-model="formLabelAlign2.payTime"></el-input>
180
+                <el-date-picker
181
+                  v-model="formLabelAlign2.paymentTime"
182
+                  type="datetime"
183
+                  value-format="yyyy-MM-dd HH:mm:ss"
184
+                  placeholder="选择日期时间">
185
+                </el-date-picker>
147 186
               </el-form-item>
148 187
             </el-form>
149 188
           </div>
@@ -158,7 +197,13 @@
158 197
           <el-row>
159 198
             <el-col :span="8">
160 199
               <el-form-item label="车场名称:">
161
-                <el-input v-model="formInline3.carParkingName" placeholder="请输入"></el-input>
200
+                <el-select clearable v-model="formInline3.parkLotId" placeholder="请选择">
201
+                  <el-option
202
+                    v-for="(item,index) in carParkingNameOptions"
203
+                    :key="index"
204
+                    :label="item.carParkName"
205
+                    :value="item.parkId" />
206
+                </el-select>
162 207
               </el-form-item>
163 208
             </el-col>
164 209
             <el-col :span="8">
@@ -204,32 +249,43 @@
204 249
           <div class="form-div">
205 250
             <el-form label-position="left" label-width="100px" :model="formLabelAlign3">
206 251
               <el-form-item label="车场名称">
207
-                <el-input v-model="formLabelAlign3.carParkingName"></el-input>
252
+                <el-select v-model="formLabelAlign3.parkLotId" placeholder="请选择">
253
+                  <el-option
254
+                    v-for="(item,index) in carParkingNameOptions"
255
+                    :key="index"
256
+                    :label="item.carParkName"
257
+                    :value="item.parkId" />
258
+                </el-select>
208 259
               </el-form-item>
209 260
               <el-form-item label="车牌号">
210 261
                 <el-input v-model="formLabelAlign3.plateNo"></el-input>
211 262
               </el-form-item>
212 263
               <el-form-item label="停车时长(h)">
213
-                <el-input v-model="formLabelAlign3.parkDuration"></el-input>
264
+                <el-input v-model="formLabelAlign3.parkingDuration"></el-input>
214 265
               </el-form-item>
215 266
               <el-form-item label="欠费金额">
216
-                <el-input v-model="formLabelAlign3.owedAmount"></el-input>
267
+                <el-input v-model="formLabelAlign3.arrearsAmount"></el-input>
217 268
               </el-form-item>
218 269
               <el-form-item label="支付方式">
219
-                <el-input v-model="formLabelAlign3.payMethod"></el-input>
270
+                <el-input v-model="formLabelAlign3.paymentMethod"></el-input>
220 271
               </el-form-item>
221 272
               <el-form-item label="支付状态">
222
-                <el-input v-model="formLabelAlign3.payType"></el-input>
273
+                <el-input v-model="formLabelAlign3.paymentStatus"></el-input>
223 274
               </el-form-item>
224 275
               <el-form-item label="支付时间">
225
-                <el-input v-model="formLabelAlign3.payTime"></el-input>
276
+                <el-date-picker
277
+                  v-model="formLabelAlign3.paymentTime"
278
+                  type="datetime"
279
+                  value-format="yyyy-MM-dd HH:mm:ss"
280
+                  placeholder="选择日期时间">
281
+                </el-date-picker>
226 282
               </el-form-item>
227 283
             </el-form>
228 284
           </div>
229 285
           <span slot="footer" class="dialog-footer">
230 286
             <el-button @click="dialogVisible3 = false">取 消</el-button>
231 287
             <el-button type="primary" @click="handleConfirm3">确 定</el-button>
232
-        </span>
288
+          </span>
233 289
         </el-dialog>
234 290
       </el-tab-pane>
235 291
     </el-tabs>
@@ -238,6 +294,7 @@
238 294
 <script>
239 295
 import api from "@/api/audit.js";
240 296
 import dictionary from "@/util/dictionary";
297
+import api_z from "@/api/article_z.js";
241 298
 
242 299
 export default {
243 300
   components: {},
@@ -247,7 +304,7 @@ export default {
247 304
       columns1: [
248 305
         {
249 306
           label: '车场名称',
250
-          key: 'carParkingName'
307
+          key: 'parkName'
251 308
         },
252 309
         {
253 310
           label: '车牌号',
@@ -263,36 +320,38 @@ export default {
263 320
         },
264 321
         {
265 322
           label: '车位号',
266
-          key: 'code'
323
+          key: 'parkingNo'
267 324
         },
268 325
       ],
269
-      tableData1: [{carParkingName: 'sasa'}],
326
+      tableData1: [{parkLotId: 'sasa'}],
270 327
       total1: 0,
271 328
       pageSize1: 10,
272 329
       pageNum1: 1,
273 330
       formInline1: {
274
-        carParkingName: '',
331
+        parkLotId: '',
275 332
         plateNo: '',
276
-        code: '',
333
+        parkingNo: '',
277 334
       },
335
+      carParkingNameValue: '',
336
+      carParkingNameOptions: [],
278 337
       title: '',
279 338
       dialogVisible: false,
280 339
       formLabelAlign: {
281 340
         id: '',
282
-        carParkingName: '',
341
+        parkLotId: '',
283 342
         plateNo: '',
284 343
         inTime: '',
285 344
         outTime: '',
286
-        code: '',
345
+        parkingNo: '',
287 346
       },
288 347
       columns2: [
289 348
         {
290 349
           label: '订单号',
291
-          key: 'code'
350
+          key: 'orderNo'
292 351
         },
293 352
         {
294 353
           label: '车场名称',
295
-          key: 'carParkingName'
354
+          key: 'parkName'
296 355
         },
297 356
         {
298 357
           label: '车牌号',
@@ -300,48 +359,48 @@ export default {
300 359
         },
301 360
         {
302 361
           label: '支付金额',
303
-          key: 'payAmount'
362
+          key: 'paymentAmount'
304 363
         },
305 364
         {
306 365
           label: '支付方式',
307
-          key: 'payMethod'
366
+          key: 'paymentMethod'
308 367
         },
309 368
         {
310 369
           label: '支付状态',
311
-          key: 'payType'
370
+          key: 'paymentStatus'
312 371
         },
313 372
         {
314 373
           label: '支付时间',
315
-          key: 'payTime'
374
+          key: 'paymentTime'
316 375
         },
317 376
       ],
318
-      tableData2: [{carParkingName: 'sasa1'}],
377
+      tableData2: [{parkName: 'sasa1'}],
319 378
       total2: 0,
320 379
       pageSize2: 10,
321 380
       pageNum2: 1,
322 381
       formInline2: {
323
-        carParkingName: '',
382
+        parkLotId: '',
324 383
         plateNo: '',
325 384
       },
326 385
       title2: '',
327 386
       dialogVisible2: false,
328 387
       formLabelAlign2: {
329 388
         id: '',
330
-        carParkingName: '',
389
+        parkLotId: '',
331 390
         plateNo: '',
332
-        payAmount: '',
333
-        payMethod: '',
334
-        payType: '',
335
-        payTime: '',
391
+        paymentAmount: '',
392
+        paymentMethod: '',
393
+        paymentStatus: '',
394
+        paymentTime: '',
336 395
       },
337 396
       columns3: [
338 397
         {
339 398
           label: '订单号',
340
-          key: 'code'
399
+          key: 'orderNo'
341 400
         },
342 401
         {
343 402
           label: '车场名称',
344
-          key: 'carParkingName'
403
+          key: 'parkName'
345 404
         },
346 405
         {
347 406
           label: '车牌号',
@@ -349,23 +408,23 @@ export default {
349 408
         },
350 409
         {
351 410
           label: '停车时长(h)',
352
-          key: 'parkDuration'
411
+          key: 'parkingDuration'
353 412
         },
354 413
         {
355 414
           label: '欠费金额',
356
-          key: 'owedAmount'
415
+          key: 'arrearsAmount'
357 416
         },
358 417
         {
359 418
           label: '支付方式',
360
-          key: 'payMethod'
419
+          key: 'paymentMethod'
361 420
         },
362 421
         {
363 422
           label: '支付状态',
364
-          key: 'payType'
423
+          key: 'paymentStatus'
365 424
         },
366 425
         {
367 426
           label: '支付时间',
368
-          key: 'payTime'
427
+          key: 'paymentTime'
369 428
         },
370 429
       ],
371 430
       tableData3: [{carParkingName: 'sasa111'}],
@@ -382,19 +441,19 @@ export default {
382 441
         id: '',
383 442
         carParkingName: '',
384 443
         plateNo: '',
385
-        parkDuration: '',
386
-        owedAmount: '',
387
-        payMethod: '',
388
-        payType: '',
389
-        payTime: '',
444
+        parkingDuration: '',
445
+        arrearsAmount: '',
446
+        paymentMethod: '',
447
+        paymentStatus: '',
448
+        paymentTime: '',
390 449
       },
391 450
     }
392 451
   },
393 452
   mounted() {
394
-    // this.getTableData1()
395
-    // this.getTableData2()
396
-    // this.getTableData3()
397
-    // this.getTableData4()
453
+    this.getTableData1()
454
+    this.getCarParkingName()
455
+    this.getTableData2()
456
+    this.getTableData3()
398 457
   },
399 458
   watch: {},
400 459
   methods: {
@@ -404,11 +463,7 @@ export default {
404 463
     },
405 464
     handleAdd() {
406 465
       this.title = '添加'
407
-      this.formLabelAlign.carParkingName = ''
408
-      this.formLabelAlign.plateNo = ''
409
-      this.formLabelAlign.inTime = ''
410
-      this.formLabelAlign.outTime = ''
411
-      this.formLabelAlign.code = ''
466
+      this.formLabelAlign = {}
412 467
       this.dialogVisible = true
413 468
     },
414 469
     handleEdit(row) {
@@ -417,7 +472,7 @@ export default {
417 472
       this.dialogVisible = true
418 473
     },
419 474
     deleteRow(record) {
420
-      api.deleteWhiteIp({id: record.id}).then(res => {
475
+      api_z.deleteBusinessRecordInout([{id: record.id}]).then(res => {
421 476
         if (res.code === 200) {
422 477
           this.$message({type: 'success', message: '删除成功!'})
423 478
           this.getTableData1()
@@ -426,7 +481,7 @@ export default {
426 481
     },
427 482
     handleConfirm() {
428 483
       if (this.title === '修改') {
429
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
484
+        api_z.editBusinessRecordInout({...this.formLabelAlign}).then(res => {
430 485
           if (res.code === 200) {
431 486
             this.dialogVisible = false
432 487
             this.$message({
@@ -437,7 +492,7 @@ export default {
437 492
           }
438 493
         })
439 494
       } else {
440
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
495
+        api_z.addBusinessRecordInout({...this.formLabelAlign}).then(res => {
441 496
           if (res.code === 200) {
442 497
             this.dialogVisible = false
443 498
             this.$message({
@@ -449,18 +504,19 @@ export default {
449 504
         })
450 505
       }
451 506
     },
507
+    //车场
508
+    getCarParkingName() {
509
+      api_z.querySelectParkListByPage().then(res => {
510
+        this.carParkingNameOptions=res.data
511
+      })
512
+    },
452 513
     onSubmit2() {
453 514
       this.pageNum2 = 1
454 515
       this.getTableData2()
455 516
     },
456 517
     handleAdd2() {
457 518
       this.title2 = '添加'
458
-      this.formLabelAlign2.carParkingName = ''
459
-      this.formLabelAlign2.plateNo = ''
460
-      this.formLabelAlign2.payAmount = ''
461
-      this.formLabelAlign2.payMethod = ''
462
-      this.formLabelAlign2.payType = ''
463
-      this.formLabelAlign2.payTime = ''
519
+      this.formLabelAlign2 = {}
464 520
       this.dialogVisible2 = true
465 521
     },
466 522
 
@@ -470,7 +526,7 @@ export default {
470 526
       this.dialogVisible2 = true
471 527
     },
472 528
     deleteRow2(record) {
473
-      api.deleteWhiteIp({id: record.id}).then(res => {
529
+      api_z.deleteBusinessRecordPayment([{id: record.id}]).then(res => {
474 530
         if (res.code === 200) {
475 531
           this.$message({type: 'success', message: '删除成功!'})
476 532
           this.getTableData2()
@@ -479,7 +535,7 @@ export default {
479 535
     },
480 536
     handleConfirm2() {
481 537
       if (this.title2 === '修改') {
482
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr, id: this.formLabelAlign2.id}).then(res => {
538
+        api_z.editBusinessRecordPayment({...this.formLabelAlign2}).then(res => {
483 539
           if (res.code === 200) {
484 540
             this.dialogVisible2 = false
485 541
             this.$message({
@@ -490,7 +546,7 @@ export default {
490 546
           }
491 547
         })
492 548
       } else {
493
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr}).then(res => {
549
+        api_z.addBusinessRecordPayment({...this.formLabelAlign2}).then(res => {
494 550
           if (res.code === 200) {
495 551
             this.dialogVisible2 = false
496 552
             this.$message({
@@ -508,13 +564,7 @@ export default {
508 564
     },
509 565
     handleAdd3() {
510 566
       this.title3 = '添加'
511
-      this.formLabelAlign3.carParkingName = ''
512
-      this.formLabelAlign3.plateNo = ''
513
-      this.formLabelAlign3.parkDuration = ''
514
-      this.formLabelAlign3.owedAmount = ''
515
-      this.formLabelAlign3.payMethod = ''
516
-      this.formLabelAlign3.payType = ''
517
-      this.formLabelAlign3.payTime = ''
567
+      this.formLabelAlign3 = {}
518 568
       this.dialogVisible3 = true
519 569
     },
520 570
 
@@ -524,7 +574,7 @@ export default {
524 574
       this.dialogVisible3 = true
525 575
     },
526 576
     deleteRow3(record) {
527
-      api.deleteWhiteIp({id: record.id}).then(res => {
577
+      api_z.deleteBusinessRecordArrears([{id: record.id}]).then(res => {
528 578
         if (res.code === 200) {
529 579
           this.$message({type: 'success', message: '删除成功!'})
530 580
           this.getTableData3()
@@ -533,7 +583,7 @@ export default {
533 583
     },
534 584
     handleConfirm3() {
535 585
       if (this.title3 === '修改') {
536
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr, id: this.formLabelAlign3.id}).then(res => {
586
+        api_z.editBusinessRecordArrears({...this.formLabelAlign3}).then(res => {
537 587
           if (res.code === 200) {
538 588
             this.dialogVisible3 = false
539 589
             this.$message({
@@ -544,7 +594,7 @@ export default {
544 594
           }
545 595
         })
546 596
       } else {
547
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr}).then(res => {
597
+        api_z.addBusinessRecordArrears({...this.formLabelAlign3}).then(res => {
548 598
           if (res.code === 200) {
549 599
             this.dialogVisible3 = false
550 600
             this.$message({
@@ -561,8 +611,8 @@ export default {
561 611
     },
562 612
     getTableData1() {
563 613
       const {pageNum1, pageSize1} = this
564
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
565
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
614
+      api_z.queryBusinessRecordInoutByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
615
+        this.tableData1 = res.data.records || []
566 616
         this.total1 = res.data.total
567 617
       })
568 618
     },
@@ -571,7 +621,7 @@ export default {
571 621
     },
572 622
     getTableData2() {
573 623
       const {pageNum2, pageSize2} = this
574
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
624
+      api_z.queryBusinessRecordPaymentByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
575 625
         this.tableData2 = res.data.records || []
576 626
         this.total2 = res.data.total
577 627
       })
@@ -581,7 +631,7 @@ export default {
581 631
     },
582 632
     getTableData3() {
583 633
       const {pageNum3, pageSize3} = this
584
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
634
+      api_z.queryBusinessRecordArrearsByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
585 635
         this.tableData3 = res.data.records || []
586 636
         this.total3 = res.data.total
587 637
       })
@@ -623,7 +673,7 @@ export default {
623 673
     .form-div {
624 674
       /deep/ .el-input__inner {
625 675
         height: 35px;
626
-        width: 90%;
676
+        width: 99%;
627 677
         border: 1px solid #a6a5a5;
628 678
       }
629 679
     }

+ 43 - 93
src/pages/index/components/product_order.vue

@@ -6,21 +6,7 @@
6 6
           <el-row>
7 7
             <el-col :span="8">
8 8
               <el-form-item label="订单号:">
9
-                <el-input v-model="formInline1.orderCode" placeholder="请输入"></el-input>
10
-              </el-form-item>
11
-            </el-col>
12
-            <el-col :span="8">
13
-              <el-form-item label="日期:">
14
-                <el-date-picker
15
-                  v-model="formInline1.time"
16
-                  type="daterange"
17
-                  align="right"
18
-                  unlink-panels
19
-                  range-separator="-"
20
-                  value-format="yyyy-MM-dd HH:mm:ss"
21
-                  start-placeholder="开始日期"
22
-                  end-placeholder="结束日期">
23
-                </el-date-picker>
9
+                <el-input v-model="formInline1.orderNo" placeholder="请输入"></el-input>
24 10
               </el-form-item>
25 11
             </el-col>
26 12
             <el-col :span="8">
@@ -45,7 +31,7 @@
45 31
           <el-row>
46 32
             <el-col :span="8">
47 33
               <el-form-item label="订单号: ">
48
-                <el-input v-model="formInline2.orderCode" placeholder="请输入"></el-input>
34
+                <el-input v-model="formInline2.orderNo" placeholder="请输入"></el-input>
49 35
               </el-form-item>
50 36
             </el-col>
51 37
             <el-col :span="8">
@@ -75,7 +61,7 @@
75 61
           <el-row>
76 62
             <el-col :span="6">
77 63
               <el-form-item label="订单号:">
78
-                <el-input v-model="formInline3.orderCode" placeholder="请输入"></el-input>
64
+                <el-input v-model="formInline3.orderNo" placeholder="请输入"></el-input>
79 65
               </el-form-item>
80 66
             </el-col>
81 67
             <el-col :span="6">
@@ -111,6 +97,7 @@
111 97
 <script>
112 98
 import api from "@/api/audit.js";
113 99
 import dictionary from "@/util/dictionary";
100
+import api_z from "@/api/article_z.js";
114 101
 
115 102
 export default {
116 103
   components: {},
@@ -120,83 +107,87 @@ export default {
120 107
       columns1: [
121 108
         {
122 109
           label: '订单号',
123
-          key: 'orderCode'
110
+          key: 'orderNo'
124 111
         },
125 112
         {
126
-          label: '支付日期',
127
-          key: ''
113
+          label: '下单时间',
114
+          key: 'createTime'
128 115
         },
129 116
         {
130 117
           label: '支付金额',
131
-          key: ''
118
+          key: 'payAmount'
132 119
         },
133 120
         {
134
-          label: '泊位号',
135
-          key: ''
121
+          label: '支付方式',
122
+          key: 'payWay'
136 123
         },
137 124
         {
138 125
           label: '车牌号',
139
-          key: ''
126
+          key: 'plateNo'
140 127
         },
141 128
         {
142
-          label: '入场日期',
143
-          key: ''
129
+          label: '支付状态',
130
+          key: 'payStatus'
144 131
         },
145
-        {
146
-          label: '出场日期',
147
-          key: ''
148
-        }
149 132
       ],
150 133
       tableData1: [],
151 134
       total1: 0,
152 135
       pageSize1: 10,
153 136
       pageNum1: 1,
154 137
       formInline1: {
155
-        orderCode: '',
138
+        orderNo: '',
156 139
         time:''
157 140
       },
158 141
       columns2: [
159 142
         {
160
-          label: '欠费订单号',
161
-          key: ''
143
+          label: '订单号',
144
+          key: 'orderNo'
162 145
         },
163 146
         {
164 147
           label: '车牌号',
165
-          key: ''
148
+          key: 'plateNo'
149
+        },
150
+        {
151
+          label: '泊位号',
152
+          key: 'parkingNo'
166 153
         },
167 154
         {
168
-          label: '修改日期',
169
-          key: ''
155
+          label: '支付金额',
156
+          key: 'payAmount'
157
+        },
158
+        {
159
+          label: '支付方式',
160
+          key: 'payWay'
170 161
         },
171 162
         {
172
-          label: '欠费金额',
173
-          key: ''
174
-        }
163
+          label: '支付状态',
164
+          key: 'payStatus'
165
+        },
175 166
       ],
176 167
       tableData2: [],
177 168
       total2: 0,
178 169
       pageSize2: 10,
179 170
       pageNum2: 1,
180 171
       formInline2: {
181
-        orderCode: '',
172
+        orderNo: '',
182 173
         plateNo:''
183 174
       },
184 175
       columns3: [
185 176
         {
186 177
           label: '订单号',
187
-          key: ''
178
+          key: 'orderNo'
188 179
         },
189 180
         {
190 181
           label: '泊位号',
191
-          key: ''
182
+          key: 'parkingNo'
192 183
         },
193 184
         {
194 185
           label: '车牌号',
195
-          key: ''
186
+          key: 'plateNo'
196 187
         },
197 188
         {
198 189
           label: '应付金额',
199
-          key: ''
190
+          key: 'payableAmount'
200 191
         },
201 192
       ],
202 193
       tableData3: [],
@@ -204,43 +195,16 @@ export default {
204 195
       pageSize3: 10,
205 196
       pageNum3: 1,
206 197
       formInline3: {
207
-        orderCode:'',
198
+        orderNo:'',
208 199
         berthCode:'',
209 200
         plateNo: ''
210 201
       },
211
-      columns4: [
212
-        {
213
-          label: '订单号',
214
-          key: ''
215
-        },
216
-        {
217
-          label: '泊位号',
218
-          key: ''
219
-        },
220
-        {
221
-          label: '车牌号',
222
-          key: ''
223
-        },
224
-        {
225
-          label: '预付金额',
226
-          key: ''
227
-        },
228
-      ],
229
-      tableData4: [],
230
-      total4: 0,
231
-      pageSize4: 10,
232
-      pageNum4: 1,
233
-      formInline4: {
234
-        orderCode:'',
235
-        berthCode:'',
236
-        plateNo: ''
237
-      }
238 202
     }
239 203
   },
240 204
   mounted() {
241
-    // this.getTableData1()
242
-    // this.getTableData2()
243
-    // this.getTableData3()
205
+    this.getTableData1()
206
+    this.getTableData2()
207
+    this.getTableData3()
244 208
   },
245 209
   watch: {
246 210
   },
@@ -257,17 +221,13 @@ export default {
257 221
       this.pageNum3 = 1
258 222
       this.getTableData3()
259 223
     },
260
-    onSubmit4() {
261
-      this.pageNum4 = 1
262
-      this.getTableData4()
263
-    },
264 224
     handlePageChange1() {
265 225
       this.getTableData1()
266 226
     },
267 227
     getTableData1() {
268 228
       const {pageNum1, pageSize1} = this
269
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
270
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
229
+      api_z.queryProductOrderParkingByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
230
+        this.tableData1 = res.data.records || []
271 231
         this.total1 = res.data.total
272 232
       })
273 233
     },
@@ -276,7 +236,7 @@ export default {
276 236
     },
277 237
     getTableData2() {
278 238
       const {pageNum2, pageSize2} = this
279
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
239
+      api_z.queryProductOrderUnpeakByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
280 240
         this.tableData2 = res.data.records || []
281 241
         this.total2 = res.data.total
282 242
       })
@@ -286,21 +246,11 @@ export default {
286 246
     },
287 247
     getTableData3() {
288 248
       const {pageNum3, pageSize3} = this
289
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
249
+      api_z.queryProductOrderRefundByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
290 250
         this.tableData3 = res.data.records || []
291 251
         this.total3 = res.data.total
292 252
       })
293 253
     },
294
-    handlePageChange4() {
295
-      this.getTableData3()
296
-    },
297
-    getTableData4() {
298
-      const {pageNum4, pageSize4} = this
299
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
300
-        this.tableData4 = res.data.records || []
301
-        this.total4 = res.data.total
302
-      })
303
-    }
304 254
   }
305 255
 }
306 256
 </script>

+ 32 - 19
src/pages/index/components/task_audit.vue

@@ -11,7 +11,7 @@
11 11
             </el-col>
12 12
             <el-col :span="6">
13 13
               <el-form-item label="电话号码: ">
14
-                <el-input v-model="formInline1.phone" placeholder="请输入"></el-input>
14
+                <el-input v-model="formInline1.phoneNo" placeholder="请输入"></el-input>
15 15
               </el-form-item>
16 16
             </el-col>
17 17
             <el-col :span="6">
@@ -76,7 +76,7 @@
76 76
             </el-col>
77 77
             <el-col :span="6">
78 78
               <el-form-item label="电话号码: ">
79
-                <el-input v-model="formInline2.phone" placeholder="请输入"></el-input>
79
+                <el-input v-model="formInline2.phoneNo" placeholder="请输入"></el-input>
80 80
               </el-form-item>
81 81
             </el-col>
82 82
             <el-col :span="6">
@@ -137,6 +137,7 @@
137 137
 <script>
138 138
 import api from "@/api/audit.js";
139 139
 import dictionary from "@/util/dictionary";
140
+import api_z from "@/api/article_z.js";
140 141
 
141 142
 export default {
142 143
   components: {},
@@ -150,19 +151,23 @@ export default {
150 151
         },
151 152
         {
152 153
           label: '电话号码',
153
-          key: 'phone'
154
+          key: 'phoneNo'
154 155
         },
155 156
         {
156 157
           label: '欠缴金额',
157
-          key: 'questionDescription'
158
+          key: 'arrearsAmount'
158 159
         },
159 160
         {
160 161
           label: '追缴日期',
161
-          key: 'creatTime'
162
+          key: 'recoveryTime'
162 163
         },
163 164
         {
164 165
           label: '追缴状态',
165
-          key: 'creatTime'
166
+          key: 'recoveryStatus'
167
+        },
168
+        {
169
+          label: '追缴结果',
170
+          key: 'recoveryResult'
166 171
         },
167 172
       ],
168 173
       tableData1: [{parkingCardName:'昌建东外滩西南停车场',type:'实地考察',questionDescription:'部分车位存在一车多位的占用现象',creatTime:'2023-12-30'}],
@@ -177,20 +182,28 @@ export default {
177 182
       },
178 183
       columns2: [
179 184
         {
180
-          label: '稽查对象',
181
-          key: 'parkingCardName'
185
+          label: '车牌号',
186
+          key: 'plateNo'
187
+        },
188
+        {
189
+          label: '电话号码',
190
+          key: 'phoneNo'
191
+        },
192
+        {
193
+          label: '欠缴金额',
194
+          key: 'arrearsAmount'
182 195
         },
183 196
         {
184
-          label: '取证类型',
185
-          key: 'type'
197
+          label: '追缴日期',
198
+          key: 'recoveryTime'
186 199
         },
187 200
         {
188
-          label: '问题描述',
189
-          key: 'questionDescription'
201
+          label: '追缴状态',
202
+          key: 'recoveryStatus'
190 203
         },
191 204
         {
192
-          label: '创建日期',
193
-          key: 'creatTime'
205
+          label: '追缴结果',
206
+          key: 'recoveryResult'
194 207
         },
195 208
       ],
196 209
       tableData2: [{parkingCardName:'昌建东外滩西南停车场',type:'实地考察',questionDescription:'部分车位存在一车多位的占用现象',creatTime:'2023-12-30'}],
@@ -234,7 +247,7 @@ export default {
234 247
     },
235 248
     handleConfirm() {
236 249
       const {id} = this.formLabelAlign2.id
237
-      api.applyResource({id, applyType: this.radio}).then(res => {
250
+      api_z.applyResource({id, applyType: this.radio}).then(res => {
238 251
         if(res.code === 200) {
239 252
           this.dialogVisible2 = false
240 253
           this.$message({
@@ -247,7 +260,7 @@ export default {
247 260
     },
248 261
     handleConfirm2() {
249 262
       const {id} = this.formLabelAlign2.id
250
-      api.applyResource({id, applyType: this.radio}).then(res => {
263
+      api_z.applyResource({id, applyType: this.radio}).then(res => {
251 264
         if(res.code === 200) {
252 265
           this.dialogVisible2 = false
253 266
           this.$message({
@@ -263,8 +276,8 @@ export default {
263 276
     },
264 277
     getTableData1() {
265 278
       const {pageNum1, pageSize1} = this
266
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
267
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
279
+      api_z.queryTaskAuditPhoneByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
280
+        this.tableData1 = res.data.records || []
268 281
         this.total1 = res.data.total
269 282
       })
270 283
     },
@@ -273,7 +286,7 @@ export default {
273 286
     },
274 287
     getTableData2() {
275 288
       const {pageNum2, pageSize2} = this
276
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
289
+      api_z.queryTaskAuditSmsByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
277 290
         this.tableData2 = res.data.records || []
278 291
         this.total2 = res.data.total
279 292
       })

+ 161 - 138
src/pages/index/components/task_recovery.vue

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div class="body-wrapper">
3
-    <el-tabs  v-model="activeName">
3
+    <el-tabs v-model="activeName">
4 4
       <el-tab-pane label="电话追缴" name="电话追缴">
5 5
         <el-form class="form-wrapper" :model="formInline1" :inline="true" style="margin-bottom: 20px;">
6 6
           <el-row>
@@ -11,12 +11,12 @@
11 11
             </el-col>
12 12
             <el-col :span="6">
13 13
               <el-form-item label="电话号码: ">
14
-                <el-input v-model="formInline1.phone" placeholder="请输入"></el-input>
14
+                <el-input v-model="formInline1.phoneNo" placeholder="请输入"></el-input>
15 15
               </el-form-item>
16 16
             </el-col>
17 17
             <el-col :span="6">
18 18
               <el-form-item>
19
-                <el-button type="primary" class="query-btn" @click="onSubmit2">查询</el-button>
19
+                <el-button type="primary" class="query-btn" @click="onSubmit">查询</el-button>
20 20
                 <el-button type="success" @click="handleAdd">新增</el-button>
21 21
               </el-form-item>
22 22
             </el-col>
@@ -44,7 +44,7 @@
44 44
         <el-dialog
45 45
           :title="title"
46 46
           :visible.sync="dialogVisible"
47
-          width="45%"
47
+          width="50%"
48 48
           custom-class="audit-dialog">
49 49
           <div class="form-div">
50 50
             <el-form label-position="left" label-width="85px" :model="formLabelAlign">
@@ -52,10 +52,10 @@
52 52
                 <el-input v-model="formLabelAlign.plateNo"></el-input>
53 53
               </el-form-item>
54 54
               <el-form-item label="电话号码">
55
-                <el-input v-model="formLabelAlign.phone"></el-input>
55
+                <el-input v-model="formLabelAlign.phoneNo"></el-input>
56 56
               </el-form-item>
57 57
               <el-form-item label="欠缴金额">
58
-                <el-input v-model="formLabelAlign.recoveryAmount"></el-input>
58
+                <el-input v-model="formLabelAlign.arrearsAmount"></el-input>
59 59
               </el-form-item>
60 60
               <el-form-item label="追缴详情">
61 61
                 <el-input
@@ -65,16 +65,27 @@
65 65
                   v-model="formLabelAlign.recoveryDetail">
66 66
                 </el-input>
67 67
               </el-form-item>
68
+              <el-form-item label="追缴日期">
69
+                <el-date-picker
70
+                  v-model="formLabelAlign.recoveryTime"
71
+                  type="datetime"
72
+                  value-format="yyyy-MM-dd HH:mm:ss"
73
+                  placeholder="选择日期时间">
74
+                </el-date-picker>
75
+              </el-form-item>
76
+              <el-form-item label="追缴结果">
77
+                <el-input v-model="formLabelAlign.recoveryResult"></el-input>
78
+              </el-form-item>
68 79
             </el-form>
69 80
           </div>
70 81
           <span slot="footer" class="dialog-footer">
71 82
             <el-button @click="dialogVisible = false">取 消</el-button>
72 83
             <el-button type="primary" @click="handleConfirm">确 定</el-button>
73
-        </span>
84
+          </span>
74 85
         </el-dialog>
75 86
       </el-tab-pane>
76 87
       <el-tab-pane label="短信追缴" name="短信追缴">
77
-        <el-form class="form-wrapper" :model="formInline1" :inline="true" style="margin-bottom: 20px;">
88
+        <el-form class="form-wrapper" :model="formInline2" :inline="true" style="margin-bottom: 20px;">
78 89
           <el-row>
79 90
             <el-col :span="6">
80 91
               <el-form-item label="车牌号: ">
@@ -83,13 +94,13 @@
83 94
             </el-col>
84 95
             <el-col :span="6">
85 96
               <el-form-item label="电话号码: ">
86
-                <el-input v-model="formInline2.phone" placeholder="请输入"></el-input>
97
+                <el-input v-model="formInline2.phoneNo" placeholder="请输入"></el-input>
87 98
               </el-form-item>
88 99
             </el-col>
89 100
             <el-col :span="6">
90 101
               <el-form-item>
91 102
                 <el-button type="primary" class="query-btn" @click="onSubmit2">查询</el-button>
92
-                <el-button type="success" @click="handleAdd">新增</el-button>
103
+                <el-button type="success" @click="handleAdd2">新增</el-button>
93 104
               </el-form-item>
94 105
             </el-col>
95 106
           </el-row>
@@ -101,22 +112,22 @@
101 112
             label="操作"
102 113
             width="200">
103 114
             <template slot-scope="scope" style="display: inline-block">
104
-              <el-button type="primary" @click="handleEdit(scope.row)" slot="reference">修改</el-button>
105
-              <el-popconfirm title="确定删除吗?" @confirm="deleteRow(scope.row)">
115
+              <el-button type="primary" @click="handleEdit2(scope.row)" slot="reference">修改</el-button>
116
+              <el-popconfirm title="确定删除吗?" @confirm="deleteRow2(scope.row)">
106 117
                 <el-button type="danger" slot="reference">删除</el-button>
107 118
               </el-popconfirm>
108 119
             </template>
109 120
           </el-table-column>
110 121
         </el-table>
111 122
         <div class="table-pagination">
112
-          <el-pagination layout="prev, pager, next" :total="total1" @current-change="handlePageChange1"
113
-                         :current-page.sync="pageNum1" :page-size.sync="pageSize1">
123
+          <el-pagination layout="prev, pager, next" :total="total2" @current-change="handlePageChange2"
124
+                         :current-page.sync="pageNum2" :page-size.sync="pageSize2">
114 125
           </el-pagination>
115 126
         </div>
116 127
         <el-dialog
117
-          :title="title"
118
-          :visible.sync="dialogVisible"
119
-          width="45%"
128
+          :title="title2"
129
+          :visible.sync="dialogVisible2"
130
+          width="50%"
120 131
           custom-class="audit-dialog">
121 132
           <div class="form-div">
122 133
             <el-form label-position="left" label-width="85px" :model="formLabelAlign2">
@@ -124,24 +135,35 @@
124 135
                 <el-input v-model="formLabelAlign2.plateNo"></el-input>
125 136
               </el-form-item>
126 137
               <el-form-item label="电话号码">
127
-                <el-input v-model="formLabelAlign2.phone"></el-input>
138
+                <el-input v-model="formLabelAlign2.phoneNo"></el-input>
128 139
               </el-form-item>
129 140
               <el-form-item label="欠缴金额">
130
-                <el-input v-model="formLabelAlign2.recoveryAmount"></el-input>
141
+                <el-input v-model="formLabelAlign2.arrearsAmount"></el-input>
131 142
               </el-form-item>
132 143
               <el-form-item label="追缴详情">
133 144
                 <el-input
134 145
                   type="textarea"
135 146
                   :rows="2"
136 147
                   placeholder="请输入内容"
137
-                  v-model="formLabelAlign.recoveryDetail">
148
+                  v-model="formLabelAlign2.recoveryDetail">
138 149
                 </el-input>
139 150
               </el-form-item>
151
+              <el-form-item label="追缴日期">
152
+                <el-date-picker
153
+                  v-model="formLabelAlign2.recoveryTime"
154
+                  type="datetime"
155
+                  value-format="yyyy-MM-dd HH:mm:ss"
156
+                  placeholder="选择日期时间">
157
+                </el-date-picker>
158
+              </el-form-item>
159
+              <el-form-item label="追缴结果">
160
+                <el-input v-model="formLabelAlign2.recoveryResult"></el-input>
161
+              </el-form-item>
140 162
             </el-form>
141 163
           </div>
142 164
           <span slot="footer" class="dialog-footer">
143
-            <el-button @click="dialogVisible = false">取 消</el-button>
144
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
165
+            <el-button @click="dialogVisible2 = false">取 消</el-button>
166
+            <el-button type="primary" @click="handleConfirm2">确 定</el-button>
145 167
         </span>
146 168
         </el-dialog>
147 169
       </el-tab-pane>
@@ -149,8 +171,7 @@
149 171
   </div>
150 172
 </template>
151 173
 <script>
152
-import api from "@/api/audit.js";
153
-import dictionary from "@/util/dictionary";
174
+import api_z from "@/api/article_z.js";
154 175
 
155 176
 export default {
156 177
   components: {},
@@ -164,127 +185,112 @@ export default {
164 185
         },
165 186
         {
166 187
           label: '电话号码',
167
-          key: 'phone'
188
+          key: 'phoneNo'
168 189
         },
169 190
         {
170 191
           label: '欠缴金额',
171
-          key: 'questionDescription'
192
+          key: 'arrearsAmount'
172 193
         },
173 194
         {
174 195
           label: '追缴日期',
175
-          key: 'creatTime'
196
+          key: 'recoveryTime'
176 197
         },
177 198
         {
178 199
           label: '追缴状态',
179
-          key: 'creatTime'
200
+          key: 'recoveryStatus'
201
+        },
202
+        {
203
+          label: '追缴结果',
204
+          key: 'recoveryResult'
180 205
         },
181 206
       ],
182
-      tableData1: [{parkingCardName:'昌建东外滩西南停车场',type:'实地考察',questionDescription:'部分车位存在一车多位的占用现象',creatTime:'2023-12-30'}],
207
+      tableData1: [],
183 208
       total1: 0,
184 209
       pageSize1: 10,
185 210
       pageNum1: 1,
186
-      title:'',
187
-      dialogVisible:false,
211
+      title: '',
212
+      dialogVisible: false,
188 213
       formLabelAlign: {
189 214
         plateNo: '',
190 215
         phone: '',
191
-        recoveryAmount: '',
192
-        recoveryDetail: ''
216
+        arrearsAmount: '',
217
+        recoveryDetail: '',
218
+        recoveryTime: '',
219
+        recoveryResult: '',
193 220
       },
194 221
       columns2: [
195 222
         {
196
-          label: '稽查对象',
197
-          key: 'parkingCardName'
223
+          label: '车牌号',
224
+          key: 'plateNo'
225
+        },
226
+        {
227
+          label: '电话号码',
228
+          key: 'phoneNo'
198 229
         },
199 230
         {
200
-          label: '取证类型',
201
-          key: 'type'
231
+          label: '欠缴金额',
232
+          key: 'arrearsAmount'
202 233
         },
203 234
         {
204
-          label: '问题描述',
205
-          key: 'questionDescription'
235
+          label: '追缴日期',
236
+          key: 'recoveryTime'
206 237
         },
207 238
         {
208
-          label: '创建日期',
209
-          key: 'creatTime'
239
+          label: '追缴状态',
240
+          key: 'recoveryStatus'
241
+        },
242
+        {
243
+          label: '追缴结果',
244
+          key: 'recoveryResult'
210 245
         },
211 246
       ],
212
-      tableData2: [{parkingCardName:'昌建东外滩西南停车场',type:'实地考察',questionDescription:'部分车位存在一车多位的占用现象',creatTime:'2023-12-30'}],
247
+      tableData2: [],
213 248
       total2: 0,
214 249
       radio: '2',
215 250
       pageSize2: 10,
216 251
       pageNum2: 1,
217 252
       formInline1: {
218 253
         plateNo: '',
219
-        phone:'',
254
+        phoneNo: '',
220 255
       },
221 256
       formInline2: {
222
-        orderCode: '',
223
-        orderStatus:'',
257
+        plateNo: '',
258
+        phoneNo: '',
224 259
       },
225
-      title2:'',
226
-      dialogVisible2:false,
260
+      title2: '',
261
+      dialogVisible2: false,
227 262
       formLabelAlign2: {
228
-        id: '',
229
-        parkingCardName: '',
230
-        type: '',
231
-        questionDescription: '',
232
-      },
233
-      columns3: [
234
-        {
235
-          label: '稽查对象',
236
-          key: 'parkingCardName'
237
-        },
238
-        {
239
-          label: '取证类型',
240
-          key: 'type'
241
-        },
242
-        {
243
-          label: '问题描述',
244
-          key: 'questionDescription'
245
-        },
246
-        {
247
-          label: '审核日期',
248
-          key: ''
249
-        },
250
-        {
251
-          label: '审核日期',
252
-          key: ''
253
-        },
254
-        {
255
-          label: '处理人',
256
-          key: ''
257
-        },
258
-      ],
259
-      tableData3: [],
260
-      total3: 0,
261
-      pageSize3: 10,
262
-      pageNum3: 1,
263
-      formInline3: {
264
-        parkingCardName: ''
263
+        plateNo: '',
264
+        phone: '',
265
+        arrearsAmount: '',
266
+        recoveryDetail: '',
267
+        recoveryTime: '',
268
+        recoveryResult: '',
265 269
       },
266 270
     }
267 271
   },
268 272
   mounted() {
269
-    // this.getTableData1()
270
-    // this.getTableData2()
271
-    // this.getTableData3()
272
-  },
273
-  watch: {
273
+    this.getTableData1()
274
+    this.getTableData2()
274 275
   },
276
+  watch: {},
275 277
   methods: {
276
-    handleAdd () {
277
-      this.title = '添加配置'
278
+    onSubmit() {
279
+      this.pageNum1 = 1
280
+      this.getTableData1()
281
+    },
282
+    handleAdd() {
283
+      this.title = '添加'
278 284
       this.formLabelAlign = {}
279 285
       this.dialogVisible = true
280 286
     },
281 287
     handleEdit(row) {
282
-      this.title = '修改配置'
288
+      this.title = '修改'
283 289
       this.formLabelAlign = {...row}
284 290
       this.dialogVisible = true
285 291
     },
286
-    deleteRow (record) {
287
-      api.deleteWhiteIp({id: record.id}).then(res => {
292
+    deleteRow(record) {
293
+      api_z.deleteTaskRecovery([{id: record.id}]).then(res => {
288 294
         if (res.code === 200) {
289 295
           this.$message({type: 'success', message: '删除成功!'})
290 296
           this.getTableData1()
@@ -292,8 +298,8 @@ export default {
292 298
       })
293 299
     },
294 300
     handleConfirm() {
295
-      if (this.title === '修改配置') {
296
-        api.addWhiteIp({...this.formLabelAlign, plateNo: this.formLabelAlign.plateNo, phone: this.formLabelAlign.phone, recoveryAmount: this.formLabelAlign.recoveryAmount, recoveryDetail: this.formLabelAlign.recoveryDetail}).then(res => {
301
+      if (this.title === '修改') {
302
+        api_z.editTaskRecovery({...this.formLabelAlign}).then(res => {
297 303
           if (res.code === 200) {
298 304
             this.dialogVisible = false
299 305
             this.$message({
@@ -304,7 +310,7 @@ export default {
304 310
           }
305 311
         })
306 312
       } else {
307
-        api.addWhiteIp(this.formLabelAlign).then(res => {
313
+        api_z.addTaskRecovery({...this.formLabelAlign}).then(res => {
308 314
           if (res.code === 200) {
309 315
             this.dialogVisible = false
310 316
             this.$message({
@@ -316,40 +322,61 @@ export default {
316 322
         })
317 323
       }
318 324
     },
319
-    onSubmit2() {
320
-      this.pageNum2 = 1
321
-      this.getTableData2()
325
+    handleAdd2() {
326
+      this.title2 = '添加'
327
+      this.formLabelAlign2 = {}
328
+      this.dialogVisible2 = true
322 329
     },
323
-    handleAudit(row) {
330
+    handleEdit2(row) {
331
+      this.title2 = '修改'
324 332
       this.formLabelAlign2 = {...row}
325 333
       this.dialogVisible2 = true
326 334
     },
327
-
328
-    handleConfirm2() {
329
-      const {id} = this.formLabelAlign2.id
330
-      console.log('radio', this.radio)
331
-      api.applyResource({id, applyType: this.radio}).then(res => {
332
-        if(res.code === 200) {
333
-          this.dialogVisible2 = false
334
-          this.$message({
335
-            message: '审核成功!',
336
-            type: 'success'
337
-          })
335
+    deleteRow2(record) {
336
+      api_z.deleteTaskRecovery([{id: record.id}]).then(res => {
337
+        if (res.code === 200) {
338
+          this.$message({type: 'success', message: '删除成功!'})
338 339
           this.getTableData2()
339 340
         }
340 341
       })
341 342
     },
342
-    onSubmit3() {
343
-      this.pageNum3 = 1
344
-      this.getTableData3()
343
+    onSubmit2() {
344
+      this.pageNum2 = 1
345
+      this.getTableData2()
346
+    },
347
+
348
+    handleConfirm2() {
349
+      if (this.title2 === '修改') {
350
+        api_z.editTaskRecovery({...this.formLabelAlign2}).then(res => {
351
+          if (res.code === 200) {
352
+            this.dialogVisible2 = false
353
+            this.$message({
354
+              message: '修改成功!',
355
+              type: 'success'
356
+            })
357
+            this.getTableData2()
358
+          }
359
+        })
360
+      } else {
361
+        api_z.addTaskRecovery({...this.formLabelAlign2}).then(res => {
362
+          if (res.code === 200) {
363
+            this.dialogVisible2 = false
364
+            this.$message({
365
+              message: '添加成功!',
366
+              type: 'success'
367
+            })
368
+            this.getTableData2()
369
+          }
370
+        })
371
+      }
345 372
     },
346 373
     handlePageChange1() {
347 374
       this.getTableData1()
348 375
     },
349 376
     getTableData1() {
350 377
       const {pageNum1, pageSize1} = this
351
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
352
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
378
+      api_z.queryTaskRecoveryPhoneByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
379
+        this.tableData1 = res.data.records || []
353 380
         this.total1 = res.data.total
354 381
       })
355 382
     },
@@ -358,51 +385,47 @@ export default {
358 385
     },
359 386
     getTableData2() {
360 387
       const {pageNum2, pageSize2} = this
361
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
388
+      api_z.queryTaskRecoverySmsByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
362 389
         this.tableData2 = res.data.records || []
363 390
         this.total2 = res.data.total
364 391
       })
365 392
     },
366
-    handlePageChange3() {
367
-      this.getTableData3()
368
-    },
369
-    getTableData3() {
370
-      const {pageNum3, pageSize3} = this
371
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
372
-        this.tableData3 = res.data.records || []
373
-        this.total3 = res.data.total
374
-      })
375
-    },
376 393
   }
377 394
 }
378 395
 </script>
379
-<style  lang="scss" scoped>
396
+<style lang="scss" scoped>
380 397
 .body-wrapper {
381 398
   padding: 20px;
382
-  .button-block{
399
+
400
+  .button-block {
383 401
     text-align: right;
384 402
     margin-bottom: 20px;
385 403
   }
386
-  .table-pagination{
404
+
405
+  .table-pagination {
387 406
     text-align: right;
388 407
   }
389
-  .search-card{
408
+
409
+  .search-card {
390 410
     margin-bottom: 20px;
391 411
     text-align: center;
392
-    .input-wrapper{
412
+
413
+    .input-wrapper {
393 414
       width: 36%;
394 415
     }
395 416
   }
396 417
 
397
-  .audit-dialog{
398
-    .mg-bt{
418
+  .audit-dialog {
419
+    .mg-bt {
399 420
       margin-bottom: 24px;
400 421
     }
401
-    .label{
422
+
423
+    .label {
402 424
       text-align: right;
403 425
     }
404
-    .form-div{
405
-      /deep/ .el-input__inner{
426
+
427
+    .form-div {
428
+      /deep/ .el-input__inner {
406 429
         height: 35px;
407 430
         width: 90%;
408 431
         border: 1px solid #a6a5a5;

+ 17 - 12
src/pages/index/components/task_report.vue

@@ -13,10 +13,10 @@
13 13
             </el-col>
14 14
             <el-col :span="6">
15 15
               <el-form-item label="追缴形式:">
16
-                <el-select clearable v-model="formInline.errorType" placeholder="错误类型" popper-class="cur-select">
16
+                <el-select clearable v-model="formInline.recoveryType" placeholder="错误类型" popper-class="cur-select">
17 17
                   <el-option label="全部" value=""></el-option>
18
-                  <el-option label="电话追缴" value="电话追缴"></el-option>
19
-                  <el-option label="短信追缴" value="短信追缴"></el-option>
18
+                  <el-option label="电话" value="电话"></el-option>
19
+                  <el-option label="短信" value="短信"></el-option>
20 20
                 </el-select>
21 21
               </el-form-item>
22 22
             </el-col>
@@ -44,6 +44,7 @@
44 44
 </template>
45 45
 <script>
46 46
 import api from "@/api/audit";
47
+import api_z from "@/api/article_z.js";
47 48
 
48 49
 
49 50
 export default {
@@ -54,32 +55,36 @@ export default {
54 55
     return {
55 56
       formInline: {
56 57
         plateNo: '',
57
-        way: '',
58
+        recoveryType: '',
58 59
       },
59 60
       columns: [
60 61
         {
61 62
           label: '追缴形式',
62
-          key: 'parkName'
63
+          key: 'recoveryType'
63 64
         },
64 65
         {
65 66
           label: '车牌号',
66
-          key: 'berthCode'
67
+          key: 'plateNo'
67 68
         },
68 69
         {
69 70
           label: '手机号',
70
-          key: 'berthIsorno'
71
+          key: 'phoneNo'
71 72
         },
72 73
         {
73 74
           label: '执行时间',
74
-          key: 'isTidalPark'
75
+          key: 'recoveryTime'
75 76
         },
76 77
         {
77 78
           label: '追缴金额',
78
-          key: 'hasChargingPile'
79
+          key: 'arrearsAmount'
79 80
         },
80 81
         {
81 82
           label: '执行结果',
82
-          key: 'isSharePark'
83
+          key: 'recoveryResult'
84
+        },
85
+        {
86
+          label: '追缴形式',
87
+          key: 'recoveryType'
83 88
         },
84 89
       ],
85 90
       tableData:[],
@@ -102,8 +107,8 @@ export default {
102 107
     },
103 108
     getTableData() {
104 109
       const {pageNum, pageSize} = this
105
-      api.berthListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
106
-        this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
110
+      api_z.queryTaskReportByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
111
+        this.tableData = res.data.records || []
107 112
         this.total = res.data.total
108 113
       })
109 114
     },

+ 12 - 11
src/pages/index/components/telephone_management.vue

@@ -13,12 +13,12 @@
13 13
             </el-col>
14 14
             <el-col :span="6">
15 15
               <el-form-item label="电话号码:">
16
-                <el-input v-model="formInline.phone" placeholder="请输入"></el-input>
16
+                <el-input v-model="formInline.phoneNo" placeholder="请输入"></el-input>
17 17
               </el-form-item>
18 18
             </el-col>
19 19
             <el-col :span="6">
20 20
               <el-form-item label="电话是否有效:">
21
-                <el-select clearable v-model="formInline.type" placeholder="错误类型" popper-class="cur-select">
21
+                <el-select clearable v-model="formInline.phoneStatus" placeholder="错误类型" popper-class="cur-select">
22 22
                   <el-option label="全部" value=""></el-option>
23 23
                   <el-option label="有效" value="有效"></el-option>
24 24
                   <el-option label="无效" value="无效"></el-option>
@@ -48,6 +48,7 @@
48 48
 </template>
49 49
 <script>
50 50
 import api from "@/api/audit";
51
+import api_z from "@/api/article_z.js";
51 52
 
52 53
 
53 54
 export default {
@@ -58,25 +59,25 @@ export default {
58 59
     return {
59 60
       formInline: {
60 61
         plateNo: '',
61
-        phone: '',
62
-        type: ''
62
+        phoneNo: '',
63
+        phoneStatus: ''
63 64
       },
64 65
       columns: [
65 66
         {
66 67
           label: '车牌号',
67
-          key: 'parkName'
68
+          key: 'plateNo'
68 69
         },
69 70
         {
70 71
           label: '电话号码',
71
-          key: 'berthCode'
72
+          key: 'phoneNo'
72 73
         },
73 74
         {
74 75
           label: '导入时间',
75
-          key: 'berthIsorno'
76
+          key: 'importTime'
76 77
         },
77 78
         {
78
-          label: '状态',
79
-          key: 'isTidalPark'
79
+          label: '电话状态',
80
+          key: 'phoneStatus'
80 81
         },
81 82
       ],
82 83
       tableData:[],
@@ -99,8 +100,8 @@ export default {
99 100
     },
100 101
     getTableData() {
101 102
       const {pageNum, pageSize} = this
102
-      api.berthListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
103
-        this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
103
+      api_z.queryTelephoneManagementByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
104
+        this.tableData = res.data.records || []
104 105
         this.total = res.data.total
105 106
       })
106 107
     },