From 8e4af3f3bedf7aa87a6c7965d04ecaefe328e3b0 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 09 Sep 2021 15:25:05 +0800
Subject: [PATCH] +
---
src/views/securityGuard/securityGuard.vue | 111 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 79 insertions(+), 32 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index e6f6f0f..2a50eb1 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,7 +130,7 @@
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>
@@ -138,10 +138,18 @@
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"
+ :size="size"
+ :type="type"
v-if="permission.securityGuard_check"
@click.stop="rowCheck(row)"
>异常
- </el-button>
+ </el-button> -->
</template>
<template slot-scope="{ row }" slot="sex">
@@ -367,12 +375,11 @@
},
tip: "请上传 zip 压缩文件",
action: "/api/blade-resource/oss/endpoint/put-file-zip",
- }
+ },
],
},
- form: {
- },
+ form: {},
search: {},
roleBox: false,
excelBox: false,
@@ -443,7 +450,8 @@
stripe: true,
border: true,
delBtn: false,
-
+ addTitle: "入职登记",
+ addBtnText: "入职登记",
align: "center",
index: true,
delBtnText: "注销",
@@ -484,7 +492,7 @@
{
label: "登录账号",
prop: "account",
- editDisabled:true,
+ editDisabled: true,
rules: [
{
required: true,
@@ -497,7 +505,7 @@
{
label: "密码",
prop: "password",
- type:'password',
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -508,7 +516,7 @@
{
label: "确认密码",
prop: "password2",
- type:'password',
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -516,7 +524,6 @@
{ required: true, validator: validatePass2, trigger: "blur" },
],
},
-
],
},
{
@@ -559,9 +566,27 @@
},
action: "/api/blade-resource/oss/endpoint/put-file",
tip: "只能上传jpg/png个人头像，且不超过500kb",
- span: 12,
- row: true,
+ span: 10,
+ // row: true,
prop: "avatar",
+ },
+ {
+ label: "指纹信息",
+ type: "upload",
+ listType: "picture-img",
+ propsHttp: {
+ res: "data",
+ url: "link",
+ },
+ canvasOption: {
+ text: " ",
+ ratio: 0.1,
+ },
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ tip: "只能上传jpg/png，且不超过500kb",
+ span: 10,
+ // row: true,
+ prop: "fingerprint",
},
{
label: "是否持证",
@@ -894,8 +919,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() {
@@ -1002,7 +1027,7 @@
sex: row.sex,
};
const userMap = {
- user: user
+ user: user,
};
securitySave(userMap).then(
() => {
@@ -1026,7 +1051,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 +1067,47 @@
}
);
},
+ rowDellook(row) {
+ console.log(row);
+ },
rowDel(row) {
- this.$confirm("确定将选择保安登记离职?", {
- confirmButtonText: "确定",
+ // this.$confirm("确定将选择保安登记离职?", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // })
+ // .then(() => {
+ // row.status = "2";
+ // return update(row);
+ // })
+ // .then(() => {
+ // this.onLoad(this.page);
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // });
+ // });
+ this.$prompt("离职原因", "提示", {
+ confirmButtonText: "确定离职",
cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- row.status = "2";
- return update(row);
- })
- .then(() => {
- this.onLoad(this.page);
+ // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
+ inputErrorMessage: "邮箱格式不正确",
+ }).then(({ value }) => {
+ console.log(value);
+ row.status = "2";
+ update(row).then((res) => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功",
});
});
+ });
+ // .catch(() => {
+ // this.$message({
+ // type: 'info',
+ // message: '取消输入'
+ // });
+ // });
},
rowCheck(row) {
this.$confirm("确定审查异常标记?", {
@@ -1243,10 +1293,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