From 1a310eba3fea6e0640cf895e7db7e8f1fb73d653 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 10 Dec 2021 10:40:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/accreditationRecords/accreditationRecords.vue | 4 +++-
src/views/accreditationRecords/accreditationRecordsPaper.vue | 2 ++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/views/accreditationRecords/accreditationRecords.vue b/src/views/accreditationRecords/accreditationRecords.vue
index 2dfc609..0d6b307 100644
--- a/src/views/accreditationRecords/accreditationRecords.vue
+++ b/src/views/accreditationRecords/accreditationRecords.vue
@@ -443,7 +443,7 @@
},
selectionClear() {
this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ // this.$refs.crud.toggleSelection();
},
handleDelete() {
if (this.selectionList.length === 0) {
@@ -485,6 +485,7 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
+ params = this.questionBankSearch;
this.deptId = JSON.parse(
window.localStorage.getItem("saber-userInfo")
).content.dept_id;
@@ -546,6 +547,7 @@
securityNumber: this.questionBankSearch.securityNumber,
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
+ isAvatar: this.questionBankSearch.isAvatar,
};
//导出
if (this.userInfo.role_name == "保安公司管理员") {
diff --git a/src/views/accreditationRecords/accreditationRecordsPaper.vue b/src/views/accreditationRecords/accreditationRecordsPaper.vue
index f4e5107..3a28218 100644
--- a/src/views/accreditationRecords/accreditationRecordsPaper.vue
+++ b/src/views/accreditationRecords/accreditationRecordsPaper.vue
@@ -1032,6 +1032,7 @@
securityNumber: this.questionBankSearch.securityNumber,
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
+ isAvatar: this.questionBankSearch.isAvatar,
};
// data['Blade-Auth'] = getToken;
//导出
@@ -1080,6 +1081,7 @@
securityNumber: this.questionBankSearch.securityNumber,
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
+ isAvatar: this.questionBankSearch.isAvatar,
};
//导出
if (this.userInfo.role_name == "保安公司管理员") {
--
Gitblit v1.9.3