From 7becb16bb38cb3284c7f4e3dc2c486dd55812c8a Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 20 Dec 2023 16:48:23 +0800
Subject: [PATCH] 保安图标
---
src/views/securityGuard/securityGuard.vue | 1791 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 1,029 insertions(+), 762 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 5254e69..d0834f7 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1,6 +1,6 @@
<template>
<el-row :class="{ securityGuard: isSecurity }">
- <el-col :span="0" style="display: none">
+ <!-- <el-col :span="0" style="display: none">
<div class="box">
<el-scrollbar>
<basic-container>
@@ -12,152 +12,128 @@
</basic-container>
</el-scrollbar>
</div>
- </el-col>
+ </el-col> -->
<el-col :span="24">
- <basic-container
- :class="[
- $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : '',
- ]"
- >
- <avue-crud
- class="tablesss"
- :key="option.height"
- :option="option"
- :search.sync="search"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- :permission="permissionList"
- @row-del="rowDel"
- :row-style="rowStyle"
- @row-save="rowSave"
- @row-update="rowUpdate"
- :before-open="beforeOpen"
- :page.sync="page"
- @sort-change="sortChange"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- :upload-before="uploadBefore"
- :defaults.sync="defaults"
- :before-close="beforeClose"
- >
+ <basic-container :class="[
+ screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]">
+ <!-- :key="option.height" -->
+ <avue-crud class="tablesss" :option="option" :search.sync="search" :table-loading="loading" :data="data"
+ ref="crud" v-model="form" :permission="permissionList" @row-del="rowDel" :row-style="rowStyle"
+ @row-save="rowSave" @row-update="rowUpdate" :before-open="beforeOpen" :page.sync="page"
+ @sort-change="sortChange" @search-change="searchChange" @search-reset="searchReset"
+ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+ @refresh-change="refreshChange" @on-load="onLoad" :upload-before="uploadBefore" :defaults.sync="defaults"
+ :before-close="beforeClose">
<!-- @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 type="primary" size="small" plain icon="el-icon-s-check"
+ @click="handleBatchAudit">批量审批
</el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- v-if="permission.securityGuard_import"
- @click="handleImport2"
- >个人照片批量上传
+ <el-button type="success" size="small" plain icon="el-icon-upload2" v-if="permission.securityGuard_import"
+ @click="handleImport1">保安员批量导入
</el-button>
- <el-button
- type="primary"
- size="small"
- plain
- v-if="permission.securityGuard_security_apply"
- icon="el-icon-s-promotion"
- @click="handleSecurityApply"
- >上岗证制证申请
+ <el-button type="success" size="small" plain icon="el-icon-upload2" v-if="permission.securityGuard_import"
+ @click="handleImport2">个人照片批量上传
</el-button>
- <el-button
- type="primary"
- size="small"
- plain
- v-if="permission.securityGuard_security_paper_apply"
- icon="el-icon-collection-tag"
- @click="handleSecurityPaperApply"
- >证书制证申请
+ <el-button type="success" size="small" plain icon="el-icon-upload2" v-if="permission.securityGuard_import"
+ @click="handleImportHealth">健康状况图片(健康证)批量上传
</el-button>
- <el-button
- type="warning"
- size="small"
- plain
- icon="el-icon-download"
- v-if="permission.export_security_info"
- @click="handleExportSecurityInfo"
- >保安信息导出
+ <el-button type="success" size="small" plain icon="el-icon-upload2" v-if="permission.securityGuard_import"
+ @click="handleImportNoCriminal">无犯罪记录图片批量上传
+ </el-button>
+<!-- <el-button type="primary" size="small" plain-->
+<!-- v-if="permission.securityGuard_security_apply" icon="el-icon-s-promotion"-->
+<!-- @click="handleSecurityApply">上岗证制证申请-->
+<!-- </el-button>-->
+ <el-button type="primary" size="small" plain
+ v-if="permission.securityGuard_security_paper_apply" icon="el-icon-collection-tag"
+ @click="handleSecurityPaperApply">证书制证申请
+ </el-button>
+ <el-button type="warning" size="small" plain icon="el-icon-download" v-if="permission.export_security_info"
+ @click="handleExportSecurityInfo">保安信息导出
</el-button>
- <el-button
- type="danger"
- style="display: none"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >注 销
+
+ <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.securityGuard_delete"
+ @click="handleDelete">注 销
</el-button>
- <el-button
- type="info"
- style="display: none"
- size="small"
- plain
- v-if="permission.user_role"
- icon="el-icon-user"
- @click="handleGrant"
- >角色配置
+ <el-button type="info" style="display: none" size="small" plain v-if="permission.user_role"
+ icon="el-icon-user" @click="handleGrant">角色配置
</el-button>
- <el-button
- type="info"
- style="display: none"
- size="small"
- plain
- v-if="permission.user_reset"
- icon="el-icon-refresh"
- @click="handleReset"
- >密码重置
+ <el-button type="info" style="display: none" size="small" plain v-if="permission.user_reset"
+ icon="el-icon-refresh" @click="handleReset">密码重置
</el-button>
- <el-button
- type="info"
- style="display: none"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-setting"
- @click="handlePlatform"
- >平台配置
+ <el-button type="info" style="display: none" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-setting" @click="handlePlatform">平台配置
</el-button>
- <el-button
- type="success"
- style="display: none"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-upload2"
- @click="handleImport"
- >导入
+ <el-button type="success" style="display: none" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-upload2" @click="handleImport">导入
</el-button>
- <el-button
- type="warning"
- style="display: none"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-download"
- @click="handleExport"
- >导出
+ <el-button type="warning" style="display: none" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
<template slot-scope="{ type, size, row }" slot="menu">
- <el-button
+ <el-tooltip placement="bottom" effect="light" transition="el-collapse-transition"
+ popper-class="caozuolanpopper">
+ <div slot="content">
+ <el-button icon="el-icon-view" :size="size" :type="type" v-if="permission.securityGuard_view"
+ @click.stop="rowClick(row)">查看
+ </el-button>
+ <br v-if="permission.securityGuard_view" />
+
+ <el-button icon="el-icon-scissors" :size="size" :type="type"
+ v-if="permission.securityGuard_delete && row.status != 2" @click="$refs.crud.rowEdit(row, index)">编辑
+ </el-button>
+ <br v-if="permission.securityGuard_delete && row.status != 2" />
+
+ <el-button icon="el-icon-s-check" :size="size" :type="type"
+ v-if="permission.securityGuard_delete && row.status != 2" @click="handleAudit(row)">审批
+ </el-button>
+ <br v-if="permission.securityGuard_delete && row.status != 2" />
+
+ <el-button icon="el-icon-close" :size="size" :type="type"
+ v-if="permission.securityGuard_delete && row.status != 2" @click="$refs.crud.rowDel(row, index)">注销
+ </el-button>
+ <br v-if="permission.securityGuard_delete && row.status != 2" />
+
+ <el-button icon="el-icon-circle-close" :size="size" :type="type"
+ v-if="permission.securityGuard_delete && row.status != 2" @click.stop="rowStatus(row)">离职
+ </el-button>
+ <br v-if="permission.securityGuard_delete && row.status != 2" />
+
+ <el-button icon="el-icon-search" :size="size" :type="type" v-if="row.status == 2"
+ @click.stop="rowDellook(row)">离职查询
+ </el-button>
+ <br v-if="row.status == 2" />
+
+ <el-button icon="el-icon-user" :size="size" :type="type" v-if="permission.securityGuard_check"
+ @click.stop="rowCheck(row)">异常
+ </el-button>
+ <br v-if="permission.securityGuard_check" />
+
+ <el-button icon="el-icon-money" :size="size" :type="type" v-if="permission.securityGuard_check_apply"
+ @click.stop="rowCheckApply(row)">证件核实申请
+ </el-button>
+ <!-- <br />
+ <el-button
+ icon="el-icon-edit"
+ style="display: none"
+ :size="size"
+ :type="type"
+ v-if="permission.securityGuard_paper"
+ @click.stop="certificateClick(row)"
+ >纸质证书制作
+ </el-button> -->
+ </div>
+ <el-button icon="el-icon-s-operation" :size="size" :type="type">操作
+ </el-button>
+ </el-tooltip>
+
+ <!-- <el-button
icon="el-icon-s-custom"
:size="size"
:type="type"
@@ -196,7 +172,7 @@
v-if="permission.securityGuard_paper"
@click.stop="certificateClick(row)"
>纸质证书制作
- </el-button>
+ </el-button> -->
</template>
<template slot-scope="{ row }" slot="sex">
@@ -204,11 +180,11 @@
<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.deptName }}
+ <el-tag class="rowClickSelf" title="点击查看所属公司情况" @click="rowClickSelf(row.deptId)">{{ row.deptName }}
+ </el-tag>
+ </template>
+ <template slot-scope="{ row }" slot="unitName">
+ <el-tag>{{ row.unitName }}
</el-tag>
</template>
<template slot-scope="{ row }" slot="tenantName">
@@ -230,7 +206,7 @@
</template>
<!-- 自定义新增和编辑中的指纹信息 -->
- <!-- src="http://223.82.109.183:2081/zhba/upload/picture/85004574ae23472da37350b918960206.png" -->
+ <!-- src="http://61.131.136.25:2081/zhba/upload/picture/85004574ae23472da37350b918960206.png" -->
<template slot-scope="{ type, disabled }" slot="fingerprintForm">
<div class="zhiwenMain">
<!-- <img class="zhiwenImgs" :src="zhiwenImg" alt="" />
@@ -241,34 +217,14 @@
zhiwenTitle
}}</el-button>
<el-button type="primary" @click="openccc">openccc</el-button>-->
- <iframe
- id="zhiwen"
- ref="zhiwen"
- src="/zhiwenDemo/CID.html"
- frameborder="0"
- width="100%"
- height="100%"
- name="zhiwen"
- ></iframe>
+ <iframe id="zhiwen" ref="zhiwen" src="/zhiwenDemo/CID.html" frameborder="0" width="100%" height="100%"
+ name="zhiwen"></iframe>
</div>
</template>
</avue-crud>
- <el-dialog
- title="用户角色配置"
- append-to-body
- :visible.sync="roleBox"
- width="345px"
- >
- <el-tree
- :data="roleGrantList"
- show-checkbox
- check-strictly
- default-expand-all
- node-key="id"
- ref="treeRole"
- :default-checked-keys="roleTreeObj"
- :props="props"
- >
+ <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
+ <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
+ :default-checked-keys="roleTreeObj" :props="props">
</el-tree>
<span slot="footer" class="dialog-footer">
@@ -276,17 +232,8 @@
<el-button type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
- <el-dialog
- title="用户数据导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
+ <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
+ <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
<template slot="excelTemplate">
<el-button type="primary" @click="handleTemplate">
点击下载<i class="el-icon-download el-icon--right"></i>
@@ -294,29 +241,13 @@
</template>
</avue-form>
</el-dialog>
- <el-dialog
- title="用户平台配置"
- append-to-body
- :visible.sync="platformBox"
- >
- <avue-crud
- :option="platformOption"
- :table-loading="platformLoading"
- :data="platformData"
- ref="platformCrud"
- v-model="platformForm"
- :before-open="platformBeforeOpen"
- :page.sync="platformPage"
- :permission="platformPermissionList"
- @row-update="platformRowUpdate"
- @search-change="platformSearchChange"
- @search-reset="platformSearchReset"
- @selection-change="platformSelectionChange"
- @current-change="platformCurrentChange"
- @size-change="platformSizeChange"
- @refresh-change="platformRefreshChange"
- @on-load="platformOnLoad"
- >
+ <el-dialog title="用户平台配置" append-to-body :visible.sync="platformBox">
+ <avue-crud :option="platformOption" :table-loading="platformLoading" :data="platformData" ref="platformCrud"
+ v-model="platformForm" :before-open="platformBeforeOpen" :page.sync="platformPage"
+ :permission="platformPermissionList" @row-update="platformRowUpdate" @search-change="platformSearchChange"
+ @search-reset="platformSearchReset" @selection-change="platformSelectionChange"
+ @current-change="platformCurrentChange" @size-change="platformSizeChange"
+ @refresh-change="platformRefreshChange" @on-load="platformOnLoad">
<template slot-scope="{ row }" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
</template>
@@ -325,17 +256,8 @@
</template>
</avue-crud>
</el-dialog>
- <el-dialog
- title="保安员导入"
- append-to-body
- :visible.sync="excelBox1"
- width="555px"
- >
- <avue-form
- :option="excelOption1"
- v-model="excelForm1"
- :upload-after="uploadAfter1"
- >
+ <el-dialog title="保安员导入" append-to-body :visible.sync="excelBox1" width="555px">
+ <avue-form :option="excelOption1" v-model="excelForm1" :upload-after="uploadAfter1">
<template slot="excelTemplate">
<el-button type="primary" @click="handleTemplate1">
点击下载<i class="el-icon-download el-icon--right"></i>
@@ -343,18 +265,26 @@
</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"
- >
+ <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>
+ <el-dialog title="健康状况图片(健康证)批量上传" append-to-body :visible.sync="excelBoxHealth" width="555px">
+ <avue-form :option="excelOptionHealth" v-model="excelFormHealth" :upload-after="uploadAfterHealth">
+ </avue-form>
+ </el-dialog>
+ <el-dialog title="无犯罪记录图片批量上传" append-to-body :visible.sync="excelBoxNoCriminal" width="555px">
+ <avue-form :option="excelOptionNoCriminal" v-model="excelFormNoCriminal" :upload-after="uploadAfterNoCriminal">
+ </avue-form>
+ </el-dialog>
+ <el-dialog title="证件核实申请" :visible.sync="securityCheckApplyvisible" width="width" :modal="true"
+ :modal-append-to-body="true" :append-to-body="true" :close-on-click-modal="false" :close-on-press-escape="false"
+ :before-close="dialogBeforeClose">
+ <div>
+ <avue-form ref="formSecurityCheckApply" :option="optionSecurityCheckApply" v-model="formSecurityCheckApply"
+ @reset-change="emptytChange" @submit="submitSecurityCheckApply">
+ </avue-form>
+ </div>
</el-dialog>
<div style="position: fixed; top: 9999px; width: 100%; height: 100%">
<div class="certificate_box" id="certificateDom">
@@ -362,7 +292,7 @@
<div class="security_m_l_titleName widt">
{{ certificateObj.realName }}
</div>
- <div class="security_m_r_o_jg widt">南昌市公安局</div>
+ <div class="security_m_r_o_jg widt">晋城市公安局</div>
<div class="security_m_l_titlepaperTimenian widt">
{{ certificateYear }}
</div>
@@ -378,12 +308,12 @@
<div class="security_m_r_o_rightbirthday widt">
{{
certificateObj.cardid
- ? certificateObj.cardid.slice(6, 10) +
- "." +
- certificateObj.cardid.slice(10, 12) +
- "." +
- certificateObj.cardid.slice(12, 14)
- : ""
+ ? certificateObj.cardid.slice(6, 10) +
+ "." +
+ certificateObj.cardid.slice(10, 12) +
+ "." +
+ certificateObj.cardid.slice(12, 14)
+ : ""
}}
</div>
<div class="security_m_r_o_rightaddress security_m_r_o_l_r widt">
@@ -397,27 +327,18 @@
</div>
</basic-container>
</el-col>
- <div
- :class="[
- 'downSFZ',
- $store.state.control.windowWidth >= 1024
- ? 'downSFZqudong'
- : 'downSFZqudongS',
- ]"
- >
- <el-checkbox v-model="radio" :disabled="SFZloding"
- >使用身份证设备</el-checkbox
- >
- <el-button
- type="text"
- v-show="haveSEL == 'noDrive' || haveSEL == 'noEquipment'"
- @click="SFZopens"
- :loading="SFZloding"
- >{{ sfzButTitle }}</el-button
- >
+ <div :class="[
+ 'downSFZ',
+ $store.state.control.windowWidth >= 1024
+ ? 'downSFZqudong'
+ : 'downSFZqudongS'
+ ]">
+ <el-checkbox v-model="radio" :disabled="SFZloding">使用身份证设备</el-checkbox>
+ <el-button type="text" v-show="haveSEL == 'noDrive' || haveSEL == 'noEquipment'" @click="SFZopens"
+ :loading="SFZloding">{{ sfzButTitle }}</el-button>
<!-- <div style="font-size: 14px">连接身份证设备失败</div> -->
<!-- v-show="haveSEL == 'noDrive'" -->
- <!-- href="http://223.82.109.183:2081/zhba/upload/20211201/64d8b76f3aecae93e18d015bbca89aba.rar" -->
+ <!-- href="http://61.131.136.25:2081/zhba/upload/20211201/64d8b76f3aecae93e18d015bbca89aba.rar" -->
<!-- <a href="javascript;">未安装身份证驱动，点击下载</a> -->
</div>
</el-row>
@@ -438,9 +359,10 @@
getUserPractitionersInfo,
updatePaperTime,
getzhiwen, //指纹
- checkAccountByUser,
+ checkAccountByUser, batchAudit
} from "@/api/system/user";
import { securityApply } from "@/api/accreditationRecords/accreditationRecords";
+import { add } from "@/api/securityapplyRecord/securityapplyRecord";
import { getList } from "@/api/securityGuard/securityGuard";
import { getDeptLazyTree } from "@/api/system/dept";
import { getInformationDetails } from "@/api/securityUnit/securityUnit";
@@ -542,7 +464,7 @@
let useBack = "";
function checkAccount(idCard, callback) {
var data = {
- cardid: idCard,
+ cardid: idCard
};
if (window.deptIdss) {
data["deptId"] = window.deptIdss;
@@ -551,11 +473,11 @@
if (useBack != idCard) {
useBack = idCard;
checkAccountByUser(data)
- .then((res) => {
+ .then(res => {
useBack = "ok";
callback();
})
- .catch((error) => {
+ .catch(error => {
callback("当前身份证号码已录入!");
});
} else if (useBack == "ok") {
@@ -585,55 +507,16 @@
if (ok) {
// console.log(this.nowCell,123456);
- if(this.type==1 || this.nowCell==2){
+ if (this.type == 1 || this.nowCell == 2) {
//修改不校验身份证hao
callback();
- }else{
+ } else {
//调用接口进行账户重复校验
checkAccount(value, callback);
}
-
} else {
callback(new Error("身份证错误"));
}
- // console.log(oldy, oldm, oldd, year - oldy, mouth, day);
- // var test =
- // /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
- // if (!test.test(value)) {
- // callback(new Error("请输入正确身份证号码"));
- // } else {
- // // //加入校验18岁到60岁的
- // // oldy = +value.slice(6, 10);
- // // oldm = +value.slice(10, 12);
- // // oldd = +value.slice(12, 14);
- // // ok =
- // // year - oldy < 18 || year - oldy > 60
- // // ? false
- // // : year - oldy == 18
- // // ? mouth < oldm
- // // ? false
- // // : mouth > oldm
- // // ? true
- // // : day < oldd
- // // ? false
- // // : true
- // // : year - oldy == 60
- // // ? mouth < oldm
- // // ? true
- // // : mouth > oldm
- // // ? false
- // // : day <= oldd
- // // ? false
- // // : true
- // // : true;
- // // if (ok) {
- // callback();
- // // } else {
- // // // callback(new Error("根据国家要求，需在18岁至60岁"));
- // // callback(new Error("年龄不符"));
- // }
-
- // }
};
const validatePassPhone = (rule, value, callback) => {
var test = /^(13[0-9]|14[0-9]|15[0-9]|17[0-9]|18[0-9]|19[0-9])\d{8}$/g;
@@ -643,15 +526,12 @@
callback();
}
};
- // let table = document.getElementsByClassName("tablesss");
- // let heard = table[0].getElementsByClassName("avue-crud__search");
- // let usNum =
- // this.windowWidth <= 1376 && this.windowHeight <= 778 ? 170 : 332;
- // // that.option.height = +h - (+heard[0].clientHeight + 332);
- // let optionHeight = +this.windowHeight - (+heard[0].clientHeight + +usNum);
return {
+ excelBoxHealth: false,
+ excelBoxNoCriminal: false,
+ startTimecc: null,
sort: "",
- type:2,
+ type: 2,
sortName: "",
nowCell: "", //空为手动，2为身份证设备读取
// 表格数据
@@ -682,12 +562,13 @@
realName: "",
securitynumber: "",
cardid: "",
- registered: "",
+ registered: ""
},
securityid: "",
excelBox1: false,
excelBox2: false,
isSecurity: true,
+ securityCheckApplyvisible: false,
excelForm1: {},
excelOption1: {
submitBtn: false,
@@ -701,18 +582,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-security?deptId=" + this.deptIds,
+ action: "/api/blade-user/import-security?deptId=" + this.deptIds
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
excelForm2: {},
excelOption2: {
@@ -727,12 +608,64 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
+ },
+ data: {
+ type: 1
},
tip: "请上传 zip 压缩文件,照片文件名以身份证号码命名",
- action: "/api/blade-resource/oss/endpoint/put-file-zip",
- },
- ],
+ action: "/api/blade-resource/oss/endpoint/put-file-zip"
+ }
+ ]
+ },
+ // 健康状态凭证上传
+ excelFormHHealth: {},
+ excelOptionHealth: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "文件上传",
+ prop: "file",
+ type: "upload",
+ drag: true,
+ loadText: "文件上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data"
+ },
+ data: {
+ type: 2
+ },
+ tip: "请上传 zip 压缩文件,照片文件名以身份证号码命名",
+ action: "/api/blade-resource/oss/endpoint/put-file-zip"
+ }
+ ]
+ },
+ // 无犯罪记录图片
+ excelFormNoCriminal: {},
+ excelOptionNoCriminal: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "文件上传",
+ prop: "file",
+ type: "upload",
+ drag: true,
+ loadText: "文件上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data"
+ },
+ //额外的参数
+ data: {
+ type: 3
+ },
+ tip: "请上传 zip 压缩文件,照片文件名以身份证号码命名",
+ action: "/api/blade-resource/oss/endpoint/put-file-zip"
+ }
+ ]
},
form: {},
search: {},
@@ -748,7 +681,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
roleId: "1412226235153731586",
deptId: "1413470343230877697",
@@ -757,15 +690,15 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
init: {
roleTree: [],
- deptTree: [],
+ deptTree: []
},
props: {
label: "title",
- value: "key",
+ value: "key"
},
roleGrantList: [],
roleTreeObj: [],
@@ -776,12 +709,12 @@
lazy: true,
treeLoad: function (node, resolve) {
const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree(parentId).then((res) => {
+ getDeptLazyTree(parentId).then(res => {
resolve(
- res.data.data.map((item) => {
+ res.data.data.map(item => {
return {
...item,
- leaf: !item.hasChildren,
+ leaf: !item.hasChildren
};
})
);
@@ -794,40 +727,118 @@
labelText: "标题",
label: "title",
value: "value",
- children: "children",
- },
+ children: "children"
+ }
},
choiceList: [],
deptIdss: "",
+ optionSecurityCheckApply: {
+ height: "auto",
+ calcHeight: 30,
+ dialogWidth: 1000,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ stripe: true,
+ viewBtn: false,
+ addBtn: false,
+ editBtn: false,
+ selection: true,
+ excelBtn: false,
+ menuWidth: 230,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "姓名",
+ prop: "realName",
+ labelWidth: 110,
+ disabled: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入姓名",
+ trigger: "blur"
+ }
+ ]
+ },
+ {
+ label: "保安证编号",
+ prop: "number",
+ labelWidth: 110,
+ disabled: false,
+ rules: [
+ {
+ required: true,
+ message: "请输入保安证编号",
+ trigger: "blur"
+ }
+ ]
+ },
+ {
+ label: "保安员证图片",
+ prop: "url",
+ labelWidth: 110,
+ type: "upload",
+ span: 24,
+ listType: "picture-img",
+ tip: "上传jpg/png文件,图片不超过1M",
+ propsHttp: {
+ res: "data",
+ url: "url"
+ },
+ canvasOption: {
+ text: " ",
+ ratio: 1.0
+ },
+ action: "/api/blade-resource/oss/endpoint/put-files",
+ rules: [
+ {
+ required: true,
+ message: "请上传保安员证图片",
+ trigger: "blur"
+ }
+ ]
+ },
+ {
+ label: "申请理由",
+ labelWidth: 110,
+ span: 24,
+ type: "textarea",
+ prop: "applyReason"
+ }
+ ]
+ },
+ formSecurityCheckApply: {},
option: {
- searchIndex: 5, //收缩展示数量
+ searchIndex: 6, //收缩展示数量
searchIcon: true, //搜索是否收缩
height: "auto",
calcHeight: 80,
tip: true,
searchShow: true,
reserveSelection: true,
- selectable: (row) => {
- if (
- row.hold !== "1" ||
- row.securitynumber == null ||
- row.securitynumber == ""
- ) {
- return false;
- } else {
- return true;
- }
- },
+ // selectable: row => {
+ // if (
+ // row.hold !== "1" ||
+ // row.securitynumber == null ||
+ // row.securitynumber == ""
+ // ) {
+ // return false;
+ // } else {
+ // return true;
+ // }
+ // },
indexWidth: 55,
searchMenuSpan: 6,
-
stripe: true,
border: true,
- delBtn: true,
+ // delBtn: true,
align: "center",
index: true,
- delBtnText: "注销",
- menuWidth: 280,
+ // delBtnText: "注销",
+ menuWidth: 90,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -835,6 +846,8 @@
dialogClickModal: false,
column: securityFormPageColumn,
...this.$store.state.control.clearOtherBut,
+ // addBtn: false,
+ editBtn: false,
group: [
{
label: "基础信息",
@@ -846,75 +859,38 @@
label: "企业名称",
prop: "deptId",
type: "tree",
- // dicUrl:
- // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
props: {
label: "title",
- value: "id",
+ value: "id"
},
- // disabled: true,
+ labelWidth: 120,
rules: [
{
required: true,
message: "请选择保安公司",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "姓名",
prop: "realName",
disabled: false,
+ labelWidth: 120,
rules: [
{
required: true,
message: "请输入姓名",
- trigger: "blur",
+ trigger: "blur"
},
{
min: 2,
max: 5,
- message: "姓名长度在2到5个字符",
- },
- ],
- },
- // {
- // label: "登录账号",
- // prop: "account",
- // editDisabled: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入登录账号",
- // trigger: "blur",
- // },
- // ],
- // // disabled: true,
- // },
- // {
- // label: "密码",
- // prop: "password",
- // type: "password",
- // hide: true,
- // editDisplay: false,
- // viewDisplay: false,
- // rules: [
- // { required: true, validator: validatePass, trigger: "blur" },
- // ],
- // },
- // {
- // label: "确认密码",
- // prop: "password2",
- // type: "password",
- // hide: true,
- // editDisplay: false,
- // viewDisplay: false,
- // rules: [
- // { required: true, validator: validatePass2, trigger: "blur" },
- // ],
- // },
- ],
+ message: "姓名长度在2到5个字符"
+ }
+ ]
+ }
+ ]
},
{
label: "详细信息",
@@ -927,57 +903,57 @@
prop: "cardid",
hide: true,
overHidden: true,
+ labelWidth: 120,
rules: [
{
required: true,
message: "请输入身份证号",
- trigger: "blur",
+ trigger: "blur"
},
{
required: true,
validator: validatePassCardid,
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "手机号码",
prop: "phone",
overHidden: true,
+ labelWidth: 120,
rules: [
{
required: true,
message: "请输入手机号",
- trigger: "blur",
+ trigger: "blur"
},
{
required: true,
validator: validatePassPhone,
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
- // {
- // label: "昵称",
- // prop: "name",
- // },
{
label: "个人照片",
type: "upload",
listType: "picture-img",
+ labelWidth: 120,
propsHttp: {
res: "data",
- url: "url",
+ url: "url"
},
canvasOption: {
text: " ",
- ratio: 1.0,
+ ratio: 1.0
},
action: "/api/blade-resource/oss/endpoint/put-files",
- tip: "上传近期一寸彩色正面免冠图象， (358像素(宽) × 441像素(高)、分辨率350dpi)且不小于30kb,不超过500kb",
+ tip:
+ "上传近期一寸彩色正面免冠图象， (358像素(宽) × 441像素(高)、分辨率350dpi)且不小于30kb,不超过500kb",
span: 12,
// row: true,
- prop: "avatar",
+ prop: "avatar"
},
{
label: "指纹信息",
@@ -995,56 +971,33 @@
// tip: "只能上传jpg/png指纹信息，且不超过500kb",
span: 12,
// row: true,
- prop: "fingerprint",
+ prop: "fingerprint"
},
- // {
- // 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: 12,
- // // row: true,
- // prop: "fingerprint",
- // },
{
label: "是否持证",
prop: "hold",
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- // props: {
- // label: "dictValue",
- // value: "dictKey",
- // },
type: "select",
dicData: [
{
label: "是",
- value: "1",
+ value: "1"
},
{
label: "否",
- value: "2",
+ value: "2"
},
{
label: "已吊销",
- value: "3",
- },
+ value: "3"
+ }
],
rules: [
{
required: true,
message: "请选择是否有持证",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员证编号",
@@ -1055,31 +1008,13 @@
{
required: false,
message: "请输入保安员证编号",
- trigger: "blur",
- },
- ],
- },
- {
- label: "保安证书照片",
- prop: "email",
- type: "upload",
- listType: "picture-img",
- display: true,
- propsHttp: {
- res: "data",
- url: "url",
- },
- canvasOption: {
- text: " ",
- ratio: 1.0,
- },
- action: "/api/blade-resource/oss/endpoint/put-files",
- tip: "上传jpg,png格式图片，大小不超过2M",
- span: 12,
+ trigger: "blur"
+ }
+ ]
},
{
label: "民族",
- prop: "nation",
+ prop: "nation"
},
{
label: "最高学历",
@@ -1089,38 +1024,30 @@
"/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
- slot: true,
+ slot: true
},
{
label: "政治面貌",
- prop: "politicaloutlook",
+ prop: "politicaloutlook"
},
- {
- label: "健康状态",
- prop: "healstats",
- },
- {
- label: "身高",
- prop: "height",
- },
- {
- label: "联系地址",
- prop: "address",
- },
- {
- label: "身份证住址",
- prop: "registered",
- rules: [
- {
- required: true,
- message: "请输入身份证住址",
- trigger: "click",
- },
- ],
- },
+ // {
+ // label: "联系地址",
+ // prop: "address"
+ // },
+ // {
+ // label: "身份证住址",
+ // prop: "registered",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入身份证住址",
+ // trigger: "click"
+ // }
+ // ]
+ // },
{
label: "所属辖区",
prop: "jurisdiction",
@@ -1129,7 +1056,7 @@
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
checkStrictly: true,
slot: true,
@@ -1137,23 +1064,20 @@
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
- label: "入职时间",
- prop: "rtime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
+ label: "从业单位",
+ prop: "unitName",
rules: [
{
required: true,
- message: "请输入入职时间",
- trigger: "click",
- },
- ],
+ message: "请输入从业单位",
+ trigger: "click"
+ }
+ ]
},
{
label: "性别",
@@ -1163,35 +1087,151 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
- },
- // {
- // label: "未知",
- // value: 3,
- // },
+ value: 2
+ }
],
rules: [
{
required: true,
message: "请选择性别",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
- // {
- // label: "生日",
- // type: "date",
- // prop: "birthday",
- // format: "yyyy-MM-dd",
- // valueFormat: "yyyy-MM-dd",
- // },
- ],
- },
- ],
+ {
+ label: "婚姻状态",
+ prop: "marriageStatus",
+ type: "select",
+ dicUrl:
+ "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ hide: true,
+ },
+ {
+ label: "居住地址",
+ prop: "dwellAddress",
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入居住地址",
+ trigger: "blur"
+ }
+ ]
+ },
+ {
+ label: "户籍地址",
+ prop: "permanentResidenceAddress",
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入户籍地址",
+ trigger: "blur"
+ }
+ ]
+ },
+ {
+ label: "报考等级",
+ prop: "signLevel",
+ type: "select",
+ dicUrl:
+ "/api/blade-system/dict-biz/dictionary?code=signLevelType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ hide: true,
+ },
+ {
+ label: "家庭主要成员及联系方式",
+ prop: "memberOfFamily",
+ type: "textarea",
+ span: 24,
+ hide: true,
+ },
+ {
+ label: "教育经历",
+ prop: "educationExperience",
+ type: "textarea",
+ span: 24,
+ hide: true,
+ },
+ {
+ label: "工作经历",
+ prop: "workExperience",
+ type: "textarea",
+ span: 24,
+ hide: true,
+ },
+ {
+ label: "受理公安机关",
+ prop: "acceptancePoliceUnit",
+ hide: true,
+ },
+ {
+ label: "受理人",
+ prop: "acceptancePerson",
+ hide: true,
+ },
+ {
+ label: "受理时间",
+ prop: "acceptanceTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ span: 12,
+ row: true,
+ hide: true,
+ },
+ {
+ label: "健康状况图片(健康证)",
+ prop: "healthCertificateUrl",
+ type: "upload",
+ listType: "picture-img",
+ propsHttp: {
+ res: "data",
+ url: "url"
+ },
+ canvasOption: {
+ text: " ",
+ ratio: 1.0
+ },
+ action: "/api/blade-resource/oss/endpoint/put-files",
+ span: 12,
+ hide: true,
+ labelWidth: 120,
+ },
+ {
+ label: "无犯罪记录图片",
+ prop: "noCriminalRecordProveUrl",
+ type: "upload",
+ listType: "picture-img",
+ propsHttp: {
+ res: "data",
+ url: "url"
+ },
+ canvasOption: {
+ text: " ",
+ ratio: 1.0
+ },
+ action: "/api/blade-resource/oss/endpoint/put-files",
+ span: 12,
+ hide: true,
+ labelWidth: 120,
+ },
+ ]
+ }
+ ]
},
data: [],
platformQuery: {},
@@ -1214,25 +1254,25 @@
label: "登录账号",
prop: "account",
search: true,
- display: false,
+ display: false
},
{
label: "所属保安单位",
prop: "tenantName",
slot: true,
- display: false,
+ display: false
},
{
label: "姓名",
prop: "realName",
search: true,
- display: false,
+ display: false
},
{
label: "平台",
prop: "userTypeName",
slot: true,
- display: false,
+ display: false
},
{
label: "平台",
@@ -1240,7 +1280,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
search: true,
@@ -1251,9 +1291,9 @@
{
required: true,
message: "请选择平台",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "拓展",
@@ -1263,9 +1303,9 @@
span: 24,
overHidden: true,
row: true,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
excelForm: {},
excelOption: {
@@ -1280,10 +1320,10 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-security",
+ action: "/api/blade-user/import-security"
},
// {
// label: "数据覆盖",
@@ -1315,63 +1355,15 @@
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
tablevisible: true,
- isNotChangeSize: true, //取消表格loging
+ onceTableChange: 1
};
},
watch: {
- windowHeight() {
- let that = this;
- that.isNotChangeSize = false; //取消表格loging
- let d = {
- fn: function (h) {
- let table = document.getElementsByClassName("tablesss");
- let heard = table[0].getElementsByClassName("avue-crud__search");
- let usNum =
- that.windowWidth <= 1376 || that.windowHeight <= 778 ? 170 : 302;
- // // that.option.height = +h - (+heard[0].clientHeight + 332);
- // alert(h);
- let doit = (height) => {
- let hs = height || h;
- // alert(hs);
- // alert(heard[0].clientHeight);
- // alert(usNum);
- that.option.height = +hs - (+heard[0].clientHeight + +usNum);
- that.$nextTick(() => {
- that.refreshChange();
- setTimeout(() => {
- let d = {
- that: this,
- otherclass: ["downSFZ"],
- haveOpen: true,
- };
- //刷新表格后再次调整按钮
- that.$store.dispatch("TABLE_CHANGEBUTPOSITION", d);
- that.isNotChangeSize = true; //恢复表格loging
- }, 10);
- });
- };
- if (that.option.height == "auto") {
- //解决第一次未渲染成功会报错的问题
- setTimeout(() => {
- // console.log(
- // document
- // .getElementsByClassName("tablesss")[0]
- // .getElementsByClassName("avue-crud__search")
- // );
- doit(window.innerHeight);
- }, 150);
- } else {
- doit();
- }
- },
- };
- this.$store.dispatch("WHchangeHight", d);
- },
radio() {
if (this.radio) {
this.SFZloding = true;
@@ -1380,7 +1372,7 @@
if (this.haveSEL != "noDrive" && this.haveSEL != "noEquipment") {
this.$message({
type: "warning",
- message: "关闭身份证设备识别!",
+ message: "关闭身份证设备识别!"
});
}
}
@@ -1396,7 +1388,7 @@
window.deptIdss = val;
}
},
- immediate: true,
+ immediate: true
},
"form.hold": {
handler(val) {
@@ -1404,31 +1396,30 @@
this.option.group,
"securitynumber"
);
- var emailcolumn = this.findObject(this.option.group, "email");
- // console.log(val,1234);
+ // var emailcolumn = this.findObject(this.option.group, "email");
if (val == 1) {
securitynumbercolumn.display = true;
securitynumbercolumn.rules = [
{
required: true,
message: "请输入保安员证编号",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
];
- emailcolumn.display = true;
+ // emailcolumn.display = true;
} else {
securitynumbercolumn.display = false;
securitynumbercolumn.rules = [
{
required: false,
message: "请输入保安员证编号",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
];
- emailcolumn.display = false;
+ // emailcolumn.display = false;
}
},
- immediate: true,
+ immediate: true
},
"form.fingerprint"() {
let that = this;
@@ -1436,24 +1427,27 @@
that.isopen = true;
let isoks = false;
- function sets(state, fingerprint, myPicture) {
+ function sets(state, dom, fingerprint, myPicture) {
isoks = state;
- var winzhiwen = document.getElementById("zhiwen").contentWindow;
- winzhiwen.setZhiwenData({
- imgBMP: fingerprint,
- // imgBMP: imgBMP,
- // CID_img_raw: CID_img_raw,
- featuredatas: myPicture,
- isoks: isoks,
- });
+ dom.onload = function () {
+ // var winzhiwen = document.getElementById("zhiwen").contentWindow;
+ var winzhiwen = dom.contentWindow;
+ winzhiwen.setZhiwenData({
+ imgBMP: fingerprint,
+ // imgBMP: imgBMP,
+ // CID_img_raw: CID_img_raw,
+ featuredatas: myPicture,
+ isoks: isoks
+ });
+ };
}
- var doZhiwen = () => {
+ var doZhiwen = dom => {
if (!this.form.id) {
- sets(false);
+ sets(false, dom);
return;
}
// return;
- getzhiwen(this.form.id).then((res) => {
+ getzhiwen(this.form.id).then(res => {
const data = res.data.data;
if (that.isopen) {
if (
@@ -1462,22 +1456,27 @@
data.myPicture != "" &&
data.myPicture != undefined
) {
- sets(true, data.fingerprint, data.myPicture);
+ sets(true, dom, data.fingerprint, data.myPicture);
} else {
- sets(false);
+ sets(false, dom);
}
}
});
};
- setTimeout(() => {
- // var iframeDom = document.getElementById("zhiwen");
- // console.log(iframeDom,111111);
- // iframeDom.onload = function () {
- // doZhiwen();
- // };
- doZhiwen();
- }, 2800);
+ // setTimeout(() => {
+ // var iframeDom = document.getElementById("zhiwen");
+ // console.log(iframeDom,111111);
+ // iframeDom.onload = function () {
+ // doZhiwen();
+ // };
+ // doZhiwen();
+ // }, 2800);
+ //判断是否加载完成指纹dom
+ that.checkDom("", dom => {
+ // console.log(dom);
+ doZhiwen(dom);
+ });
} else {
that.isopen = false;
}
@@ -1490,16 +1489,26 @@
const column = this.findObject(this.excelOption.column, "excelFile");
column.action = `/api/blade-user/import-security?isCovered=${this.excelForm.isCovered}`;
}
- },
+ }
},
computed: {
- ...mapGetters(["userInfo", "permission", "windowHeight", "windowWidth"]),
+ ...mapGetters([
+ "userInfo",
+ "permission",
+ "windowHeight",
+ "windowWidth",
+ "screenSize",
+ "screenHeight"
+ ]),
permissionList() {
+ console.log(this.permission, 789787);
return {
addBtn: this.vaildData(this.permission.securityGuard_add, false),
viewBtn: this.vaildData(null, false),
- delBtn: this.vaildData(this.permission.securityGuard_delete, false),
+ delBtn: this.vaildData(null, false),
editBtn: this.vaildData(this.permission.securityGuard_edit, false),
+ securityGuard_security_apply:this.vaildData(this.permission.securityGuard_security_apply,true),
+ securityGuard_security_paper_apply:this.vaildData(this.permission.securityGuard_security_paper_apply,true)
};
},
platformPermissionList() {
@@ -1507,24 +1516,23 @@
addBtn: false,
viewBtn: false,
delBtn: false,
- editBtn: this.vaildData(this.permission.user_edit, false),
+ editBtn: this.vaildData(this.permission.user_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
- beforeCreate() {},
+ beforeCreate() { },
created() {
var that = this;
- // console.log(this.userInfo, 9999);
if (this.userInfo.role_name == "办证管理员") {
this.search["userType"] = 7;
this.search["hold"] = "1";
@@ -1545,7 +1553,11 @@
column.dicUrl =
"/api/blade-system/dept/security_lazy-tree?deptId=" +
this.userInfo.dept_id;
- } else if (roleName == "公安管理员" || roleName == "administrator") {
+ } else if (
+ roleName == "公安管理员" ||
+ roleName == "administrator" ||
+ this.userInfo.role_name == "民警"
+ ) {
var columnDept = that.findObject(that.option.column, "deptId");
columnDept.dicUrl =
"/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
@@ -1560,7 +1572,7 @@
// });
if (
- this.userInfo.account == "南昌市保安服务总公司" ||
+ this.userInfo.account == "晋城市保安服务总公司" ||
this.userInfo.account == "押运分公司"
) {
this.option.column.push({
@@ -1568,12 +1580,12 @@
prop: "guncode",
width: 90,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
});
this.option.group[1].column.push({
label: "持枪证编号",
- prop: "guncode",
+ prop: "guncode"
});
this.excelOption1.column[0].action =
@@ -1581,15 +1593,11 @@
}
},
mounted() {
- // let d = {
- // that: this,
- // otherclass: ["downSFZ"],
- // haveOpen: true,
- // flowHeight: 332,
- // };
- // this.$store.dispatch("TABLE_CHANGEBUTPOSITION", d);
- // console.log((this.$refs.crud._props.option.height = 200));
- this.changeButsPosition("TABLE_CHANGEBUTPOSITION");
+ // console.log(this.screenSize, "screenSize");
+ this.option.height = this.screenHeight;
+ this.$store.commit("setWindowSizeHeightAdd");
+ // this.$store.dispatch("MOUNTED_TABLE_SIZE");
+
// this.option.column[0].hide = true
// 非保安单位模式默认加载管理组数据
if (!website.tenantMode) {
@@ -1600,21 +1608,37 @@
this.search["userType"] = 7;
}
this.deptIds = this.userInfo.dept_id;
-
// this.beginzhiwen();
// this.olondSFZ(); //检查身份证设备是否存在
},
methods: {
- changeButsPosition(val) {
- let d = {
- that: this,
- otherclass: ["downSFZ"],
- haveOpen: true,
- from: "mounted",
- };
- // 开始就适应高度
- this.$store.commit("setWindowSizeHeightAdd");
- this.$store.dispatch("TABLE_CHANGEBUTPOSITION", d);
+ checkDom(name, fn) {
+ // 声明定时器
+ let that = this;
+ var timer = null;
+ // 检查dom是否执行完成
+ function checkDom() {
+ let dom = document.getElementById("zhiwen");
+ if (dom) {
+ // 执行dom加载完成后的操作
+ // 清除定时器
+ if (!timer) {
+ clearTimeout(timer);
+ }
+ if (fn) {
+ //回调函数
+ fn(dom);
+ return;
+ } else {
+ return dom;
+ }
+ } else {
+ // 自我调用
+ timer = setTimeout(checkDom, 100);
+ }
+ }
+ // 首次执行
+ checkDom();
},
openccc() {
console.log(this.zhiwenImg);
@@ -1635,7 +1659,7 @@
//初始化设备
this.Client.beginFn = {
fn: this.Client.CID_Init,
- CID5000: this.Client.CIDDeviceType.CID5000,
+ CID5000: this.Client.CIDDeviceType.CID5000
};
this.Client.OnCID_Alg_Begin = function (code, msg) {
//初始化机器返数据
@@ -1801,15 +1825,22 @@
done();
},
handleTemplate1() {
- if (
- this.userInfo.account == "南昌市保安服务总公司" ||
- this.userInfo.account == "押运分公司"
- ) {
- window.open(`/api/blade-user/export-template-securityYy`);
- return;
- }
- window.open(`/api/blade-user/export-template-security`);
+ // if (
+ // this.userInfo.account == "晋城市保安服务总公司" ||
+ // this.userInfo.account == "押运分公司"
+ // ) {
+ // window.open(
+ // `/api/blade-user/export-template-securityYy?${this.website.tokenHeader
+ // }=${getToken()}`
+ // );
+ // return;
+ // }
+ window.open(
+ `/api/blade-user/export-template-security?${this.website.tokenHeader
+ }=${getToken()}`
+ );
},
+ // 头像批量上传
handleImport2() {
this.excelBox2 = true;
},
@@ -1819,12 +1850,31 @@
this.refreshChange();
done();
},
-
+ // 健康状况图片(健康证)
+ handleImportHealth() {
+ this.excelBoxHealth = true;
+ },
+ uploadAfterHealth(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBoxHealth = false;
+ this.refreshChange();
+ done();
+ },
+ // 无犯罪记录图片
+ handleImportNoCriminal() {
+ this.excelBoxNoCriminal = true;
+ },
+ uploadAfterNoCriminal(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBoxNoCriminal = false;
+ this.refreshChange();
+ done();
+ },
//行点击事件
rowClick(row) {
this.$router.push({
path: "/securityGuardDetail",
- query: { row: JSON.stringify(row) },
+ query: { row: JSON.stringify(row) }
});
},
//行点击事件
@@ -1864,7 +1914,7 @@
onEnd: () => {
this.updateUserInfo();
// console.log('打印完成', Date.parse(new Date()));
- },
+ }
});
},
getNewTime() {
@@ -1900,22 +1950,22 @@
const data = {
id: this.certificateObj.id,
userType: 6,
- paperTime: date,
+ paperTime: date
};
updatePaperTime(data);
},
rowClickSelf(deptId) {
var data = {
- departmentid:deptId
- }
- getInformationDetails(data).then((res) => {
+ departmentid: deptId
+ };
+ getInformationDetails(data).then(res => {
var obj = res.data.data;
var data = JSON.stringify(obj);
this.$router.push({
path: "/securityUnitChild",
- query: { data: data },
+ query: { data: data }
});
- })
+ });
},
nodeClick(data) {
this.treeDeptId = data.id;
@@ -1942,7 +1992,7 @@
this.roleBox = false;
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onLoad(this.page);
});
@@ -1958,7 +2008,7 @@
{
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}
)
.then(() => {
@@ -1973,7 +2023,7 @@
const data = {
ids: str,
createUser: this.userInfo.user_id,
- type: 1,
+ type: 1
};
return securityApply(data);
})
@@ -1981,7 +2031,7 @@
this.$refs.crud.toggleSelection();
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -1996,7 +2046,7 @@
{
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}
)
.then(() => {
@@ -2011,7 +2061,7 @@
const data = {
ids: str,
createUser: this.userInfo.user_id,
- type: 2,
+ type: 2
};
return securityApply(data);
})
@@ -2019,23 +2069,44 @@
this.$refs.crud.toggleSelection();
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
+ },
+ // 证件核实申请
+ rowCheckApply(row) {
+ this.formSecurityCheckApply = {
+ id: null,
+ realName: row.realName,
+ userId: row.id
+ };
+ this.securityCheckApplyvisible = true;
+ },
+ //证件核实申请提交
+ submitSecurityCheckApply(row, done, loading) {
+ var that = this;
+ row["createUser"] = this.userInfo.Id;
+ add(row).then(() => {
+ that.$refs.formSecurityCheckApply.resetFields();
+ this.$message({
+ type: "success",
+ message: `操作成功`
+ });
+ this.securityCheckApplyvisible = false;
+ this.onLoad(this.page);
+ done();
+ });
+ error => {
+ window.console.log(error);
+ };
},
//保安员信息导出
handleExportSecurityInfo() {
this.$confirm("是否导出保安员信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
- //获取查询条件
- // const { releaseTimeRange } = this.search;
- // if (releaseTimeRange) {
- // this.search["startTime"] = releaseTimeRange[0];
- // this.search["endTime"] = releaseTimeRange[1];
- // }
var data = {
cardid: this.search.cardid,
deptId: this.search.deptId,
@@ -2048,7 +2119,7 @@
examinationType: this.search.examinationType,
dispatch: this.search.dispatch,
isFingerprint: this.search.isFingerprint,
- isAvatar: this.search.isAvatar,
+ isAvatar: this.search.isAvatar
};
// console.log(data,123456);
//导出
@@ -2064,30 +2135,24 @@
//如果是培训公司管理员
data["trainingUnitId"] = this.userInfo.Id;
}
- if (this.userInfo.role_name == "公安管理员") {
+ if (
+ this.userInfo.role_name == "公安管理员" ||
+ this.userInfo.role_name == "民警"
+ ) {
//如果是公安管理员
data["jurisdiction"] = this.userInfo.jurisdiction;
}
//序列号url形式，用&拼接
data = Qs.stringify(data);
window.open(
- `/api/blade-user/export-security-info?${
- this.website.tokenHeader
+ `/api/blade-user/export-security-info?${this.website.tokenHeader
}=${getToken()}&` + data
);
});
},
rowSave(row, done, loading) {
- // var dom = document.getElementById("zhiwenOur");
- // window.frames["iframe的name值"].document.getElementById("iframe中控件的ID").click();
var winzhiwen = document.getElementById("zhiwen").contentWindow;
let zhiwen = winzhiwen.outZhiwenData();
- // console.log(zhiwen);
- // for (let k in zhiwen) {
- // console.log(k);
- // console.log(zhiwen[k]);
- // }
- // return;
if (row.deptId) {
row.deptId = row.deptId;
}
@@ -2109,7 +2174,6 @@
avatar: row.avatar,
// fingerprint: row.fingerprint,
healstats: row.healstats,
- address: row.address,
birthday: row.birthday,
cardid: row.cardid,
deptId: row.deptId,
@@ -2127,30 +2191,64 @@
phone: row.phone,
politicaloutlook: row.politicaloutlook,
realName: row.realName,
- registered: row.registered,
- rtime: row.rtime,
securitynumber: row.securitynumber,
sex: row.sex,
guncode: row.guncode,
},
+ userDetail: {
+ marriageStatus: row.marriageStatus,
+ signLevel: row.signLevel,
+ permanentResidenceAddress: row.permanentResidenceAddress,
+ dwellAddress: row.dwellAddress,
+ memberOfFamily: row.memberOfFamily,
+ educationExperience: row.educationExperience,
+ workExperience: row.workExperience,
+ healthCertificateUrl: row.healthCertificateUrl,
+ noCriminalRecordProveUrl: row.noCriminalRecordProveUrl,
+ acceptancePoliceUnit: row.acceptancePoliceUnit,
+ acceptancePerson: row.acceptancePerson,
+ acceptanceTime: row.acceptanceTime,
+ unitName: row.unitName,
+ }
};
securitySave(userMap).then(
- () => {
+ res => {
+ // console.log(res.data,111111111111111111);
this.initFlag = false;
- this.$alert("账号为身份证号码，密码为身份证后六位", "温馨提示", {
- confirmButtonText: "确定",
- callback: (action) => {
- this.$message({
- type: "success",
- message: `操作成功`,
- });
- this.onLoad(this.page);
- done();
- },
- });
+ if (res.data.code == 200) {
+ this.$alert("账号为身份证号码，密码为身份证后六位", "温馨提示", {
+ confirmButtonText: "确定",
+ callback: action => {
+ this.$message({
+ type: "success",
+ message: `操作成功`
+ });
+ this.onLoad(this.page);
+ done();
+ }
+ });
+ }
+ //保安员证编号不匹配的情况
+ if (res.data.code == 201) {
+ this.$alert(
+ "用户新增成功!账号为身份证号码，密码为身份证后六位!注：当前保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!",
+ "温馨提示",
+ {
+ confirmButtonText: "确定",
+ callback: action => {
+ this.$message({
+ type: "success",
+ message: `操作成功`
+ });
+ this.onLoad(this.page);
+ done();
+ }
+ }
+ );
+ }
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -2159,10 +2257,8 @@
rowUpdate(row, index, done, loading) {
row.deptId = row.deptId;
row.roleId = row.roleId.join(",");
- row.postId = row.postId.join(",");
+ // row.postId = row.postId.join(",");
//值替换，education 放在页面会卡死
- row.education = row.education1;
-
var winzhiwen = document.getElementById("zhiwen").contentWindow;
let zhiwen = winzhiwen.outZhiwenData();
// console.log(zhiwen);
@@ -2175,17 +2271,84 @@
if (row.cell != "2") {
row["cell"] = this.nowCell;
}
- update(row).then(
- () => {
+ const userMap = {
+ user: {
+ id: row.id,
+ //是否是身份证自动识别进入
+ cell: row.cell,
+ //指纹↓
+ fingerprint: row.fingerprint, //图
+ myPicture: row.myPicture, //特征
+ //指纹↑
+ account: row.account,
+ avatar: row.avatar,
+ healstats: row.healstats,
+ birthday: row.birthday,
+ cardid: row.cardid,
+ deptId: row.deptId,
+ education: row.education1,
+ email: row.email,
+ height: row.height,
+ hold: row.hold,
+ jurisdiction: row.jurisdiction,
+ name: row.name,
+ nation: row.nation,
+ nativeplace: row.nativeplace,
+ phone: row.phone,
+ politicaloutlook: row.politicaloutlook,
+ realName: row.realName,
+ securitynumber: row.securitynumber,
+ sex: row.sex,
+ guncode: row.guncode
+ },
+ userDetail: {
+ id: row.userDetailId,
+ userId: row.id,
+ marriageStatus: row.marriageStatus,
+ signLevel: row.signLevel,
+ permanentResidenceAddress: row.permanentResidenceAddress,
+ dwellAddress: row.dwellAddress,
+ memberOfFamily: row.memberOfFamily,
+ educationExperience: row.educationExperience,
+ workExperience: row.workExperience,
+ healthCertificateUrl: row.healthCertificateUrl,
+ noCriminalRecordProveUrl: row.noCriminalRecordProveUrl,
+ acceptancePoliceUnit: row.acceptancePoliceUnit,
+ acceptancePerson: row.acceptancePerson,
+ acceptanceTime: row.acceptanceTime,
+ unitName: row.unitName,
+ }
+ };
+ update(userMap).then(
+ res => {
this.initFlag = false;
this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
+ if (res.data.code == 200) {
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ }
+ if (res.data.code == 201) {
+ this.$alert(
+ "修改成功!注：当前保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!",
+ "温馨提示",
+ {
+ confirmButtonText: "确定",
+ callback: action => {
+ this.$message({
+ type: "success",
+ message: `操作成功`
+ });
+ this.onLoad(this.page);
+ done();
+ }
+ }
+ );
+ }
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -2197,7 +2360,7 @@
"离职原因",
{
confirmButtonText: "确定",
- callback: (action) => {},
+ callback: action => { }
}
);
},
@@ -2205,27 +2368,27 @@
this.$prompt("离职原因", "提示", {
confirmButtonText: "确定离职",
cancelButtonText: "取消",
- inputErrorMessage: "",
+ inputErrorMessage: ""
})
.then(({ value }) => {
row.reasonForLeav = value;
row.status = "2";
// return;
- update(row).then((res) => {
+ update(row).then(res => {
this.$message({
type: "success",
- message: "操作成功",
+ message: "操作成功"
});
});
this.refreshChange();
})
- .catch(() => {});
+ .catch(() => { });
},
rowDel(row) {
this.$confirm("确定注销当前用户?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -2234,7 +2397,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -2242,7 +2405,7 @@
this.$confirm("确定审查异常标记?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
row.examinationType = "1";
@@ -2252,7 +2415,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -2268,11 +2431,11 @@
done();
},
selectionChange(list) {
- // this.selectionList = list;
+ this.selectionList = list;
this.choiceList = [];
for (let k in list) {
this.choiceList.push({
- id: list[k].id,
+ id: list[k].id
});
}
},
@@ -2282,6 +2445,83 @@
this.sortName = "";
// this.$refs.crud.toggleSelection();
},
+ handleBatchAudit(){
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("请选择审批结果", {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "审批通过",
+ cancelButtonText: "不通过",
+ type: "warning"
+ })
+ .then(() => {
+ //审核通过
+ batchAudit(this.ids,1)
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+
+ }).catch(action => {
+ console.log(action)
+ if (action == 'cancel'){
+ //审核不通过
+ batchAudit(this.ids,2)
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ }
+ })
+
+ },
+
+ handleAudit(row){
+ this.$confirm("请选择审批结果", {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "审批通过",
+ cancelButtonText: "不通过",
+ type: "warning"
+ })
+ .then(() => {
+ //审核通过
+ batchAudit(row.id,1)
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+
+ }).catch(action => {
+ console.log(action)
+ if (action == 'cancel'){
+ //审核不通过
+ batchAudit(row.id,2)
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ }
+ })
+ },
+
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
@@ -2290,7 +2530,7 @@
this.$confirm("确定将选择保安注销?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -2299,7 +2539,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -2312,7 +2552,7 @@
this.$confirm("确定将选择账号密码重置为123456?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return resetPassword(this.ids);
@@ -2320,7 +2560,7 @@
.then(() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -2334,7 +2574,7 @@
if (this.selectionList.length === 1) {
this.roleTreeObj = this.selectionList[0].roleId.split(",");
}
- getRoleTree().then((res) => {
+ getRoleTree().then(res => {
this.roleGrantList = res.data.data;
this.roleBox = true;
});
@@ -2355,21 +2595,18 @@
this.$confirm("是否导出保安数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
window.open(
- `/api/blade-user/export-user?${
- this.website.tokenHeader
- }=${getToken()}&account=${this.search.account}&realName=${
- this.search.realName
+ `/api/blade-user/export-user?${this.website.tokenHeader
+ }=${getToken()}&account=${this.search.account}&realName=${this.search.realName
}`
);
});
},
handleTemplate() {
window.open(
- `/api/blade-user/export-template?${
- this.website.tokenHeader
+ `/api/blade-user/export-template?${this.website.tokenHeader
}=${getToken()}`
);
},
@@ -2387,7 +2624,7 @@
SFZopens() {
if (this.haveSEL == "noDrive") {
let url =
- "http://223.82.109.183:2081/zhba/upload/20211201/64d8b76f3aecae93e18d015bbca89aba.rar";
+ "http://61.131.136.25:2081/zhba/upload/20211201/64d8b76f3aecae93e18d015bbca89aba.rar";
window.open(url, "_self");
} else if (this.haveSEL == "noEquipment") {
this.radio = true;
@@ -2398,12 +2635,12 @@
var that = this;
// // 开始连接设备
// //调用对应的连接方法,并赋值给result
- let lodings = (val) => {
- setTimeout((res) => {
+ let lodings = val => {
+ setTimeout(res => {
that.SFZloding = val;
}, 1000);
};
- this.cardShebei = CertCtl.connect((res) => {
+ this.cardShebei = CertCtl.connect(res => {
let k = "";
try {
k = JSON.parse(res);
@@ -2417,7 +2654,7 @@
that.sfzButTitle = "未安装身份证驱动，点击下载";
this.$message({
type: "warning",
- message: "连接身份证设备失败，请重新连接设备!",
+ message: "连接身份证设备失败，请重新连接设备!"
});
that.radio = false;
lodings(false);
@@ -2428,7 +2665,7 @@
// console.log("连接身份证设备成功");
this.$message({
type: "success",
- message: "连接身份证设备成功!",
+ message: "连接身份证设备成功!"
});
lodings(false);
} else {
@@ -2437,7 +2674,7 @@
// console.log("连接身份证设备失败，请重新连接设备!");
this.$message({
type: "warning",
- message: "连接身份证设备失败，请重新连接设备!",
+ message: "连接身份证设备失败，请重新连接设备!"
});
that.radio = false;
lodings(false);
@@ -2535,15 +2772,31 @@
this.type = 2;
}
if (["edit", "view"].includes(type)) {
- getUser(this.form.id).then((res) => {
+ getUser(this.form.id).then(res => {
this.form = res.data.data;
var d = {
- education1: res.data.data.education,
+ education1: res.data.data.education
};
this.form = {
...this.form,
- ...d,
+ ...d
};
+ if (this.form.userDetail) {
+ this.form.userDetailId = this.form.userDetail.id;
+ this.form.marriageStatus = this.form.userDetail.marriageStatus;
+ this.form.signLevel = this.form.userDetail.signLevel;
+ this.form.permanentResidenceAddress = this.form.userDetail.permanentResidenceAddress;
+ this.form.dwellAddress = this.form.userDetail.dwellAddress;
+ this.form.memberOfFamily = this.form.userDetail.memberOfFamily;
+ this.form.educationExperience = this.form.userDetail.educationExperience;
+ this.form.workExperience = this.form.userDetail.workExperience;
+ this.form.healthCertificateUrl = this.form.userDetail.healthCertificateUrl;
+ this.form.noCriminalRecordProveUrl = this.form.userDetail.noCriminalRecordProveUrl;
+ this.form.acceptancePoliceUnit = this.form.userDetail.acceptancePoliceUnit;
+ this.form.acceptancePerson = this.form.userDetail.acceptancePerson;
+ this.form.acceptanceTime = this.form.userDetail.acceptanceTime;
+ this.form.unitName = this.form.userDetail.unitName;
+ }
// this.from["education1"] = res.data.data.education;
if (this.form.hasOwnProperty("deptId")) {
this.form.deptId = this.form.deptId;
@@ -2551,12 +2804,12 @@
if (this.form.hasOwnProperty("roleId")) {
this.form.roleId = this.form.roleId.split(",");
}
- if (this.form.hasOwnProperty("postId")) {
- this.form.postId = this.form.postId.split(",");
- }
+ // if (this.form.hasOwnProperty("postId")) {
+ // this.form.postId = this.form.postId.split(",");
+ // }
var userInfo = res.data.data;
//获取用户从业信息
- getUserPractitionersInfo(userInfo.id).then((res1) => {
+ getUserPractitionersInfo(userInfo.id).then(res1 => {
that.form.UserPractitionersInfo = res1.data.data;
});
});
@@ -2575,7 +2828,7 @@
rowStyle({ row, column, rowIndex }) {
if (row.examinationType == "1") {
return {
- color: "#ff2727",
+ color: "#ff2727"
};
}
},
@@ -2615,19 +2868,19 @@
var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
if (roleAlias == "保安公司管理员") {
that.option.group[1].column[4].dicData = [
{
label: "是",
- value: "1",
+ value: "1"
},
{
label: "否",
- value: "2",
- },
+ value: "2"
+ }
];
}
if (
@@ -2663,7 +2916,8 @@
"/api/blade-user/import-security?deptId=" + this.deptIds;
} else if (
roleAlias == "公安管理员" ||
- roleAlias == "administrator"
+ roleAlias == "administrator" ||
+ this.userInfo.role_name == "民警"
) {
params["jurisdiction"] = that.userInfo.jurisdiction;
var ColumnDeptUpdate = that.findObject(that.option.group, "deptId");
@@ -2695,15 +2949,15 @@
}
let values = {
- ...params,
+ ...params
};
values = {
...params,
roleAlias: "111",
- ...that.query,
+ ...that.query
};
- getList(page.currentPage, page.pageSize, values).then((res) => {
+ getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
that.page.total = data.total;
// var d = data.records;
@@ -2715,8 +2969,12 @@
// // d[key].securitynumber = "赣洪202100009";
// }
that.data = data.records;
+
+ console.log(this.data,"++++++++++")
+
that.loading = false;
that.selectionClear();
+ that.$store.commit("setWindowSizeHeightAdd");
});
});
});
@@ -2727,11 +2985,11 @@
this.platformOnLoad(this.platformPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -2739,7 +2997,7 @@
},
platformBeforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getUserPlatform(this.platformForm.id).then((res) => {
+ getUserPlatform(this.platformForm.id).then(res => {
this.platformForm = res.data.data;
});
}
@@ -2778,7 +3036,7 @@
page.pageSize,
Object.assign(params, this.query),
this.treeDeptId
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.platformPage.total = data.total;
this.platformData = data.records;
@@ -2812,8 +3070,8 @@
return isLt1M;
}
done();
- },
- },
+ }
+ }
};
</script>
@@ -2863,6 +3121,7 @@
// 标题
$upTop: 45px;
$downTop: 265px; //整体高度
+
//经国家保安员考试审查合格。<br />特颁此证。
.security_main-title {
position: absolute;
@@ -2892,6 +3151,7 @@
$rightWidth: 77px;
$lineHigeht: 30px;
+
//姓名
.security_m_r_a {
position: absolute;
@@ -2961,6 +3221,7 @@
//发证时间
$timeTop: 315px; //整体高度
+
//年
.security_m_l_titlepaperTimenian {
position: absolute;
@@ -2995,6 +3256,7 @@
//内容
// 姓名
$centerLeft: 458px;
+
.security_m_r_o_right {
position: absolute;
top: $downTop + $lineHigeht * 0+18px;
@@ -3064,22 +3326,27 @@
.downSFZqudong {
position: absolute;
right: 239px;
- top: 153px;
+ top: 93px;
font-size: 14px;
+
a {
text-decoration: underline;
+
&:hover {
color: rgb(36, 143, 231);
}
}
}
+
.downSFZqudongS {
position: absolute;
right: 30px;
top: 10px;
font-size: 14px;
+
a {
text-decoration: underline;
+
&:hover {
color: rgb(36, 143, 231);
}
--
Gitblit v1.9.3