diff --git a/src/views/order/parkorder.vue b/src/views/order/parkorder.vue
index a80e9e4..5a77404 100644
--- a/src/views/order/parkorder.vue
+++ b/src/views/order/parkorder.vue
@@ -18,13 +18,13 @@
-
+
-
+
-
+
{{item}}
@@ -45,24 +45,18 @@
-
- {{scope.row["visit_order"]?"参观预约":"活动预约"}}
-
-
- {{scope.row["visit_order"].type=="1"?"团队":"个人"}}
-
-
- {{scope.row["visit_order"].unit?scope.row["visit_order"].unit:"无"}}
-
-
+
+
- {{parameters.status_list[scope.row[column.field]]}}
+ {{parameters.status_list[scope.row[column.field]]}}
+
@@ -102,7 +96,10 @@
小车位
- 大车位
+ 大车位(09:00-12:00)
+
+
+ 大车位(13:00-16:00)
残疾人车位
@@ -147,11 +144,14 @@
value: "小车位"
}, {
id: 2,
- value: "大车位"
+ value: "大车位(09:00-12:00)"
}, {
id: 3,
value: "残疾人车位"
- }],
+ }, {
+ id: 4,
+ value: "大车位(13:00-16:00)"
+ }, ],
carType: [{
id: 1,
value: "普通车"
@@ -192,7 +192,7 @@
field: "time",
title: "预约时间",
type: "string",
- width: 220,
+ width: 220,
},
{
@@ -205,7 +205,7 @@
field: "type",
title: "车位类型",
type: "type",
- width: 120,
+ width: 200,
},
{
field: "mobile",
@@ -216,12 +216,12 @@
{
field: "orderType",
title: "关联类型",
- type: "format",
+ width: 80,
},
{
field: "teamType",
title: "类型",
- type: "format",
+ width: 80,
},
{
field: "in_date",
@@ -238,12 +238,13 @@
{
field: "teamunit",
title: "团队名称",
- type: "format",
},
{
field: "status",
title: "状态",
type: "format",
+ width: 120,
+ fixed: "right"
},
{
field: "操作",
@@ -283,6 +284,16 @@
car_park_id: carId,
...this.searchFields
}).then(res => {
+ for (var m of res.data) {
+ m.orderType = m.visit_order ? "参观预约" : "活动预约";
+ if (m.visit_order) {
+ m.teamunit = m.visit_order.unit ? m.visit_order.unit : "无";
+ m.teamType = m.visit_order.type == 1 ? "团队" : "个人";
+ } else {
+ m.teamunit = m.activity_order.unit ? m.activity_order.unit : "无";
+ m.teamType = m.activity_order.type == 1 ? "团队" : "个人";
+ }
+ }
this.tableData = res.data;
this.paginations.total = res.total
}).catch(error => {