From e4bfc5b5c350a372d0d50589c0fe146821974751 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 24 Mar 2021 09:33:12 +0800
Subject: [PATCH] 修改
---
src/views/healthcode/healthcode.vue | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 238d55a..40d1ef0 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -181,7 +181,9 @@
}
]
},
- data: []
+ data: [],
+ isActive: false,
+ recorder: null,
};
},
computed: {
@@ -242,9 +244,13 @@
this.onLoad(this.page, params);
},
onLoad(page, params = {}) {
- this.loading = true;
+ const { dateTime } = this.query;
+ let values = {
+ ...params,
+ };
+
if (this.$route.query.status && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
- if (this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type == "" ) {
+ if (this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type != "" ) {
this.activeClass = this.$route.query.status;
this.page.currentPage = 1;
params = {
@@ -258,6 +264,12 @@
type:this.$route.query.status
};
}
+ }else if(this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type != "" ){
+ params = {
+ type: this.$route.query.type,
+ beginTime: this.$route.query.startTime,
+ endTime: this.$route.query.endTime
+ }
}else{
params = {
status:this.$route.query.status,
@@ -265,7 +277,23 @@
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ if (dateTime) {
+ values = {
+ ...params,
+ begTime: dateTime[0],
+ endTime: dateTime[1],
+ ...this.query,
+ };
+ values.dateTime = null;
+ } else {
+ values = {
+ ...params,
+ ...this.query,
+ };
+ }
+
+ this.loading = true;
+ getList(page.currentPage, page.pageSize,values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
--
Gitblit v1.9.3