From 74433dea18d66b0799b57657d51065e14ef7b93b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 19 Dec 2023 15:22:24 +0800
Subject: [PATCH] 制证功能放开
---
src/views/securityGuard/securityGuard.vue | 28 ++++++++++++++++++++++------
src/views/trainExam/performance.vue | 5 ++---
src/views/securityAnalysis/index.vue | 3 +--
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/views/securityAnalysis/index.vue b/src/views/securityAnalysis/index.vue
index 2c3ffeb..a3a6d87 100644
--- a/src/views/securityAnalysis/index.vue
+++ b/src/views/securityAnalysis/index.vue
@@ -488,7 +488,7 @@
},
legend: {
x: "center",
- y: "90%"
+ y: "90%",
},
// toolbox: this.gettoolbox("审查情况查询", "保安员审查情况明细", 1),
series: [
@@ -889,7 +889,6 @@
// 6
// ),
legend: {
- // orient: "vertical",
// left: "left",
x: "center",
y: "83%"
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index a314430..d0834f7 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -43,11 +43,11 @@
<el-button type="success" size="small" plain icon="el-icon-upload2" v-if="permission.securityGuard_import"
@click="handleImportNoCriminal">无犯罪记录图片批量上传
</el-button>
- <el-button type="primary" style="display: none;" size="small" plain
- v-if="permission.securityGuard_security_apply" icon="el-icon-s-promotion"
- @click="handleSecurityApply">上岗证制证申请
- </el-button>
- <el-button type="primary" style="display: none;" size="small" plain
+<!-- <el-button type="primary" size="small" plain-->
+<!-- v-if="permission.securityGuard_security_apply" icon="el-icon-s-promotion"-->
+<!-- @click="handleSecurityApply">上岗证制证申请-->
+<!-- </el-button>-->
+ <el-button type="primary" size="small" plain
v-if="permission.securityGuard_security_paper_apply" icon="el-icon-collection-tag"
@click="handleSecurityPaperApply">证书制证申请
</el-button>
@@ -1119,11 +1119,25 @@
label: "居住地址",
prop: "dwellAddress",
hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入居住地址",
+ trigger: "blur"
+ }
+ ]
},
{
label: "户籍地址",
prop: "permanentResidenceAddress",
hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入户籍地址",
+ trigger: "blur"
+ }
+ ]
},
{
label: "报考等级",
@@ -1492,7 +1506,9 @@
addBtn: this.vaildData(this.permission.securityGuard_add, false),
viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(this.permission.securityGuard_edit, false)
+ editBtn: this.vaildData(this.permission.securityGuard_edit, false),
+ securityGuard_security_apply:this.vaildData(this.permission.securityGuard_security_apply,true),
+ securityGuard_security_paper_apply:this.vaildData(this.permission.securityGuard_security_paper_apply,true)
};
},
platformPermissionList() {
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index b0018f0..2708875 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -97,7 +97,6 @@
size="small"
plain
v-if="permission.trainExam_performance_paper_apply"
- style="display: none"
icon="el-icon-collection-tag"
@click="handleSecurityPaperApply"
>证书制证申请
@@ -295,7 +294,7 @@
请上传笔试答题图片,只能上传jpg/png文件,最多上传5张图片
</div>
</el-upload>
- <el-dialog :visible.sync="dialogVisible"
+ <el-dialog :visible.sync="dialogVisible"
:modal="true"
:modal-append-to-body="true"
:append-to-body="true"
@@ -705,7 +704,6 @@
// 表单编辑时是否可见
editDisplay: true,
searchLabelWidth: 50,
- searchSpan: 3,
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
@@ -1212,6 +1210,7 @@
this.permission.trainExam_performance_export,
false
),
+ trainExam_performance_paper_apply:this.vaildData(this.permission.trainExam_performance_paper_apply,true)
};
},
},
--
Gitblit v1.9.3