From e59097e62344f4a52a520caf01ddac69ae0aa118 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 11 Jan 2024 10:14:56 +0800
Subject: [PATCH] 小程序导出，添加制证时间
---
src/views/system/userWx.vue | 33 ++++++++++++---------------------
src/views/accreditationRecords/accreditationRecordsPaper.vue | 3 ++-
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/src/views/accreditationRecords/accreditationRecordsPaper.vue b/src/views/accreditationRecords/accreditationRecordsPaper.vue
index 38d4c94..8b4184a 100644
--- a/src/views/accreditationRecords/accreditationRecordsPaper.vue
+++ b/src/views/accreditationRecords/accreditationRecordsPaper.vue
@@ -1231,7 +1231,8 @@
securityNumber: this.questionBankSearch.securityNumber,
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
- isAvatar: this.questionBankSearch.isAvatar
+ isAvatar: this.questionBankSearch.isAvatar,
+ userPaperTime:this.questionBankSearch.userPaperTime
};
//导出
if (this.userInfo.role_name == "保安公司管理员") {
diff --git a/src/views/system/userWx.vue b/src/views/system/userWx.vue
index 0b16a85..5ceee4a 100644
--- a/src/views/system/userWx.vue
+++ b/src/views/system/userWx.vue
@@ -88,15 +88,15 @@
<!-- @click="handleImport"-->
<!-- >导入-->
<!-- </el-button>-->
-<!-- <el-button-->
-<!-- type="warning"-->
-<!-- size="small"-->
-<!-- plain-->
-<!-- v-if="userInfo.role_name.includes('admin')"-->
-<!-- icon="el-icon-download"-->
-<!-- @click="handleExport"-->
-<!-- >导出-->
-<!-- </el-button>-->
+ <el-button
+ type="warning"
+ size="small"
+ plain
+ v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-download"
+ @click="handleExport"
+ >导出
+ </el-button>
</template>
<template slot-scope="{ row }" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
@@ -1032,16 +1032,7 @@
done();
},
handleExport() {
- var deptId = ""
-
- if (this.treeDeptId == ""){
-
- if (this.userInfo.role_name.indexOf("administrator") ==-1){
- deptId = this.userInfo.dept_id
- }
- }else{
- deptId = this.treeDeptId.id
- }
+ let deptId = "1734016112398020609"
this.$confirm("是否导出用户数据?", "提示", {
confirmButtonText: "确定",
@@ -1049,11 +1040,11 @@
type: "warning"
}).then(() => {
window.open(
- `/api/blade-user/export-user?${
+ `/api/userWx/export-user?${
this.website.tokenHeader
}=${getToken()}&account=${this.search.account}&realName=${
this.search.realName
- }&deptId=${deptId}`
+ }&deptId=${deptId}&cardid=${this.search.cardid}`
);
});
},
--
Gitblit v1.9.3