From d91256b72ab2be0f7ad5886099fd3fc7366649c9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 18 Nov 2021 17:56:50 +0800
Subject: [PATCH] 培训列表修改，新增考试状态查询，证书导出查询新增有无照片
---
src/views/trainingRegistration/data.js | 36 ++++++++++++++++++
src/views/accreditationRecords/accreditationRecordsPaper.vue | 27 +++++++++++++
src/views/securityGuard/securityGuard.vue | 1
src/views/trainingRegistration/index.vue | 3 +
4 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/src/views/accreditationRecords/accreditationRecordsPaper.vue b/src/views/accreditationRecords/accreditationRecordsPaper.vue
index b88f786..b89f853 100644
--- a/src/views/accreditationRecords/accreditationRecordsPaper.vue
+++ b/src/views/accreditationRecords/accreditationRecordsPaper.vue
@@ -577,6 +577,33 @@
},
],
},
+ {
+ label: "有无照片",
+ prop: "isAvatar",
+ type: "select",
+ search:true,
+ searchLabelWidth: 90,
+ minWidth: 105,
+ searchSpan: 3,
+ addDisplay: false,
+ editDisplay: false,
+ hide: true,
+ display: false,
+ dicData:[
+ {
+ label:"全部",
+ value:3
+ },
+ {
+ label:"有",
+ value:1
+ },
+ {
+ label:"无",
+ value:2
+ }
+ ]
+ },
],
},
data: [],
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 19ca32e..aa4bb99 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -180,6 +180,7 @@
</el-button>
<el-button
icon="el-icon-edit"
+ style="display:none"
:size="size"
:type="type"
v-if="permission.securityGuard_paper"
diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index 1a14cec..2113454 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -203,6 +203,42 @@
addDisplay: false,
width: 100,
},
+ {
+ label: "考试状态",
+ search: true,
+ type: "select",
+ searchSpan: 4,
+ prop: "isExam",
+ searchValue: 1,
+ dicData: [{
+ label: '全部',
+ value: 0,
+ },
+ {
+ label: '未考试',
+ value: 1,
+ },
+ {
+ label: '考试结束',
+ value: 2,
+ },
+ {
+ label: '考试中',
+ value: 3,
+ },
+ {
+ label: '缺考',
+ value: 4,
+ }
+ ],
+ props: {
+ label: "label",
+ value: "value"
+ },
+ editDisplay: false,
+ addDisplay: false,
+ width: 100,
+ },
// {
// label: "确认截止时间",
// prop: "remainingTime",
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index b288021..02187be 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -350,6 +350,7 @@
created() {
this.search["cancel"] = 1;
this.search["auditStatus"] = 4;
+ this.search["isExam"] = 1;
},
mounted() {
// if (window.name == "baoming") {
@@ -556,7 +557,7 @@
//如果是培训公司管理员
params["trainingUnitId"] = that.userInfo.dept_id;
}
- params["isExam"] = 1;
+ // params["isExam"] = 1;
getdata(
page.currentPage,
page.pageSize,
--
Gitblit v1.9.3