From 6b69b7706aaa4fa2cbc028e8704dcc312340f334 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 17 Sep 2021 10:07:12 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises
---
src/views/securityGuard/securityGuard.vue | 190 +++++++++++++++++++++++++++++++++--------------
1 files changed, 132 insertions(+), 58 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index e6f6f0f..ec51f66 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1,5 +1,5 @@
<template>
- <el-row :class="{securityGuard : isSecurity}">
+ <el-row :class="{ securityGuard: isSecurity }">
<el-col :span="0" style="display: none">
<div class="box">
<el-scrollbar>
@@ -130,9 +130,17 @@
icon="el-icon-edit"
:size="size"
:type="type"
- v-if="permission.securityGuard_delete"
+ v-if="permission.securityGuard_delete && row.status != 2"
@click.stop="rowDel(row)"
>离职登记
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ v-if="row.status == 2"
+ @click.stop="rowDellook(row)"
+ >离职查询
</el-button>
<el-button
icon="el-icon-edit"
@@ -319,6 +327,31 @@
callback();
}
};
+ const validatePassNumber = (rule, value, callback) => {
+ var test = /^[0-9]*$/gm;
+ if (!test.test(value)) {
+ callback(new Error("请输入数字"));
+ } else {
+ callback();
+ }
+ };
+ const validatePassCardid = (rule, value, callback) => {
+ var test = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/g;
+ if (!test.test(value)) {
+ callback(new Error("请输入正确身份证号码"));
+ } else {
+ callback();
+ }
+ };
+ const validatePassPhone = (rule, value, callback) => {
+ var test =
+ /^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/g;
+ if (!test.test(value)) {
+ callback(new Error("请输入正确身份证号码"));
+ } else {
+ callback();
+ }
+ };
return {
securityid: "",
excelBox1: false,
@@ -367,12 +400,11 @@
},
tip: "请上传 zip 压缩文件",
action: "/api/blade-resource/oss/endpoint/put-file-zip",
- }
+ },
],
},
- form: {
- },
+ form: {},
search: {},
roleBox: false,
excelBox: false,
@@ -484,7 +516,7 @@
{
label: "登录账号",
prop: "account",
- editDisabled:true,
+ editDisabled: true,
rules: [
{
required: true,
@@ -497,7 +529,7 @@
{
label: "密码",
prop: "password",
- type:'password',
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -508,7 +540,7 @@
{
label: "确认密码",
prop: "password2",
- type:'password',
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -516,7 +548,6 @@
{ required: true, validator: validatePass2, trigger: "blur" },
],
},
-
],
},
{
@@ -551,17 +582,35 @@
listType: "picture-img",
propsHttp: {
res: "data",
- url: "link",
+ url: "url",
},
canvasOption: {
text: " ",
ratio: 0.1,
},
- action: "/api/blade-resource/oss/endpoint/put-file",
+ action: "/api/blade-resource/oss/endpoint/put-files",
tip: "只能上传jpg/png个人头像，且不超过500kb",
- span: 12,
- row: true,
+ span: 10,
+ // row: true,
prop: "avatar",
+ },
+ {
+ label: "指纹信息",
+ type: "upload",
+ listType: "picture-img",
+ propsHttp: {
+ res: "data",
+ url: "url",
+ },
+ canvasOption: {
+ text: " ",
+ ratio: 0.1,
+ },
+ action: "/api/blade-resource/oss/endpoint/put-files",
+ tip: "只能上传jpg/png指纹信息，且不超过500kb",
+ span: 10,
+ // row: true,
+ prop: "fingerprint",
},
{
label: "是否持证",
@@ -596,6 +645,11 @@
message: "请输入身份证号",
trigger: "blur",
},
+ {
+ required: true,
+ validator: validatePassCardid,
+ trigger: "blur",
+ },
],
},
{
@@ -606,6 +660,11 @@
{
required: true,
message: "请输入手机号",
+ trigger: "blur",
+ },
+ {
+ required: true,
+ validator: validatePassPhone,
trigger: "blur",
},
],
@@ -894,8 +953,8 @@
if (!website.tenantMode) {
this.initData(website.tenantId);
}
- console.log(this.search,111);
- this.search['status'] = 1;
+ console.log(this.search, 111);
+ this.search["status"] = 1;
},
methods: {
handleImport1() {
@@ -976,33 +1035,35 @@
row.postId = row.postId.join(",");
}
- const user = {
- account: row.account,
- address: row.address,
- birthday: row.birthday,
- cardid: row.cardid,
- deptId: row.deptId,
- education: row.education,
- email: row.email,
- height: row.height,
- hold: row.hold,
- jurisdiction: row.jurisdiction,
- myPicture: row.myPicture,
- name: row.name,
- nation: row.nation,
- nativeplace: row.nativeplace,
- password: row.password,
- password2: row.password2,
- phone: row.phone,
- politicaloutlook: row.politicaloutlook,
- realName: row.realName,
- registered: row.registered,
- rtime: row.rtime,
- securitynumber: row.securitynumber,
- sex: row.sex,
- };
const userMap = {
- user: user
+ user: {
+ account: row.account,
+ avatar: row.avatar,
+ fingerprint: row.fingerprint,
+ healstats: row.healstats,
+ address: row.address,
+ birthday: row.birthday,
+ cardid: row.cardid,
+ deptId: row.deptId,
+ education: row.education1,
+ email: row.email,
+ height: row.height,
+ hold: row.hold,
+ jurisdiction: row.jurisdiction,
+ myPicture: row.myPicture,
+ name: row.name,
+ nation: row.nation,
+ nativeplace: row.nativeplace,
+ password: row.password,
+ password2: row.password2,
+ phone: row.phone,
+ politicaloutlook: row.politicaloutlook,
+ realName: row.realName,
+ registered: row.registered,
+ rtime: row.rtime,
+ securitynumber: row.securitynumber,
+ sex: row.sex,
+ },
};
securitySave(userMap).then(
() => {
@@ -1026,7 +1087,8 @@
row.postId = row.postId.join(",");
//值替换，education 放在页面会卡死
row.education = row.education1;
- update(row).then(() => {
+ update(row).then(
+ () => {
this.initFlag = false;
this.onLoad(this.page);
this.$message({
@@ -1041,23 +1103,38 @@
}
);
},
+ rowDellook(row) {
+ // console.log(row.reasonForLeav);
+ this.$alert(
+ row.reasonForLeav == "" ? "未填写" : row.reasonForLeav,
+ "离职原因",
+ {
+ confirmButtonText: "确定",
+ callback: (action) => {},
+ }
+ );
+ },
rowDel(row) {
- this.$confirm("确定将选择保安登记离职?", {
- confirmButtonText: "确定",
+ this.$prompt("离职原因", "提示", {
+ confirmButtonText: "确定离职",
cancelButtonText: "取消",
- type: "warning",
+ inputErrorMessage: "",
})
- .then(() => {
+ .then(({ value }) => {
+ console.log(value);
+ row.reasonForLeav = value;
row.status = "2";
- return update(row);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
+ // console.log(update);
+ // return;
+ update(row).then((res) => {
+ this.$message({
+ type: "success",
+ message: "操作成功",
+ });
});
- });
+ this.refreshChange();
+ })
+ .catch(() => {});
},
rowCheck(row) {
this.$confirm("确定审查异常标记?", {
@@ -1243,10 +1320,7 @@
roleIds.forEach((roleId) => {
getRoleDetail(roleId).then((res) => {
var roleAlias = res.data.data.roleAlias;
- if (
- roleAlias == "保安公司管理员" ||
- roleAlias == "保安"
- ) {
+ if (roleAlias == "保安公司管理员" || roleAlias == "保安") {
//去除保安公司查询
const column = that.findObject(that.option.column, "deptId");
column.search = false;
--
Gitblit v1.9.3