diff --git a/src/views/order/parkorder.vue b/src/views/order/parkorder.vue
index ba8821f..044fb24 100644
--- a/src/views/order/parkorder.vue
+++ b/src/views/order/parkorder.vue
@@ -50,9 +50,10 @@
{{scope.row["visit_order"].unit?scope.row["visit_order"].unit:"无"}}
+
+ {{parameters.status_list[scope.row[column.field]]}}
+
-
-
{{scope.row[column.field]}}
@@ -146,7 +147,13 @@
}, {
id: 2,
value: "新能源车"
- }]
+ }],
+ status_list: {
+ 1: "待完成",
+ 2: "已完成",
+ 0: "已取消",
+ 3: "已过期"
+ }
},
tableHeight: 0,
clientHeight: 0,
@@ -200,11 +207,26 @@
title: "类型",
type: "format",
},
+ {
+ field: "in_date",
+ title: "入场时间",
+ type: "string",
+ },
+ {
+ field: "out_date",
+ title: "出场时间",
+ type: "string",
+ },
{
field: "teamunit",
title: "团队名称",
type: "format",
},
+ {
+ field: "status",
+ title: "状态",
+ type: "format",
+ },
{
field: "操作",
title: "操作",
diff --git a/src/views/order/visitor.vue b/src/views/order/visitor.vue
index 3a4eade..cd780dd 100644
--- a/src/views/order/visitor.vue
+++ b/src/views/order/visitor.vue
@@ -270,8 +270,7 @@
url += "&" + m + "=" + that.searchFields[m]
}
url = that.baseurl + url
- console.log(url)
- window.open("http://" + url, '_blank')
+ window.open("https://" + url, '_blank')
that.searchFields.is_export = 0
return;
}