From 0ce46e48f7a8b7434383eec7fdb87d5cddec645d Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Wed, 29 Jun 2022 17:30:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/order/visitorder.js | 9 + src/api/resource/visitresource.js | 10 + src/api/resource/visitspecial.js | 10 + src/views/order/activeorder.vue | 9 +- src/views/order/parkorder.vue | 2 +- src/views/order/visitor.vue | 309 +++++++++++++++++++++++++++ src/views/order/visitorder.vue | 6 +- src/views/report/activeRpt.vue | 24 ++- src/views/report/parkRpt.vue | 23 +- src/views/report/visit/ageRpt.vue | 26 ++- src/views/report/visit/infoRpt.vue | 26 ++- src/views/report/visit/monthRpt.vue | 24 ++- src/views/report/visit/periodRpt.vue | 26 ++- src/views/report/visit/seasonRpt.vue | 24 ++- src/views/report/visit/sexRpt.vue | 26 ++- src/views/report/visit/timeRpt.vue | 30 ++- src/views/resource/visitresource.vue | 37 +++- src/views/resource/visitspecial.vue | 32 ++- 19 files changed, 604 insertions(+), 50 deletions(-) create mode 100644 src/views/order/visitor.vue diff --git a/package.json b/package.json index 2a351eb..c7fc58b 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "nprogress": "0.2.0", "path-to-regexp": "2.4.0", "qqmap": "^1.0.1", + "table-excel": "^1.1.8", "view-design": "^4.7.0", "vue": "2.6.10", "vue-count-to": "^1.0.13", diff --git a/src/api/order/visitorder.js b/src/api/order/visitorder.js index 5af28cf..22e14fb 100644 --- a/src/api/order/visitorder.js +++ b/src/api/order/visitorder.js @@ -17,3 +17,12 @@ export function get(id) { } }) } + +export function listvisitor(params) { + return request({ + url: '/api/admin/visit/order-detail-index', + method: 'get', + params:params + }) +} + diff --git a/src/api/resource/visitresource.js b/src/api/resource/visitresource.js index 49de568..5ad06e2 100644 --- a/src/api/resource/visitresource.js +++ b/src/api/resource/visitresource.js @@ -51,3 +51,13 @@ export function chanStatus(params) { params:params }) } + +export function delrule(id) { + return request({ + url: '/api/admin/visit/rule-destroy', + method: 'get', + params:{ + id + } + }) +} diff --git a/src/api/resource/visitspecial.js b/src/api/resource/visitspecial.js index b1e9742..2401bbb 100644 --- a/src/api/resource/visitspecial.js +++ b/src/api/resource/visitspecial.js @@ -44,3 +44,13 @@ export function get(id) { }) } +export function delrule(id) { + return request({ + url: '/api/admin/visit-special/rule-destroy', + method: 'get', + params:{ + id + } + }) +} + diff --git a/src/views/order/activeorder.vue b/src/views/order/activeorder.vue index bdcac1a..de7fe36 100644 --- a/src/views/order/activeorder.vue +++ b/src/views/order/activeorder.vue @@ -29,7 +29,8 @@
-
+
+ {{item.value}} {{item.value}} {{item.value}} {{item.value}} @@ -174,7 +175,11 @@ }, { value: '已取消', id: "0" - }] + },{ + value: '已过期', + id: "3" + } + ] }, tableHeight: 0, diff --git a/src/views/order/parkorder.vue b/src/views/order/parkorder.vue index a67a6ad..4401b09 100644 --- a/src/views/order/parkorder.vue +++ b/src/views/order/parkorder.vue @@ -58,7 +58,7 @@ {{form.mobile}}
- +
小车位
diff --git a/src/views/order/visitor.vue b/src/views/order/visitor.vue new file mode 100644 index 0000000..a1edbda --- /dev/null +++ b/src/views/order/visitor.vue @@ -0,0 +1,309 @@ + + + + diff --git a/src/views/order/visitorder.vue b/src/views/order/visitorder.vue index 0d61424..658f86f 100644 --- a/src/views/order/visitorder.vue +++ b/src/views/order/visitorder.vue @@ -42,6 +42,7 @@ {{item.value}} {{item.value}} {{item.value}} + {{item.value}}
{{scope.row[column.field]}}
@@ -186,8 +187,11 @@ value: '已参观', id: "2" }, { - value: '取消预约', + value: '已取消', id: "0" + },{ + value: '已过期', + id: "3" }] }, tableHeight: 0, diff --git a/src/views/report/activeRpt.vue b/src/views/report/activeRpt.vue index d7b7e24..7c26329 100644 --- a/src/views/report/activeRpt.vue +++ b/src/views/report/activeRpt.vue @@ -15,7 +15,8 @@ - + + @@ -43,7 +44,8 @@