From e4100ecc3a88273dcdbc2c1452d4e9f00736f3db Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 10:17:44 +0800
Subject: [PATCH] 派遣单位管理修改，考试成绩查询样式微调
---
src/views/securityGuard/securityGuard.vue | 573 +++++++++++++++++++++++++-------------------------------
1 files changed, 256 insertions(+), 317 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 3881882..6c765e7 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,9 +24,9 @@
v-model="form"
:permission="permissionList"
@row-del="rowDel"
- @row-update="rowUpdate"
+ :row-style="rowStyle"
@row-save="rowSave"
- @row-click="rowClick"
+ @row-update="rowUpdate"
:before-open="beforeOpen"
:page.sync="page"
@search-change="searchChange"
@@ -37,12 +37,14 @@
@refresh-change="refreshChange"
@on-load="onLoad"
>
+ <!-- @row-update="rowUpdate" -->
<template slot="menuLeft">
<el-button
type="success"
size="small"
plain
icon="el-icon-upload2"
+ v-if="permission.securityGuard_import"
@click="handleImport1"
>批量导入
</el-button>
@@ -52,7 +54,6 @@
size="small"
plain
icon="el-icon-delete"
- v-if="permission.user_delete"
@click="handleDelete"
>注 销
</el-button>
@@ -109,20 +110,28 @@
</template>
<template slot-scope="{ type, size, row }" slot="menu">
- <!-- <el-button
- style="display:none"
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="addOrUpdateHandle(row.id)"
- >修改
- </el-button> -->
+ <el-button
+ icon="el-icon-s-custom"
+ :size="size"
+ :type="type"
+ @click.stop="rowClick(row)"
+ >查看
+ </el-button>
<el-button
icon="el-icon-edit"
:size="size"
:type="type"
+ v-if="permission.securityGuard_delete"
@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>
@@ -130,7 +139,14 @@
<el-tag v-if="row.sex == 1">男</el-tag>
<el-tag v-if="row.sex == 2">女</el-tag>
</template>
-
+ <template slot-scope="{ row }" slot="deptId">
+ <el-tag
+ class="rowClickSelf"
+ title="点击查看所属公司情况"
+ @click="rowClickSelf(row.deptId)"
+ >{{ row.$deptId }}</el-tag
+ >
+ </template>
<template slot-scope="{ row }" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
</template>
@@ -238,7 +254,7 @@
</el-col>
</el-row>
</template>
-
+
<script>
import {
getUser,
@@ -284,6 +300,7 @@
return {
securityid: "",
excelBox1: false,
+ isSecurity: true,
excelForm1: {},
excelOption1: {
submitBtn: false,
@@ -311,7 +328,8 @@
],
},
- form: {},
+ form: {
+ },
search: {},
roleBox: false,
excelBox: false,
@@ -376,12 +394,17 @@
calcHeight: 80,
tip: false,
searchShow: true,
+
+ indexWidth: 55,
searchMenuSpan: 6,
- border: true, //liu
stripe: true,
+ border: true,
+ delBtn: false,
+
align: "center",
index: true,
delBtnText: "注销",
+ menuWidth: 271,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -399,8 +422,8 @@
label: "所属保安公司",
prop: "deptId",
type: "tree",
- dicUrl:
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl:
+ // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
// dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
props: {
label: "title",
@@ -418,6 +441,7 @@
{
label: "登录账号",
prop: "account",
+ editDisabled:true,
rules: [
{
required: true,
@@ -430,6 +454,7 @@
{
label: "密码",
prop: "password",
+ type:'password',
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -440,6 +465,7 @@
{
label: "确认密码",
prop: "password2",
+ type:'password',
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -447,6 +473,15 @@
{ required: true, validator: validatePass2, trigger: "blur" },
],
},
+
+ ],
+ },
+ {
+ label: "详细信息",
+ prop: "detailInfo",
+ labelWidth: "110",
+ icon: "el-icon-s-order",
+ column: [
{
label: "姓名",
prop: "realName",
@@ -485,69 +520,6 @@
row: true,
prop: "myPicture",
},
-
- // {
- // 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",
@@ -571,6 +543,19 @@
hide: true,
},
{
+ label: "身份证号",
+ prop: "cardid",
+ hide: true,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
label: "手机号码",
prop: "phone",
overHidden: true,
@@ -585,19 +570,6 @@
{
label: "电子邮箱",
prop: "email",
- },
- {
- label: "身份证号",
- prop: "cardid",
- hide: true,
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入身份证号",
- trigger: "blur",
- },
- ],
},
{
label: "籍贯",
@@ -625,6 +597,10 @@
prop: "politicaloutlook",
},
{
+ label: "健康状态",
+ prop: "healstats",
+ },
+ {
label: "身高",
prop: "height",
},
@@ -635,6 +611,26 @@
{
label: "户口所在地",
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: "入职时间",
@@ -663,91 +659,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: true, //liu
- 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",
+ // },
],
},
],
@@ -844,32 +762,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",
@@ -900,10 +818,10 @@
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.user_add, false),
+ addBtn: this.vaildData(this.permission.securityGuard_add, false),
viewBtn: this.vaildData(null, false),
- delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(this.permission.user_edit, false),
+ delBtn: this.vaildData(this.permission.securityGuard_delete, false),
+ editBtn: this.vaildData(this.permission.securityGuard_edit, false),
};
},
platformPermissionList() {
@@ -925,28 +843,16 @@
userInfo: (state) => state.user.userInfo,
}),
},
+ beforeCreate() {},
+ created() {},
mounted() {
// this.option.column[0].hide = true
// 非保安单位模式默认加载管理组数据
if (!website.tenantMode) {
this.initData(website.tenantId);
}
-
- //获取当前登录人员的角色信息
- var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
- var roleAlias = res.data.data.roleAlias;
- if (
- roleAlias == "保安公司管理员" ||
- roleAlias == "保安" ||
- roleAlias == "未持证保安"
- ) {
- const column = this.findObject(this.option.column, "deptId");
- column.search = false;
- }
- });
- });
+ console.log(this.search,111);
+ this.search['status'] = 1;
},
methods: {
handleImport1() {
@@ -959,14 +865,22 @@
done();
},
handleTemplate1() {
- window.open(`/api/examSubjectChoices/export-template`);
+ window.open(`/api/blade-user/export-template-security`);
},
//行点击事件
rowClick(row) {
+ // console.log(row, 111);
this.$router.push({
path: "/securityGuardDetail",
query: { row: JSON.stringify(row) },
+ });
+ },
+ rowClickSelf(row) {
+ console.log(row, "baoan");
+ this.$router.push({
+ path: "/securityUnitChild",
+ query: { fromSecunityGuardId: row },
});
},
nodeClick(data) {
@@ -975,18 +889,18 @@
this.onLoad(this.page);
},
initData(tenantId) {
- getRoleTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "roleId");
- column.dicData = res.data.data;
- });
+ // getRoleTree(tenantId).then((res) => {
+ // const column = this.findObject(this.option.group, "roleId");
+ // column.dicData = res.data.data;
+ // });
// getDeptTree(tenantId).then((res) => {
// const column = this.findObject(this.option.group, "deptId");
// column.dicData = res.data.data;
// });
- getPostList(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "postId");
- column.dicData = res.data.data;
- });
+ // getPostList(tenantId).then((res) => {
+ // const column = this.findObject(this.option.group, "postId");
+ // column.dicData = res.data.data;
+ // });
},
submitRole() {
const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -1009,24 +923,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,
@@ -1053,17 +950,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) => {
@@ -1076,42 +972,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) => {
@@ -1127,7 +996,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(() => {
@@ -1282,6 +1169,14 @@
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
+ //行样式调整
+ rowStyle({ row, column, rowIndex }) {
+ if (row.examinationType == "1") {
+ return {
+ color: "#ff2727",
+ };
+ }
+ },
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
@@ -1289,40 +1184,79 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- let values = {
- ...params,
- };
- values = {
- ...params,
- roleAlias: "111",
- ...this.query,
- };
-
+ params = this.search;
+ var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
roleIds.forEach((roleId) => {
getRoleDetail(roleId).then((res) => {
var roleAlias = res.data.data.roleAlias;
- if (roleAlias == "保安公司管理员") {
- values["deptId"] = this.userInfo.dept_id;
+ if (
+ roleAlias == "保安公司管理员" ||
+ roleAlias == "保安" ||
+ roleAlias == "未持证保安"
+ ) {
+ //去除保安公司查询
+ const column = that.findObject(that.option.column, "deptId");
+ column.search = false;
+ const deptColumn = that.findObject(that.option.group, "deptId");
+ deptColumn.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
+ //禁止编辑
+ deptColumn.disabled = true;
+ deptColumn.value = that.userInfo.dept_id;
+ that.isSecurity = false;
+ //如果是保安公司管理员
+ params["deptId"] = that.userInfo.dept_id;
+ } else if (roleAlias == "公安管理员") {
+ params["jurisdiction"] = that.userInfo.jurisdiction;
+ var columnDept = that.findObject(that.option.column, "deptId");
+ columnDept.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ var ColumnDeptUpdate = that.findObject(that.option.group, "deptId");
+ ColumnDeptUpdate.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ } else {
+ var columnDept1 = that.findObject(that.option.column, "deptId");
+ columnDept1.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
+ var ColumnDeptUpdate1 = that.findObject(
+ that.option.group,
+ "deptId"
+ );
+ ColumnDeptUpdate1.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
+
+ let values = {
+ ...params,
+ };
+ values = {
+ ...params,
+ roleAlias: "111",
+ ...that.query,
+ };
+
+ that.loading = true;
+ getList(page.currentPage, page.pageSize, values).then((res) => {
+ const data = res.data.data;
+ that.page.total = data.total;
+ var d = data.records;
+ var date = new Date();
+ var datayear = date.getFullYear();
+ for (const key in d) {
+ var year = d[key].cardid.slice(6, 10);
+ d[key]["age"] = +datayear - +year;
+ // d[key].securitynumber = "赣洪202100009";
+ }
+ that.data = data.records;
+ that.loading = false;
+ that.selectionClear();
+ });
});
});
-
- if (this.userInfo.role_id == "1414840172333842433") {
- console.log("是公安add jurisdiction");
- values["jurisdiction"] = this.userInfo.jurisdiction;
- }
- this.loading = true;
- getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(
- (res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- }
- );
},
platformRowUpdate(row, index, done, loading) {
updatePlatform(row.id, row.userType, row.userExt).then(
@@ -1392,8 +1326,8 @@
},
};
</script>
-
-<style>
+
+<style lang="scss" scoped>
.box {
height: 800px;
}
@@ -1405,4 +1339,9 @@
.box .el-scrollbar__wrap {
overflow: scroll;
}
-</style>
+.rowClickSelf {
+ &:hover {
+ cursor: pointer;
+ }
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3