From 934d30425ad8809e841b1dcc3236f94a3b9fa223 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 10:17:01 +0800
Subject: [PATCH] 培训考试修改，报名清册修改
---
src/views/securityGuard/securityGuard.vue | 1 -
src/views/trainApply/index.vue | 2 +-
src/views/system/user.vue | 2 +-
src/views/trainingRegistration/index.vue | 5 +++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 75b273f..9ebf584 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -405,7 +405,6 @@
},
],
},
-
form: {},
search: {},
roleBox: false,
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index a1b9937..468169c 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1083,7 +1083,7 @@
if (this.userInfo.role_name == "公安管理员") {
params["jurisdiction"] = this.userInfo.jurisdiction;
}
-
+ params['status'] = 1;
getList(
page.currentPage,
page.pageSize,
diff --git a/src/views/trainApply/index.vue b/src/views/trainApply/index.vue
index a201ecf..2a5e552 100644
--- a/src/views/trainApply/index.vue
+++ b/src/views/trainApply/index.vue
@@ -70,7 +70,7 @@
:type="type"
size="small"
icon="el-icon-refresh-left"
- :disabled="row.cancel==2"
+ :disabled="row.cancel==2 || row.isExam==2 || row.isExam==3"
@click="revoke(row)"
>取消报名
</el-button>
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index ff71b3a..5f4ad34 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -181,7 +181,7 @@
{
label: "序号开始",
prop: "serialStart",
- span: 6,
+ span: 12,
value:1,
mock:{
type:'number',
@@ -203,7 +203,7 @@
{
label: "序号结束",
prop: "serialEnd",
- span: 6,
+ span: 12,
value:50,
mock:{
type:'number',
@@ -541,6 +541,7 @@
//如果是培训公司管理员
params["trainingUnitId"] = that.userInfo.dept_id;
}
+ params['isExam'] = 1;
getdata(
page.currentPage,
page.pageSize,
--
Gitblit v1.9.3