From e3f898bd1f4e964424b7c1a1b1aa2f7fa508ca4f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Sep 2021 17:59:40 +0800
Subject: [PATCH] 成绩查看权限配置，培训公司管理员查看当前培训公司的考试成绩，报名列表同
---
src/views/securityGuard/securityGuard.vue | 451 ++++++++++++++++++++++++-------------------------------
1 files changed, 196 insertions(+), 255 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 8b60307..0a53084 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1,5 +1,5 @@
<template>
- <el-row class="securityGuard">
+ <el-row :class="{securityGuard : isSecurity}">
<el-col :span="0" style="display: none">
<div class="box">
<el-scrollbar>
@@ -24,8 +24,9 @@
v-model="form"
:permission="permissionList"
@row-del="rowDel"
- @row-update="rowUpdate"
+ :row-style="rowStyle"
@row-save="rowSave"
+ @row-update="rowUpdate"
:before-open="beforeOpen"
:page.sync="page"
@search-change="searchChange"
@@ -36,6 +37,7 @@
@refresh-change="refreshChange"
@on-load="onLoad"
>
+ <!-- @row-update="rowUpdate" -->
<template slot="menuLeft">
<el-button
type="success"
@@ -45,6 +47,15 @@
v-if="permission.securityGuard_import"
@click="handleImport1"
>批量导入
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ v-if="permission.securityGuard_import"
+ @click="handleImport2"
+ >个人照片批量上传
</el-button>
<el-button
type="danger"
@@ -123,6 +134,14 @@
@click.stop="rowDel(row)"
>离职登记
</el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ v-if="permission.securityGuard_check"
+ @click.stop="rowCheck(row)"
+ >异常
+ </el-button>
</template>
<template slot-scope="{ row }" slot="sex">
@@ -130,9 +149,12 @@
<el-tag v-if="row.sex == 2">女</el-tag>
</template>
<template slot-scope="{ row }" slot="deptId">
- <el-tag class="rowClickSelf" @click="rowClickSelf(row.deptId)">{{
- row.$deptId
- }}</el-tag>
+ <el-tag
+ class="rowClickSelf"
+ title="点击查看所属公司情况"
+ @click="rowClickSelf(row.deptId)"
+ >{{ row.deptName }}</el-tag
+ >
</template>
<template slot-scope="{ row }" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
@@ -237,6 +259,19 @@
</template>
</avue-form>
</el-dialog>
+ <el-dialog
+ title="个人照片批量上传"
+ append-to-body
+ :visible.sync="excelBox2"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption2"
+ v-model="excelForm2"
+ :upload-after="uploadAfter2"
+ >
+ </avue-form>
+ </el-dialog>
</basic-container>
</el-col>
</el-row>
@@ -287,7 +322,8 @@
return {
securityid: "",
excelBox1: false,
- isSecurity: false,
+ excelBox2: false,
+ isSecurity: true,
excelForm1: {},
excelOption1: {
submitBtn: false,
@@ -314,8 +350,29 @@
},
],
},
+ excelForm2: {},
+ excelOption2: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "文件上传",
+ prop: "file",
+ type: "upload",
+ drag: true,
+ loadText: "文件上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
+ },
+ tip: "请上传 zip 压缩文件",
+ action: "/api/blade-resource/oss/endpoint/put-file-zip",
+ }
+ ],
+ },
- form: {},
+ form: {
+ },
search: {},
roleBox: false,
excelBox: false,
@@ -385,11 +442,12 @@
searchMenuSpan: 6,
stripe: true,
border: true,
+ delBtn: false,
align: "center",
index: true,
delBtnText: "注销",
- menuWidth: 276,
+ menuWidth: 271,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -426,6 +484,7 @@
{
label: "登录账号",
prop: "account",
+ editDisabled:true,
rules: [
{
required: true,
@@ -438,6 +497,7 @@
{
label: "密码",
prop: "password",
+ type:'password',
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -448,6 +508,7 @@
{
label: "确认密码",
prop: "password2",
+ type:'password',
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -455,6 +516,15 @@
{ required: true, validator: validatePass2, trigger: "blur" },
],
},
+
+ ],
+ },
+ {
+ label: "详细信息",
+ prop: "detailInfo",
+ labelWidth: "110",
+ icon: "el-icon-s-order",
+ column: [
{
label: "姓名",
prop: "realName",
@@ -491,71 +561,8 @@
tip: "只能上传jpg/png个人头像，且不超过500kb",
span: 12,
row: true,
- prop: "myPicture",
+ prop: "avatar",
},
-
- // {
- // label: "编号",
- // prop: "code",
- // },
-
- {
- label: "所属辖区",
- prop: "jurisdiction",
- // multiple: true,
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
- props: {
- label: "title",
- value: "id",
- },
- checkStrictly: true,
- slot: true,
- rules: [
- {
- required: false,
- message: "请选择所属辖区",
- trigger: "click",
- },
- ],
- },
- // {
- // label: "所属角色",
- // prop: "roleId",
- // multiple: true,
- // type: "tree",
- // dicData: [],
- // props: {
- // label: "title",
- // },
- // checkStrictly: true,
- // slot: true,
- // rules: [
- // {
- // required: true,
- // message: "请选择所属角色",
- // trigger: "click",
- // },
- // ],
- // },
- // {
- // label: "所属岗位",
- // prop: "postId",
- // type: "tree",
- // multiple: true,
- // dicData: [],
- // props: {
- // label: "postName",
- // value: "id",
- // },
- // rules: [
- // {
- // required: false,
- // message: "请选择所属岗位",
- // trigger: "click",
- // },
- // ],
- // },
{
label: "是否持证",
prop: "hold",
@@ -579,6 +586,19 @@
hide: true,
},
{
+ label: "身份证号",
+ prop: "cardid",
+ hide: true,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
label: "手机号码",
prop: "phone",
overHidden: true,
@@ -593,19 +613,6 @@
{
label: "电子邮箱",
prop: "email",
- },
- {
- label: "身份证号",
- prop: "cardid",
- hide: true,
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入身份证号",
- trigger: "blur",
- },
- ],
},
{
label: "籍贯",
@@ -649,6 +656,26 @@
prop: "registered",
},
{
+ label: "所属辖区",
+ prop: "jurisdiction",
+ // multiple: true,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ checkStrictly: true,
+ slot: true,
+ rules: [
+ {
+ required: false,
+ message: "请选择所属辖区",
+ trigger: "click",
+ },
+ ],
+ },
+ {
label: "入职时间",
prop: "rtime",
type: "date",
@@ -675,91 +702,13 @@
// },
],
},
- {
- label: "生日",
- type: "date",
- prop: "birthday",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- },
- ],
- },
- {
- label: "从业信息",
- prop: "detailInfo",
- icon: "el-icon-s-order",
- column: [
- {
- prop: "UserPractitionersInfo",
- type: "dynamic",
- border: false,
- span: 24,
- children: {
- align: "left",
- headerAlign: "center",
- type: "form",
- rowAdd: (done) => {
- console.log(done, 111);
- done({
- input: "默认值",
- });
- },
- rowDel: (row, done) => {
- console.log(row, 222);
- done();
- },
- column: [
- {
- width: 200,
- label: "单位名称",
- prop: "companyname",
- formslot: true,
- },
- {
- width: 200,
- label: "部门",
- prop: "department",
- formslot: true,
- },
- {
- width: 200,
- label: "岗位",
- prop: "post",
- formslot: true,
- },
- {
- width: 200,
- label: "岗位职责",
- prop: "responsibilities",
- formslot: true,
- },
- {
- width: 200,
- label: "入职时间",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "entryTime",
- formslot: true,
- },
- {
- width: 200,
- label: "离职时间",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "departureTime",
- formslot: true,
- },
- {
- width: 200,
- label: "离职原因",
- prop: "leaving",
- formslot: true,
- },
- ],
- },
- },
+ // {
+ // label: "生日",
+ // type: "date",
+ // prop: "birthday",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // },
],
},
],
@@ -856,32 +805,32 @@
tip: "请上传 .xls,.xlsx 标准格式文件",
action: "/api/blade-user/import-user",
},
- {
- label: "数据覆盖",
- prop: "isCovered",
- type: "switch",
- align: "center",
- width: 80,
- dicData: [
- {
- label: "否",
- value: 0,
- },
- {
- label: "是",
- value: 1,
- },
- ],
- value: 0,
- slot: true,
- rules: [
- {
- required: true,
- message: "请选择是否覆盖",
- trigger: "blur",
- },
- ],
- },
+ // {
+ // label: "数据覆盖",
+ // prop: "isCovered",
+ // type: "switch",
+ // align: "center",
+ // width: 80,
+ // dicData: [
+ // {
+ // label: "否",
+ // value: 0,
+ // },
+ // {
+ // label: "是",
+ // value: 1,
+ // },
+ // ],
+ // value: 0,
+ // slot: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择是否覆盖",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
{
label: "模板下载",
prop: "excelTemplate",
@@ -945,6 +894,8 @@
if (!website.tenantMode) {
this.initData(website.tenantId);
}
+ console.log(this.search,111);
+ this.search['status'] = 1;
},
methods: {
handleImport1() {
@@ -957,7 +908,16 @@
done();
},
handleTemplate1() {
- window.open(`/api/examSubjectChoices/export-template`);
+ window.open(`/api/blade-user/export-template-security`);
+ },
+ handleImport2() {
+ this.excelBox2 = true;
+ },
+ uploadAfter2(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox2 = false;
+ // this.refreshChange();
+ done();
},
//行点击事件
@@ -1015,24 +975,7 @@
if (row.postId) {
row.postId = row.postId.join(",");
}
- const userPractitionersList = [];
- var userPractitionersInfo = row.UserPractitionersInfo;
- if (userPractitionersInfo.length > 0) {
- userPractitionersInfo.forEach((item) => {
- const info = {
- companyname: item.companyname,
- department: item.department,
- departureTime: item.departureTime,
- entryTime: item.entryTime,
- name: row.realName,
- leaving: item.leaving,
- securityid: row.id,
- post: item.post,
- responsibilities: item.responsibilities,
- };
- userPractitionersList.push(info);
- });
- }
+
const user = {
account: row.account,
address: row.address,
@@ -1059,17 +1002,16 @@
sex: row.sex,
};
const userMap = {
- user: user,
- userPractitionersInfo: userPractitionersList,
+ user: user
};
securitySave(userMap).then(
() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!",
});
- this.initFlag = false;
- this.onLoad(this.page);
done();
},
(error) => {
@@ -1082,42 +1024,15 @@
row.deptId = row.deptId;
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
- const userPractitionersList = [];
- var userPractitionersInfo = row.UserPractitionersInfo;
- if (userPractitionersInfo.length > 0) {
- userPractitionersInfo.forEach((item) => {
- const info = {
- companyname: item.companyname,
- department: item.department,
- departureTime: item.departureTime,
- entryTime: item.entryTime,
- name: row.realName,
- leaving: item.leaving,
- securityid: row.id,
- post: item.post,
- responsibilities: item.responsibilities,
- };
- userPractitionersList.push(info);
- });
- }
- var IdCardNo = row.id;
//值替换，education 放在页面会卡死
row.education = row.education1;
- update(row).then(
- () => {
- const experience = {
- securityid: IdCardNo,
- userPractitionersInfo: userPractitionersList,
- };
- //更新从业信息
- saveOrUpdateUserPractitionersInfo(experience).then(() => {
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
+ update(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
done();
},
(error) => {
@@ -1133,7 +1048,25 @@
type: "warning",
})
.then(() => {
- row.status = "0";
+ row.status = "2";
+ return update(row);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ rowCheck(row) {
+ this.$confirm("确定审查异常标记?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ row.examinationType = "1";
return update(row);
})
.then(() => {
@@ -1288,6 +1221,14 @@
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
+ //行样式调整
+ rowStyle({ row, column, rowIndex }) {
+ if (row.examinationType == "1") {
+ return {
+ color: "#ff2727",
+ };
+ }
+ },
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
@@ -1295,6 +1236,7 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
+ params = this.search;
var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
@@ -1303,8 +1245,7 @@
var roleAlias = res.data.data.roleAlias;
if (
roleAlias == "保安公司管理员" ||
- roleAlias == "保安" ||
- roleAlias == "未持证保安"
+ roleAlias == "保安"
) {
//去除保安公司查询
const column = that.findObject(that.option.column, "deptId");
@@ -1315,7 +1256,7 @@
//禁止编辑
deptColumn.disabled = true;
deptColumn.value = that.userInfo.dept_id;
- that.isSecurity = true;
+ that.isSecurity = false;
//如果是保安公司管理员
params["deptId"] = that.userInfo.dept_id;
} else if (roleAlias == "公安管理员") {
--
Gitblit v1.9.3