From 0c710d1fd3686337eb03f16f729e4a2f927c8e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Fri, 1 Jul 2022 17:50:10 +0800
Subject: [PATCH] up

---
 src/views/order/parkorder.vue | 28 +++++++++++++++++++++++++---
 src/views/order/visitor.vue   |  3 +--
 2 files changed, 26 insertions(+), 5 deletions(-)

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 @@
                 <div v-if="column.field=='teamunit'">
                   {{scope.row["visit_order"].unit?scope.row["visit_order"].unit:"无"}}
                 </div>
+                <div v-else-if="column.field=='status'">
+                    <el-tag :type="(scope.row[column.field]=='2'?'success':(scope.row[column.field]=='1'?'warning':'info'))">{{parameters.status_list[scope.row[column.field]]}}</el-tag>
+                </div>
               </div>
-
-
               <div v-else>
                 {{scope.row[column.field]}}
               </div>
@@ -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;
           }