From 3d3d1d6b4909b3c454a0a877e73fb51103e82b99 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 21 Aug 2021 09:53:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/exam/startexam.vue | 14 +++
src/views/traincompany/index.vue | 10 +-
src/views/trainExam/performance.vue | 27 ++++++
src/views/trainExam/singleperformance.vue | 15 +++
src/views/trainingRegistration/index.vue | 15 +++
src/views/applydetailed/index.vue | 86 ++++++++++----------
src/views/companyApply/index.vue | 21 ++++
src/views/exam/performance.vue | 29 ++++++
src/views/exam/singleperformance.vue | 1
src/views/exam/subject.vue | 19 ++++
10 files changed, 178 insertions(+), 59 deletions(-)
diff --git a/src/views/applydetailed/index.vue b/src/views/applydetailed/index.vue
index 519cd73..b300b20 100644
--- a/src/views/applydetailed/index.vue
+++ b/src/views/applydetailed/index.vue
@@ -136,41 +136,41 @@
menuWidth: 200,
column: [
- {
- label: "保安姓名",
- prop: "userId",
- type: "tree",
- dicUrl: "",
- hide: true,
- slot: true,
- searchSpan: 4,
- // 表单新增时是否禁止
- addDisabled: false,
- // 表单新增时是否可见
- addDisplay: true,
- // 表单新增时是否为查看模式
- addDetail: false,
- // 表单编辑时是否禁止
- editDisabled: true,
- viewDisabled: false,
- // 表单编辑时是否可见
- editDisplay: true,
- viewDisplay: false,
- // 表单编辑时是否为查看模式
- editDetail: false,
- props: {
- label: "title",
- value: "id",
- },
- rules: [
- {
- required: true,
- message: "请选择保安姓名",
- trigger: "blur",
- },
- ],
- width: 80,
- },
+ // {
+ // label: "保安姓名",
+ // prop: "userId",
+ // type: "tree",
+ // dicUrl: "",
+ // hide: true,
+ // slot: true,
+ // searchSpan: 4,
+ // // 表单新增时是否禁止
+ // addDisabled: false,
+ // // 表单新增时是否可见
+ // addDisplay: true,
+ // // 表单新增时是否为查看模式
+ // addDetail: false,
+ // // 表单编辑时是否禁止
+ // editDisabled: true,
+ // viewDisabled: false,
+ // // 表单编辑时是否可见
+ // editDisplay: true,
+ // viewDisplay: false,
+ // // 表单编辑时是否为查看模式
+ // editDetail: false,
+ // props: {
+ // label: "title",
+ // value: "id",
+ // },
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择保安姓名",
+ // trigger: "blur",
+ // },
+ // ],
+ // width: 80,
+ // },
{
label: "保安姓名",
prop: "realName",
@@ -477,14 +477,14 @@
created() {
console.log(this.userInfo);
- if (this.userInfo.role_name.indexOf("ksxtadmin") != -1) {
- this.questionBankOption.column[0].dicUrl =
- "/api/blade-system/dept/lazy-tree-user?parentId=";
- } else {
- this.questionBankOption.column[0].dicUrl =
- "/api/blade-system/dept/lazy-tree-user?parentId=" +
- this.userInfo.dept_id;
- }
+ // if (this.userInfo.role_name.indexOf("ksxtadmin") != -1) {
+ // this.questionBankOption.column[0].dicUrl =
+ // "/api/blade-system/dept/lazy-tree-user?parentId=";
+ // } else {
+ // this.questionBankOption.column[0].dicUrl =
+ // "/api/blade-system/dept/lazy-tree-user?parentId=" +
+ // this.userInfo.dept_id;
+ // }
},
mounted() {
var flag = false,
diff --git a/src/views/companyApply/index.vue b/src/views/companyApply/index.vue
index bb62a01..9dd3548 100644
--- a/src/views/companyApply/index.vue
+++ b/src/views/companyApply/index.vue
@@ -17,6 +17,7 @@
:search.sync="questionBankSearch"
:table-loading="questionBankLoading"
:data="questionBankData"
+ :permission="permissionList"
ref="questionBankCrud"
:page.sync="questionBankPage"
@on-load="questionBankOnLoad"
@@ -34,6 +35,7 @@
type="primary"
size="small"
plain
+ v-if="permission.company_batch_add"
icon="el-icon-folder-checked"
@click="handleBatchApply"
>批量报名
@@ -45,7 +47,7 @@
:type="type"
size="small"
icon="el-icon-refresh-left"
- v-if="row.isApply == 1"
+ v-if="row.isApply == 1 && permission.company_cancel"
@click="handleCancel(row)"
>取消报名
</el-button>
@@ -53,7 +55,7 @@
:type="type"
size="small"
icon="el-icon-folder-checked"
- v-if="row.isApply == 2 || row.isApply == -1 || row.isApply == 3"
+ v-if="row.isApply != 1 && permission.company_add"
@click="questionBankRowSave(row)"
>报名
</el-button>
@@ -114,7 +116,7 @@
} from "@/api/examapi/applyexam";
import { getListApply, addBatchApply } from "@/api/securityGuard/securityGuard";
import { mapState } from "vuex";
-
+import { mapGetters } from "vuex";
var DIC = {
applyStatus: [
{
@@ -386,6 +388,10 @@
label: "考试结束",
value: 3,
},
+ {
+ label: "否",
+ value: 4,
+ },
],
dataType: "number",
display: false,
@@ -433,6 +439,15 @@
...mapState({
userInfo: (state) => state.user.userInfo,
}),
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(null, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false),
+ };
+ },
ids() {
let ids = [];
this.questionBankSelectionList.forEach((ele) => {
diff --git a/src/views/exam/performance.vue b/src/views/exam/performance.vue
index 65c9428..d68d933 100644
--- a/src/views/exam/performance.vue
+++ b/src/views/exam/performance.vue
@@ -14,6 +14,7 @@
v-model="obj"
class="company-box"
:option="questionBankOption"
+ :permission="permissionList"
:search.sync="questionBankSearch"
:table-loading="questionBankLoading"
:data="questionBankData"
@@ -27,8 +28,17 @@
@size-change="questionBankSizeChange"
@row-update="questionBankRowUpdate"
>
+ <template slot-scope="{ row }" slot="theoryGrade">
+ {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
+ </template>
<template slot-scope="{ row }" slot="learnGrade">
{{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="allGrade">
+ {{ row.allGrade == -1 ? "" : row.allGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="qualified">
+ {{ row.qualified == -1 ? "" : row.qualified==0?"合格":row.qualified==1?"不合格":'' }}
</template>
<!-- 自定义按钮 -->
@@ -50,6 +60,7 @@
size="small"
plain
icon="el-icon-upload2"
+ v-if="permission.performance_import"
@click="handleImport"
>实操成绩导入
</el-button>
@@ -61,7 +72,8 @@
size="mini"
icon="el-icon-collection"
class="start-kaoshi"
- :disabled="row.qualified == 1"
+ v-if="permission.performance_print"
+ :disabled="row.qualified==1"
@click="securityPrint(row)"
>保安证打印
</el-button>
@@ -72,6 +84,7 @@
title="实操成绩导入"
append-to-body
:visible.sync="excelBox"
+
width="555px"
>
<avue-form
@@ -94,7 +107,7 @@
<script>
import { getList, update } from "@/api/examapi/performance";
-
+import { mapGetters } from "vuex";
export default {
data() {
var validatePass = (rule, value, callback) => {
@@ -479,6 +492,18 @@
},
};
},
+ computed:{
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(null, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(this.permission.performance__edit, false),
+ excelBtn: this.vaildData(this.permission.performance_export, false),
+ };
+ },
+ },
created() {},
mounted() {},
methods: {
diff --git a/src/views/exam/singleperformance.vue b/src/views/exam/singleperformance.vue
index 91e50c7..a5833ba 100644
--- a/src/views/exam/singleperformance.vue
+++ b/src/views/exam/singleperformance.vue
@@ -421,6 +421,7 @@
viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(null, false),
editBtn: this.vaildData(this.permission.user_edit, false),
+ excelBtn: this.vaildData(this.permission.singleperformance_export, false),
};
},
},
diff --git a/src/views/exam/startexam.vue b/src/views/exam/startexam.vue
index 2f7f07d..2273c4e 100644
--- a/src/views/exam/startexam.vue
+++ b/src/views/exam/startexam.vue
@@ -17,6 +17,7 @@
:search.sync="questionBankSearch"
:table-loading="questionBankLoading"
:data="questionBankData"
+ :permission="permissionList"
ref="questionBankCrud"
:page.sync="questionBankPage"
@on-load="questionBankOnLoad"
@@ -56,6 +57,7 @@
type="danger"
size="small"
icon="el-icon-delete"
+ v-if="permission.startexam_delete"
@click="questionBankHandleDelete"
>删 除
</el-button>
@@ -71,6 +73,7 @@
size="mini"
icon="el-icon-collection"
class="start-kaoshi"
+ v-if="permission.startexam_applyPapers"
@click="startExam(row)"
>报名清册
</el-button>
@@ -84,7 +87,7 @@
<script>
import { getList, add, remove, update } from "@/api/examapi/examination";
-
+import { mapGetters } from "vuex";
export default {
data() {
var validatePass = (rule, value, callback) => {
@@ -338,6 +341,15 @@
});
return ids.join(",");
},
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.startexam_add, false),
+ viewBtn: this.vaildData(this.permission.startexam_view, false),
+ delBtn: this.vaildData(this.permission.startexam_delete, false),
+ editBtn: this.vaildData(this.permission.startexam_edit, false),
+ };
+ },
},
watch: {},
methods: {
diff --git a/src/views/exam/subject.vue b/src/views/exam/subject.vue
index 69aadae..bda1d9f 100644
--- a/src/views/exam/subject.vue
+++ b/src/views/exam/subject.vue
@@ -18,6 +18,7 @@
:table-loading="questionBankLoading"
:data="questionBankData"
ref="questionBankCrud"
+ :permission="permissionList"
:page.sync="questionBankPage"
@on-load="questionBankOnLoad"
@selection-change="questionBankSelectionChange"
@@ -32,6 +33,7 @@
type="primary"
size="small"
icon="el-icon-plus"
+ v-if="permission.subject_add"
@click="questionBankHandleAdd"
>新 增
</el-button>
@@ -40,6 +42,7 @@
size="small"
plain
icon="el-icon-upload2"
+ v-if="permission.subject_import"
@click="handleImport"
>题库导入
</el-button>
@@ -47,6 +50,7 @@
type="danger"
size="small"
icon="el-icon-delete"
+ v-if="permission.subject_delete"
@click="questionBankHandleDelete"
>删 除
</el-button>
@@ -57,6 +61,7 @@
type="text"
size="mini"
icon="el-icon-edit"
+ v-if="permission.subject_edit"
@click="questionBankHandleAdd(row)"
>编辑
</el-button>
@@ -64,6 +69,7 @@
type="text"
size="mini"
icon="el-icon-delete"
+ v-if="permission.subject_delete"
@click="questionBankHandleDel(row)"
>删除
</el-button>
@@ -100,7 +106,7 @@
import { getList, remove } from "@/api/examapi/subject";
import addsubject from "./addsubject.vue";
-
+import { mapGetters } from "vuex";
export default {
components: {
addsubject,
@@ -243,9 +249,18 @@
questionBankSelectionList: [],
};
},
- created() {},
mounted() {},
computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.subject_add, false),
+ viewBtn: this.vaildData(this.permission.subject_view, false),
+ delBtn: this.vaildData(this.permission.subject_delete, false),
+ editBtn: this.vaildData(this.permission.subject_edit, false),
+ excelBtn: this.vaildData(this.permission.subject_report, false),
+ };
+ },
ids() {
let ids = [];
this.questionBankSelectionList.forEach((ele) => {
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index aad8484..8f93899 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -17,6 +17,7 @@
:search.sync="questionBankSearch"
:table-loading="questionBankLoading"
:data="questionBankData"
+ :permission="permissionList"
ref="questionBankCrud"
:page.sync="questionBankPage"
@on-load="questionBankOnLoad"
@@ -27,8 +28,17 @@
@size-change="questionBankSizeChange"
@row-update="questionBankRowUpdate"
>
- <template slot-scope="{ row }" slot="learnGrade">
+ <template slot-scope="{ row }" slot="theoryGrade">
+ {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="learnGrade">
{{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="allGrade">
+ {{ row.allGrade == -1 ? "" : row.allGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="qualified">
+ {{ row.qualified == -1 ? "" : row.qualified==0?"合格":row.qualified==1?"不合格":'' }}
</template>
<!-- 自定义按钮 -->
@@ -50,6 +60,7 @@
size="small"
plain
icon="el-icon-upload2"
+ v-if="permission.trainExam_performance_import"
@click="handleImport"
>实操成绩导入
</el-button>
@@ -82,7 +93,7 @@
<script>
import { getList, update } from "@/api/examapi/performance";
-
+import { mapGetters } from "vuex";
export default {
data() {
var validatePass = (rule, value, callback) => {
@@ -467,6 +478,18 @@
},
created() {},
mounted() {},
+ computed:{
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(this.permission.trainExam_performance_view, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(this.permission.trainExam_performance_edit, false),
+ excelBtn: this.vaildData(this.permission.trainExam_performance_export, false),
+ };
+ },
+ },
methods: {
questionBankOnLoad(page, params = {}) {
this.questionBankLoading = false;
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index f972c91..9b1a5a5 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -18,6 +18,7 @@
:table-loading="questionBankLoading"
:data="questionBankData"
ref="questionBankCrud"
+ :permission="permissionList"
:page.sync="questionBankPage"
@on-load="questionBankOnLoad"
@selection-change="questionBankSelectionChange"
@@ -82,7 +83,7 @@
<script>
import { getList, update } from "@/api/examapi/performance";
-
+import { mapGetters } from "vuex";
export default {
data() {
var validatePass = (rule, value, callback) => {
@@ -414,6 +415,18 @@
},
created() {},
mounted() {},
+ computed:{
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(null, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false),
+ excelBtn: this.vaildData(this.permission.trainExam_performance_export, false),
+ };
+ },
+ },
methods: {
//保安证证查看
securityPrint(row) {
diff --git a/src/views/traincompany/index.vue b/src/views/traincompany/index.vue
index b6ef7bf..86882d7 100644
--- a/src/views/traincompany/index.vue
+++ b/src/views/traincompany/index.vue
@@ -34,6 +34,7 @@
:type="type"
size="small"
icon="el-icon-edit"
+ v-if="permission.traincompany_addTrain"
@click="handleTrainApply(row)"
>报名
</el-button>
@@ -41,6 +42,7 @@
:type="type"
size="small"
icon="el-icon-edit"
+ v-if="permission.traincompany_batchAddTrain"
@click="handleTrainApplyBatch(row)"
>批量报名
</el-button>
@@ -247,10 +249,10 @@
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.post_add, false),
- viewBtn: this.vaildData(this.permission.post_view, false),
- delBtn: this.vaildData(this.permission.post_delete, false),
- editBtn: this.vaildData(this.permission.post_edit, false),
+ addBtn: this.vaildData(null, false),
+ viewBtn: this.vaildData(null, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false),
};
},
ids() {
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index e5689d4..3980661 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -37,6 +37,7 @@
plain
icon="el-icon-folder-checked"
@click="handleBatchExam"
+ v-if="permission.trainingRegistration_exam"
>考试申请
</el-button>
<el-button
@@ -44,6 +45,7 @@
size="small"
plain
icon="el-icon-folder-checked"
+ v-if="permission.trainingRegistration_import"
@click="handleImport"
>清册导入
</el-button>
@@ -54,12 +56,14 @@
@click="revoke(row)"
:size="size"
:type="type"
+ v-if="permission.trainingRegistration_cancel"
>取消报名</el-button
>
<el-button
:type="type"
size="small"
icon="el-icon-receiving"
+ v-if="permission.trainingRegistration_print"
:disabled="row.candidateNo == ''"
@click="handlePrint(row)"
>准考证打印
@@ -122,7 +126,7 @@
cancelTrain,
addExam,
} from "@/api/trainingRegistration/trainingRegistration";
-
+import { mapGetters } from "vuex";
export default {
data() {
return {
@@ -235,6 +239,15 @@
});
return ids.join(",");
},
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.notice_add, false),
+ viewBtn: this.vaildData(this.permission.notice_view, false),
+ delBtn: this.vaildData(this.permission.notice_delete, false),
+ editBtn: this.vaildData(this.permission.notice_edit, false),
+ };
+ },
},
methods: {
//准考证查看
--
Gitblit v1.9.3