From ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Dec 2021 15:08:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/trainExam/performance.vue | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 4 deletions(-)
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 38c608c..abdbd72 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -25,6 +25,7 @@
:permission="permissionList"
ref="questionBankCrud"
:page.sync="questionBankPage"
+ @sort-change="sortChange"
@on-load="questionBankOnLoad"
@selection-change="questionBankSelectionChange"
@search-change="questionBankSearchChange"
@@ -123,6 +124,14 @@
:size="size"
:type="type"
>申请修改成绩</el-button
+ >
+ <el-button
+ icon="el-icon-edit"
+ v-if="row.isPaper==6"
+ @click="securityPaperApply(row)"
+ :size="size"
+ :type="type"
+ >补证申请</el-button
>
</template>
</avue-crud>
@@ -274,7 +283,7 @@
} from "@/api/examapi/performance";
import { mapGetters } from "vuex";
import { getRoleDetail } from "@/api/system/role";
-import { securityApply } from "@/api/accreditationRecords/accreditationRecords";
+import { securityApply,add} from "@/api/accreditationRecords/accreditationRecords";
import Qs from "qs";
export default {
components: {
@@ -347,7 +356,7 @@
selection: true,
reserveSelection: true,
selectable: (row) => {
- if (row.qualified != "0") {
+ if (row.qualified != "0" || row.isPaper==6) {
return false;
} else {
return true;
@@ -366,7 +375,7 @@
dialogClickModal: false,
// 操作栏宽度
menu: true,
- menuWidth: 295,
+ menuWidth: 330,
labelWidth: 120,
...this.$store.state.control.clearOtherBut,
@@ -488,6 +497,7 @@
prop: "candidateNo",
search: true,
searchSpan: 4,
+ hide:true,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -515,6 +525,7 @@
prop: "avatar",
type: "upload",
listType: "picture-img",
+ width:60,
},
{
label: "所属公司",
@@ -600,7 +611,7 @@
slot: true,
search: true,
searchSpan: 3,
- width: 60,
+ width: 80,
dicData: [
{
label: "发布成绩",
@@ -639,6 +650,7 @@
label: "理论成绩",
prop: "theoryGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -657,6 +669,7 @@
label: "实操成绩",
prop: "learnGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -678,6 +691,7 @@
label: "总成绩",
prop: "allGrade",
slot: true,
+ sortable: true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -774,6 +788,32 @@
editDetail: false,
},
{
+ label: "是否制证",
+ prop: "isPaper",
+ type: "select",
+ search: true,
+ width: 70,
+ searchSpan: 3,
+ addDisplay: false,
+ editDisplay: false,
+ // hide: true,
+ display: false,
+ dicData: [
+ {
+ label: "全部",
+ value: 10,
+ },
+ {
+ label: "已制证",
+ value: 6,
+ },
+ {
+ label: "未制证",
+ value: 7,
+ },
+ ],
+ },
+ {
label: "有无照片",
prop: "isAvatar",
type: "select",
@@ -805,6 +845,8 @@
questionBankSearch: {},
questionBankLoading: true,
questionBankData: [],
+ sort:"",
+ sortName:"",
questionBankPage: {
pageSize: 10,
currentPage: 1,
@@ -952,6 +994,27 @@
closezhengjian() {
this.dialogVisiblezhengjian = false;
},
+ //排序
+ sortChange(value) {
+ if(value.order=="ascending"){
+ this.sort = "asc";
+ }
+ if(value.order=="descending"){
+ this.sort = "desc";
+ }
+ this.sortName = value.prop;
+ //字段匹配
+ if(value.prop=="theoryGrade"){
+ this.sortName = "theory_grade";
+ }
+ if(value.prop=="learnGrade"){
+ this.sortName = "learn_grade";
+ }
+ if(value.prop=="allGrade"){
+ this.sortName = "all_grade";
+ }
+ this.questionBankOnLoad(this.questionBankPage);
+ },
questionBankOnLoad(page, params = {}) {
//判断角色，如果是保安公司管理员或保安，只能查看当前公司的考试成绩
var that = this;
@@ -970,6 +1033,12 @@
}
that.questionBankLoading = false;
params["examType"] = 2;
+ if(this.sort){
+ params["sort"] = this.sort;
+ }
+ if(this.sortName){
+ params["sortName"] = this.sortName;
+ }
getList(
page.currentPage,
page.pageSize,
@@ -978,6 +1047,9 @@
const data = res.data.data;
data.records.forEach((item) => {
+ if (item.isPaper == null || item.isPaper == -1) {
+ item.isPaper = "";
+ }
if (item.theoryGrade == null && item.learnGrade == -1) {
item.qualified = "";
}
@@ -998,6 +1070,34 @@
that.questionBankSelectionClear();
});
});
+ });
+ },
+ //补证申请
+ securityPaperApply(row,done,loading){
+ this.$confirm("当前保安员已制证，确定要继续申请制证?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ const data = {
+ createUser:this.userInfo.user_id,
+ type:2,
+ userId:row.userId
+ }
+ add(data).then(
+ () => {
+ this.questionBankOnLoad(this.questionBankPage);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
});
},
//缺考标记
@@ -1084,6 +1184,8 @@
questionBankSelectionClear() {
this.questionBankSelectionList = [];
+ this.sort = "";
+ this.sortName = "";
// this.$refs.questionBankCrud.toggleSelection();
},
questionBankSelectionChange(list) {
@@ -1170,6 +1272,7 @@
securityName: this.questionBankSearch.securityName,
examName: this.questionBankSearch.examName,
isAvatar: this.questionBankSearch.isAvatar,
+ isPaper: this.questionBankSearch.isPaper,
};
//导出
if (
--
Gitblit v1.9.3