From b8aa0226aa7b9826a6d8acf249258e475a07c000 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 26 Sep 2021 11:59:09 +0800
Subject: [PATCH] 派出所管理权限
---
src/views/securityEquipment/car.vue | 17
src/views/securityEquipment/equipments.js | 2
src/views/recruitmentManagement/index.vue | 15
src/views/securityEquipment/gun.js | 2
src/views/system/user.vue | 68 +
src/views/securityEquipment/gun.vue | 15
src/api/system/dept.js | 21
src/views/dispatch/dispatch.vue | 17
src/views/dispatch/dispatchChildoperable.vue | 15
src/views/securityEquipment/equipments.vue | 25
src/views/securityEquipment/car.js | 2
src/views/recruitmentManagement/data.js | 4
src/views/licenseApproval/securityGuard.vue | 19
src/views/securityAnalysis/child/socialSecurity.vue | 10
src/views/securityGuard/securityGuardOnce copy.vue | 1530 +++++++++++++++++++++++++++++++++++++++
src/views/securityGuard/securityGuardOnce.vue | 540 ++++++-------
src/views/securityAnalysis/index.vue | 1
17 files changed, 1,973 insertions(+), 330 deletions(-)
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 2b8b1bf..2634f3e 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -69,12 +69,13 @@
})
}
-export const getDeptLazyTree = (parentId) => {
+export const getDeptLazyTree = (parentId, jurisdiction) => {
return request({
url: '/api/blade-system/dept/lazy-tree',
method: 'get',
params: {
- parentId
+ parentId,
+ jurisdiction
}
})
}
@@ -91,15 +92,15 @@
}
export const ss = () => {
- return request({
- url: '/api/blade-system/dept/selectInfo',
- method: 'get',
- })
+ return request({
+ url: '/api/blade-system/dept/selectInfo',
+ method: 'get',
+ })
}
export const rs = () => {
- return request({
- url: '/api/blade-system/role/selectRole',
- method: 'get',
- })
+ return request({
+ url: '/api/blade-system/role/selectRole',
+ method: 'get',
+ })
}
diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index 15f819f..e3800af 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -225,8 +225,7 @@
prop: "deptId",
type: "tree",
overHidden: true,
- dicUrl:
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ dicUrl: "",
props: {
label: "title",
value: "id",
@@ -382,6 +381,7 @@
};
},
created() {
+ var that = this;
if (this.userInfo.role_name == "保安公司管理员") {
const deptColumn = this.findObject(this.option.column, "deptId");
deptColumn.search = false;
@@ -390,6 +390,15 @@
deptColumn.viewDisplay = false;
deptColumn.hide = true;
this.useifid = this.userInfo.dept_id;
+ }
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ that.option.column[1].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ } else {
+ that.option.column[1].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
},
computed: {
@@ -588,7 +597,9 @@
values["deptId"] = this.useifid;
}
// console.log(values);
-
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = that.userInfo.jurisdiction;
+ }
getdata(
page.currentPage,
page.pageSize,
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 8e0550f..0d8db0c 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -279,6 +279,7 @@
};
},
created() {
+ var that = this;
if (this.userInfo.role_name == "保安公司管理员") {
console.log("保安公司管理员登入");
const deptColumn = this.findObject(this.option1.column, "deptId");
@@ -291,6 +292,16 @@
"dispatcherUnitId"
);
deptColumn.search = false;
+ }
+
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ that.option1.column[1].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ } else {
+ that.option1.column[1].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
},
computed: {
@@ -501,6 +512,10 @@
if (this.useifid != 266) {
values["deptId"] = this.useifid;
}
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = this.userInfo.jurisdiction;
+ }
getdata1(
page.currentPage,
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index 8f5913f..5f04651 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 16:57:58
* @Last Modified by: liu
- * @Last Modified time: 2021-09-23 09:27:18
+ * @Last Modified time: 2021-09-25 17:58:55
*/
@@ -552,9 +552,24 @@
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 3;
+ var gonganj = "";
+ if (this.userInfo.role_name == "公安管理员") {
+ let test = /派出所$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "派出所管理员";
+ }
+ test = /分局|公安局$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "县局管理员";
+ }
+ test = /市公安局$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "市局管理员";
+ }
+ }
params = {
...params,
- ...this.getFenji(this.userInfo.role_name),
+ ...this.getFenji(gonganj),
};
console.log(params, "params");
// return;
diff --git a/src/views/recruitmentManagement/data.js b/src/views/recruitmentManagement/data.js
index d855e37..1e45ca1 100644
--- a/src/views/recruitmentManagement/data.js
+++ b/src/views/recruitmentManagement/data.js
@@ -56,12 +56,12 @@
// viewDisplay: true,
overHidden: true,
searchSpan: 4,
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ dicUrl: "",
props: {
label: "title",
value: "id"
},
- hide: true,
+ // hide: true,
search: true,
type: "tree",
},
diff --git a/src/views/recruitmentManagement/index.vue b/src/views/recruitmentManagement/index.vue
index 6850d92..3c182c0 100644
--- a/src/views/recruitmentManagement/index.vue
+++ b/src/views/recruitmentManagement/index.vue
@@ -70,6 +70,7 @@
};
},
created() {
+ var that = this;
if (this.userInfo.role_name == "保安公司管理员") {
this.useifid = this.userInfo.dept_id;
const deptColumn = this.findObject(this.option.column, "deptId");
@@ -77,6 +78,15 @@
deptColumn.hide = true;
deptColumn.disabled = true;
deptColumn.value = this.useifid;
+ }
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ that.option.column[1].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ } else {
+ that.option.column[1].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
},
computed: {
@@ -204,6 +214,11 @@
if (this.useifid != 266) {
params["deptId"] = this.useifid;
}
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = this.userInfo.jurisdiction;
+ }
+
getdata(
page.currentPage,
page.pageSize,
diff --git a/src/views/securityAnalysis/child/socialSecurity.vue b/src/views/securityAnalysis/child/socialSecurity.vue
index 20a398b..4a61256 100644
--- a/src/views/securityAnalysis/child/socialSecurity.vue
+++ b/src/views/securityAnalysis/child/socialSecurity.vue
@@ -75,7 +75,7 @@
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
export default {
- props: ["card"],
+ props: ["card", "reself"],
data() {
var card = this.card;
var deptid,
@@ -401,6 +401,10 @@
this.deptid;
}
},
+ reself() {
+ this.$refs.crud.refreshTable();
+ this.$refs.crud.doLayout();
+ },
},
computed: {
...mapGetters(["permission", "userInfo"]),
@@ -564,6 +568,10 @@
onLoad(page, params = {}) {
this.loading = true;
params["deptid"] = this.deptid;
+
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = this.userInfo.jurisdiction;
+ }
getList(
page.currentPage,
page.pageSize,
diff --git a/src/views/securityAnalysis/index.vue b/src/views/securityAnalysis/index.vue
index e336f74..32bd747 100644
--- a/src/views/securityAnalysis/index.vue
+++ b/src/views/securityAnalysis/index.vue
@@ -89,6 +89,7 @@
</assignment>
<socialSecurity
:card="{ deptid: deptid, jurisdiction: jurisdiction }"
+ :reself="dialogVisible"
v-if="sees == 6"
>
<!-- 社保缴纳情况 -->
diff --git a/src/views/securityEquipment/car.js b/src/views/securityEquipment/car.js
index 714b9fb..e98edaf 100644
--- a/src/views/securityEquipment/car.js
+++ b/src/views/securityEquipment/car.js
@@ -88,7 +88,7 @@
editDisplay: false,
search: false,
overHidden: true,
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ dicUrl: "",
props: {
label: "title",
value: "id"
diff --git a/src/views/securityEquipment/car.vue b/src/views/securityEquipment/car.vue
index a73c164..3ef1064 100644
--- a/src/views/securityEquipment/car.vue
+++ b/src/views/securityEquipment/car.vue
@@ -131,11 +131,21 @@
},
},
created() {
+ var that = this;
if (
this.userInfo.role_name == "装备管理员" ||
this.userInfo.role_name == "保安公司管理员"
) {
this.useifid = this.userInfo.dept_id;
+ }
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ that.option.column[4].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ } else {
+ that.option.column[4].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
},
methods: {
@@ -295,6 +305,7 @@
},
onLoad(page, params = {}) {
this.loading = true;
+ var that = this;
// console.log(params.deptId);
if (this.fromDeptId != undefined) {
params["deptId"] = this.fromDeptId;
@@ -314,6 +325,12 @@
} else {
this.openDep("deptId");
}
+
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = that.userInfo.jurisdiction;
+ }
+
getdata(
page.currentPage,
page.pageSize,
diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index 56e3d78..7933891 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -61,7 +61,7 @@
editDisplay: false,
search: false,
overHidden: true,
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ dicUrl: '',
props: {
label: "title",
value: "id"
diff --git a/src/views/securityEquipment/equipments.vue b/src/views/securityEquipment/equipments.vue
index 78246d7..9a0e02c 100644
--- a/src/views/securityEquipment/equipments.vue
+++ b/src/views/securityEquipment/equipments.vue
@@ -131,11 +131,22 @@
},
},
created() {
+ var that = this;
if (
this.userInfo.role_name == "装备管理员" ||
this.userInfo.role_name == "保安公司管理员"
) {
this.useifid = this.userInfo.dept_id;
+ }
+
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ that.option.column[4].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ } else {
+ that.option.column[4].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
},
methods: {
@@ -297,6 +308,7 @@
},
onLoad(page, params = {}) {
this.loading = true;
+ var that = this;
// console.log(params.deptId);
if (this.fromDeptId != undefined) {
params["deptId"] = this.fromDeptId;
@@ -304,18 +316,13 @@
} else if (this.useifid != 266) {
console.log(123);
params["deptId"] = this.useifid;
- // this.closeDep("deptId");
- // for (let k in this.option.column) {
- // if (this.option.column[k].prop == "deptId") {
- // this.option.column[4].search = false;
- // this.option.column[k].hide = true;
- // this.option.column[k].addDisplay = false;
- // this.option.column[k].editDisplay = false;
- // }
- // }
} else {
this.openDep("deptId");
}
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = that.userInfo.jurisdiction;
+ }
getdata(
page.currentPage,
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index 63d8864..9adda3b 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -80,7 +80,7 @@
editDisplay: false,
search: false,
overHidden: true,
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ dicUrl: "",
props: {
label: "title",
value: "id"
diff --git a/src/views/securityEquipment/gun.vue b/src/views/securityEquipment/gun.vue
index 751aa10..897bc12 100644
--- a/src/views/securityEquipment/gun.vue
+++ b/src/views/securityEquipment/gun.vue
@@ -77,11 +77,21 @@
},
},
created() {
+ var that = this;
if (
this.userInfo.role_name == "装备管理员" ||
this.userInfo.role_name == "保安公司管理员"
) {
this.useifid = this.userInfo.dept_id;
+ }
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ that.option.column[5].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ } else {
+ that.option.column[5].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
},
methods: {
@@ -227,6 +237,7 @@
},
onLoad(page, params = {}) {
this.loading = true;
+ var that = this;
// console.log(params.deptId);
if (this.fromDeptId != undefined) {
params["deptId"] = this.fromDeptId;
@@ -246,6 +257,10 @@
} else {
this.openDep("deptId");
}
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = that.userInfo.jurisdiction;
+ }
getdata(
page.currentPage,
page.pageSize,
diff --git a/src/views/securityGuard/securityGuardOnce copy.vue b/src/views/securityGuard/securityGuardOnce copy.vue
new file mode 100644
index 0000000..76c2dd1
--- /dev/null
+++ b/src/views/securityGuard/securityGuardOnce copy.vue
@@ -0,0 +1,1530 @@
+<template>
+ <el-row class="securityGuard">
+ <el-col :span="0" style="display: none">
+ <div class="box">
+ <el-scrollbar>
+ <basic-container>
+ <avue-tree
+ :option="treeOption"
+ :data="treeData"
+ @node-click="nodeClick"
+ />
+ </basic-container>
+ </el-scrollbar>
+ </div>
+ </el-col>
+ <el-col :span="24">
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :search.sync="search"
+ :table-loading="loading"
+ :data="data"
+ ref="crud"
+ v-model="form"
+ :permission="permissionList"
+ @row-del="rowDel"
+ @row-update="rowUpdate"
+ :row-style="rowStyle"
+ @row-save="rowSave"
+ :before-open="beforeOpen"
+ :page.sync="page"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ v-if="permission.securityGuard_import"
+ @click="handleImport1"
+ >批量导入
+ </el-button>
+ <el-button
+ type="danger"
+ style="display: none"
+ size="small"
+ plain
+ icon="el-icon-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>
+ <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>
+ <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>
+ </template>
+
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <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>
+
+ <template slot-scope="{ row }" slot="sex">
+ <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>
+ <template slot-scope="{ row }" slot="roleName">
+ <el-tag>{{ row.roleName }}</el-tag>
+ </template>
+ <template slot-scope="{ row }" slot="deptName">
+ <el-tag>{{ row.deptName }}</el-tag>
+ </template>
+ <template slot-scope="{ row }" slot="userTypeName">
+ <el-tag>{{ row.userTypeName }}</el-tag>
+ </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-tree>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="roleBox = false">取 消</el-button>
+ <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"
+ >
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </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"
+ >
+ <template slot-scope="{ row }" slot="tenantName">
+ <el-tag>{{ row.tenantName }}</el-tag>
+ </template>
+ <template slot-scope="{ row }" slot="userTypeName">
+ <el-tag>{{ row.userTypeName }}</el-tag>
+ </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"
+ >
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate1">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
+ </basic-container>
+ </el-col>
+ </el-row>
+</template>
+
+<script>
+import {
+ getUser,
+ getUserPlatform,
+ remove,
+ update,
+ updatePlatform,
+ add,
+ securitySave,
+ grant,
+ resetPassword,
+ getUserPractitionersInfo,
+ saveOrUpdateUserPractitionersInfo,
+} from "@/api/system/user";
+import { getList } from "@/api/securityGuard/securityGuard";
+import { getDeptLazyTree } from "@/api/system/dept";
+import { getRoleTree, getRoleDetail } from "@/api/system/role";
+import { getPostList } from "@/api/system/post";
+import { mapGetters } from "vuex";
+import website from "@/config/website";
+import { getToken } from "@/util/auth";
+import { securityFormPageColumn } from "./data";
+import { mapState } from "vuex";
+
+export default {
+ data() {
+ const validatePass = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("请输入密码"));
+ } else {
+ callback();
+ }
+ };
+ const validatePass2 = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("请再次输入密码"));
+ } else if (value !== this.form.password) {
+ callback(new Error("两次输入密码不一致!"));
+ } else {
+ callback();
+ }
+ };
+ return {
+ securityid: "",
+ excelBox1: false,
+ isSecurity: false,
+ excelForm1: {},
+ excelOption1: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "文件上传",
+ prop: "excelFile",
+ type: "upload",
+ drag: true,
+ loadText: "文件上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
+ },
+ tip: "请上传 .xls,.xlsx 标准格式文件",
+ action: "/api/blade-user/import-user",
+ },
+ {
+ label: "模板下载",
+ prop: "excelTemplate",
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
+
+ form: {},
+ search: {},
+ roleBox: false,
+ excelBox: false,
+ platformBox: false,
+ initFlag: true,
+ selectionList: [],
+ query: {},
+ loading: true,
+ platformLoading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ roleId: "1412226235153731586",
+ deptId: "1413470343230877697",
+ platformPage: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ init: {
+ roleTree: [],
+ deptTree: [],
+ },
+ props: {
+ label: "title",
+ value: "key",
+ },
+ roleGrantList: [],
+ roleTreeObj: [],
+ treeDeptId: "",
+ treeData: [],
+ treeOption: {
+ nodeKey: "id",
+ lazy: true,
+ treeLoad: function (node, resolve) {
+ const parentId = node.level === 0 ? 0 : node.data.id;
+ getDeptLazyTree(parentId).then((res) => {
+ resolve(
+ res.data.data.map((item) => {
+ return {
+ ...item,
+ leaf: !item.hasChildren,
+ };
+ })
+ );
+ });
+ },
+ addBtn: false,
+ menu: false,
+ size: "small",
+ props: {
+ labelText: "标题",
+ label: "title",
+ value: "value",
+ children: "children",
+ },
+ },
+ option: {
+ height: "auto",
+ calcHeight: 80,
+ tip: false,
+ searchShow: true,
+
+ indexWidth: 55,
+ searchMenuSpan: 6,
+ stripe: true,
+ border: true,
+
+ align: "center",
+ index: true,
+ delBtnText: "注销",
+ menuWidth: 375,
+ selection: true,
+ viewBtn: true,
+ defaultExpandAll: true,
+ //dialogType: 'drawer',
+ dialogClickModal: false,
+ column: securityFormPageColumn,
+ group: [
+ {
+ label: "基础信息",
+ labelWidth: "110",
+ prop: "baseInfo",
+ icon: "el-icon-user-solid",
+ column: [
+ {
+ 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",
+ },
+ // disabled: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择保安公司",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "登录账号",
+ prop: "account",
+ rules: [
+ {
+ required: true,
+ message: "请输入登录账号",
+ trigger: "blur",
+ },
+ ],
+ // disabled: true,
+ },
+ {
+ label: "密码",
+ prop: "password",
+ hide: true,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [
+ { required: true, validator: validatePass, trigger: "blur" },
+ ],
+ },
+ {
+ label: "确认密码",
+ prop: "password2",
+ hide: true,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [
+ { required: true, validator: validatePass2, trigger: "blur" },
+ ],
+ },
+ {
+ label: "姓名",
+ prop: "realName",
+ rules: [
+ {
+ required: true,
+ message: "请输入姓名",
+ trigger: "blur",
+ },
+ {
+ min: 2,
+ max: 5,
+ message: "姓名长度在2到5个字符",
+ },
+ ],
+ },
+ {
+ label: "昵称",
+ prop: "name",
+ },
+ {
+ 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: 12,
+ row: true,
+ prop: "myPicture",
+ },
+
+ // {
+ // label: "编号",
+ // prop: "code",
+ // },
+
+ {
+ 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: "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",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ type: "select",
+ rules: [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "保安员证编号",
+ prop: "securitynumber",
+ hide: true,
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入手机号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
+ },
+ {
+ label: "身份证号",
+ prop: "cardid",
+ hide: true,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ },
+ {
+ label: "民族",
+ prop: "nation",
+ },
+ {
+ label: "最高学历",
+ prop: "education1",
+ type: "select",
+ dicUrl:
+ "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ dataType: "number",
+ slot: true,
+ },
+ {
+ label: "政治面貌",
+ prop: "politicaloutlook",
+ },
+ {
+ label: "健康状态",
+ prop: "healstats",
+ },
+ {
+ label: "身高",
+ prop: "height",
+ },
+ {
+ label: "联系地址",
+ prop: "address",
+ },
+ {
+ label: "户口所在地",
+ prop: "registered",
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ },
+ {
+ label: "性别",
+ prop: "sex",
+ type: "select",
+ slot: true,
+ dicData: [
+ {
+ label: "男",
+ value: 1,
+ },
+ {
+ label: "女",
+ value: 2,
+ },
+ // {
+ // label: "未知",
+ // value: 3,
+ // },
+ ],
+ },
+ {
+ 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,
+ },
+ ],
+ },
+ },
+ ],
+ },
+ ],
+ },
+ data: [],
+ platformQuery: {},
+ platformSelectionList: [],
+ platformData: [],
+ platformForm: {},
+ platformOption: {
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ dialogClickModal: false,
+ menuWidth: 120,
+ editBtnText: "配置",
+ column: [
+ {
+ label: "登录账号",
+ prop: "account",
+ search: true,
+ display: false,
+ },
+ {
+ label: "所属保安单位",
+ prop: "tenantName",
+ slot: true,
+ display: false,
+ },
+ {
+ label: "姓名",
+ prop: "realName",
+ search: true,
+ display: false,
+ },
+ {
+ label: "平台",
+ prop: "userTypeName",
+ slot: true,
+ display: false,
+ },
+ {
+ label: "平台",
+ type: "select",
+ dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ dataType: "number",
+ search: true,
+ hide: true,
+ display: false,
+ prop: "userType",
+ rules: [
+ {
+ required: true,
+ message: "请选择平台",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "拓展",
+ prop: "userExt",
+ type: "textarea",
+ minRows: 8,
+ span: 24,
+ overHidden: true,
+ row: true,
+ hide: true,
+ },
+ ],
+ },
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "模板上传",
+ prop: "excelFile",
+ type: "upload",
+ drag: true,
+ loadText: "模板上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
+ },
+ 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: "excelTemplate",
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
+ };
+ },
+ watch: {
+ "form.tenantId"() {
+ if (this.form.tenantId !== "" && this.initFlag) {
+ this.initData(this.form.tenantId);
+ }
+ },
+ "form.deptId"() {
+ this.initData(this.form.tenantId);
+ },
+ "excelForm.isCovered"() {
+ if (this.excelForm.isCovered !== "") {
+ const column = this.findObject(this.excelOption.column, "excelFile");
+ column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ }
+ },
+ },
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.securityGuard_add, false),
+ viewBtn: this.vaildData(null, false),
+ delBtn: this.vaildData(this.permission.securityGuard_delete, false),
+ editBtn: this.vaildData(this.permission.securityGuard_edit, false),
+ };
+ },
+ platformPermissionList() {
+ return {
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: this.vaildData(this.permission.user_edit, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ ...mapState({
+ userInfo: (state) => state.user.userInfo,
+ }),
+ },
+ beforeCreate() {},
+ created() {},
+ mounted() {
+ // this.option.column[0].hide = true
+ // 非保安单位模式默认加载管理组数据
+ if (!website.tenantMode) {
+ this.initData(website.tenantId);
+ }
+
+ var flag = false,
+ i = 0,
+ ind = null;
+ this.$store.state.tags.tagList.forEach((item, index) => {
+ if (item.label == "保安员查询") {
+ if (flag == false) {
+ ind = index;
+ flag = true;
+ }
+ i++;
+ }
+ });
+ if (i > 1) {
+ this.$store.state.tags.tagList.splice(ind, 1);
+ }
+ },
+ methods: {
+ handleImport1() {
+ this.excelBox1 = true;
+ },
+ uploadAfter1(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox1 = false;
+ // this.refreshChange();
+ done();
+ },
+ handleTemplate1() {
+ 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) {
+ this.treeDeptId = data.id;
+ this.page.currentPage = 1;
+ this.onLoad(this.page);
+ },
+ initData(tenantId) {
+ // 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;
+ // });
+ },
+ submitRole() {
+ const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+ grant(this.ids, roleList).then(() => {
+ this.roleBox = false;
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.onLoad(this.page);
+ });
+ },
+ rowSave(row, done, loading) {
+ if (row.deptId) {
+ row.deptId = row.deptId;
+ }
+ if (row.roleId) {
+ row.roleId = row.roleId.join(",");
+ }
+ 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,
+ 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,
+ userPractitionersInfo: userPractitionersList,
+ };
+ securitySave(userMap).then(
+ () => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.initFlag = false;
+ this.onLoad(this.page);
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowUpdate(row, index, done, loading) {
+ 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: "操作成功!",
+ });
+ });
+ this.initFlag = false;
+ this.onLoad(this.page);
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择保安登记离职?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ row.status = "0";
+ 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(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.treeDeptId = "";
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择保安注销?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleReset() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择账号密码重置为123456?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return resetPassword(this.ids);
+ })
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleGrant() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.roleTreeObj = [];
+ if (this.selectionList.length === 1) {
+ this.roleTreeObj = this.selectionList[0].roleId.split(",");
+ }
+ getRoleTree().then((res) => {
+ this.roleGrantList = res.data.data;
+ this.roleBox = true;
+ });
+ },
+ handlePlatform() {
+ this.platformBox = true;
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleExport() {
+ this.$confirm("是否导出保安数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ window.open(
+ `/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
+ }=${getToken()}`
+ );
+ },
+ beforeOpen(done, type) {
+ var that = this;
+ if (["edit", "view"].includes(type)) {
+ getUser(this.form.id).then((res) => {
+ this.form = res.data.data;
+ var d = {
+ education1: res.data.data.education,
+ };
+ this.form = {
+ ...this.form,
+ ...d,
+ };
+ // this.from["education1"] = res.data.data.education;
+ if (this.form.hasOwnProperty("deptId")) {
+ this.form.deptId = this.form.deptId;
+ }
+ if (this.form.hasOwnProperty("roleId")) {
+ this.form.roleId = this.form.roleId.split(",");
+ }
+ if (this.form.hasOwnProperty("postId")) {
+ this.form.postId = this.form.postId.split(",");
+ }
+ var userInfo = res.data.data;
+ //获取用户从业信息
+ getUserPractitionersInfo(userInfo.id).then((res1) => {
+ that.form.UserPractitionersInfo = res1.data.data;
+ });
+ });
+ }
+ this.initFlag = true;
+ done();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ //行样式调整
+ rowStyle({ row, column, rowIndex }) {
+ if (row.examinationType == "1") {
+ return {
+ color: "#ff2727",
+ };
+ }
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ var that = this;
+
+ //判断是否是从保安公司进来
+ var ids = this.$route.query.departmentid || false;
+ // console.log(ids, 888);
+ // return;
+
+ //获取当前登录人员的角色信息
+ 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 = 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 = true;
+ //如果是保安公司管理员
+ 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;
+ if (ids) {
+ values["deptId"] = ids;
+ this.option.column[1].search = false;
+ this.option.column[1].hide = false;
+ this.option.column[1].addDisplay = false;
+ this.option.column[1].editDisplay = false;
+ } else {
+ this.option.column[1].search = true;
+ this.option.column[1].hide = false;
+ this.option.column[1].addDisplay = true;
+ this.option.column[1].editDisplay = 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";
+ }
+ console.log(d);
+ that.data = data.records;
+ that.loading = false;
+ that.selectionClear();
+ });
+ });
+ });
+ },
+ platformRowUpdate(row, index, done, loading) {
+ updatePlatform(row.id, row.userType, row.userExt).then(
+ () => {
+ this.platformOnLoad(this.platformPage);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ platformBeforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getUserPlatform(this.platformForm.id).then((res) => {
+ this.platformForm = res.data.data;
+ });
+ }
+ done();
+ },
+ platformSearchReset() {
+ this.platformQuery = {};
+ this.platformOnLoad(this.platformPage);
+ },
+ platformSearchChange(params, done) {
+ this.platformQuery = params;
+ this.platformPage.currentPage = 1;
+ this.platformOnLoad(this.platformPage, params);
+ done();
+ },
+ platformSelectionChange(list) {
+ this.platformSelectionList = list;
+ },
+ platformSelectionClear() {
+ this.platformSelectionList = [];
+ this.$refs.platformCrud.toggleSelection();
+ },
+ platformCurrentChange(currentPage) {
+ this.platformPage.currentPage = currentPage;
+ },
+ platformSizeChange(pageSize) {
+ this.platformPage.pageSize = pageSize;
+ },
+ platformRefreshChange() {
+ this.platformOnLoad(this.platformPage, this.platformQuery);
+ },
+ platformOnLoad(page, params = {}) {
+ this.platformLoading = true;
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query),
+ this.treeDeptId
+ ).then((res) => {
+ const data = res.data.data;
+ this.platformPage.total = data.total;
+ this.platformData = data.records;
+ this.platformLoading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.box {
+ height: 800px;
+}
+
+.el-scrollbar {
+ height: 100%;
+}
+
+.box .el-scrollbar__wrap {
+ overflow: scroll;
+}
+.rowClickSelf {
+ &:hover {
+ cursor: pointer;
+ }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/securityGuard/securityGuardOnce.vue b/src/views/securityGuard/securityGuardOnce.vue
index 76c2dd1..ba8b143 100644
--- a/src/views/securityGuard/securityGuardOnce.vue
+++ b/src/views/securityGuard/securityGuardOnce.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-update="rowUpdate"
:before-open="beforeOpen"
:page.sync="page"
@search-change="searchChange"
@@ -37,6 +37,7 @@
@refresh-change="refreshChange"
@on-load="onLoad"
>
+ <!-- @row-update="rowUpdate" -->
<template slot="menuLeft">
<el-button
type="success"
@@ -46,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"
@@ -120,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>
@@ -128,9 +138,17 @@
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>
</template>
@@ -143,7 +161,7 @@
class="rowClickSelf"
title="点击查看所属公司情况"
@click="rowClickSelf(row.deptId)"
- >{{ row.$deptId }}</el-tag
+ >{{ row.deptName }}</el-tag
>
</template>
<template slot-scope="{ row }" slot="tenantName">
@@ -249,6 +267,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>
@@ -296,10 +327,35 @@
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) && value.length < 17) {
+ callback(new Error("请输入正确身份证号码"));
+ } else {
+ callback();
+ }
+ };
+ const validatePassPhone = (rule, value, callback) => {
+ var test = /^(13[0-9]|14[0-9]|15[0-9]|17[0-9]|18[0-9])\d{8}$/g;
+ if (!test.test(value)) {
+ callback(new Error("请输入正确手机号码"));
+ } else {
+ callback();
+ }
+ };
return {
securityid: "",
excelBox1: false,
- isSecurity: false,
+ excelBox2: false,
+ isSecurity: true,
excelForm1: {},
excelOption1: {
submitBtn: false,
@@ -323,6 +379,26 @@
prop: "excelTemplate",
formslot: true,
span: 24,
+ },
+ ],
+ },
+ 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",
},
],
},
@@ -397,11 +473,12 @@
searchMenuSpan: 6,
stripe: true,
border: true,
+ delBtn: false,
align: "center",
index: true,
delBtnText: "注销",
- menuWidth: 375,
+ menuWidth: 271,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -438,6 +515,7 @@
{
label: "登录账号",
prop: "account",
+ editDisabled: true,
rules: [
{
required: true,
@@ -450,6 +528,7 @@
{
label: "密码",
prop: "password",
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -460,6 +539,7 @@
{
label: "确认密码",
prop: "password2",
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -467,6 +547,14 @@
{ required: true, validator: validatePass2, trigger: "blur" },
],
},
+ ],
+ },
+ {
+ label: "详细信息",
+ prop: "detailInfo",
+ labelWidth: "110",
+ icon: "el-icon-s-order",
+ column: [
{
label: "姓名",
prop: "realName",
@@ -493,81 +581,36 @@
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,
- prop: "myPicture",
+ // row: true,
+ prop: "avatar",
},
-
- // {
- // label: "编号",
- // prop: "code",
- // },
-
{
- label: "所属辖区",
- prop: "jurisdiction",
- // multiple: true,
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree",
- props: {
- label: "title",
- value: "id",
+ label: "指纹信息",
+ type: "upload",
+ listType: "picture-img",
+ propsHttp: {
+ res: "data",
+ url: "url",
},
- checkStrictly: true,
- slot: true,
- rules: [
- {
- required: false,
- message: "请选择所属辖区",
- trigger: "click",
- },
- ],
+ 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: "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",
@@ -591,22 +634,6 @@
hide: true,
},
{
- label: "手机号码",
- prop: "phone",
- overHidden: true,
- rules: [
- {
- required: true,
- message: "请输入手机号",
- trigger: "blur",
- },
- ],
- },
- {
- label: "电子邮箱",
- prop: "email",
- },
- {
label: "身份证号",
prop: "cardid",
hide: true,
@@ -617,7 +644,33 @@
message: "请输入身份证号",
trigger: "blur",
},
+ {
+ required: true,
+ validator: validatePassCardid,
+ trigger: "blur",
+ },
],
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入手机号",
+ trigger: "blur",
+ },
+ {
+ required: true,
+ validator: validatePassPhone,
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
},
{
label: "籍贯",
@@ -661,11 +714,38 @@
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",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
+ rules: [
+ {
+ required: true,
+ message: "请输入入职时间",
+ trigger: "click",
+ },
+ ],
},
{
label: "性别",
@@ -687,91 +767,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",
+ // },
],
},
],
@@ -957,22 +959,8 @@
if (!website.tenantMode) {
this.initData(website.tenantId);
}
-
- var flag = false,
- i = 0,
- ind = null;
- this.$store.state.tags.tagList.forEach((item, index) => {
- if (item.label == "保安员查询") {
- if (flag == false) {
- ind = index;
- flag = true;
- }
- i++;
- }
- });
- if (i > 1) {
- this.$store.state.tags.tagList.splice(ind, 1);
- }
+ console.log(this.search, 111);
+ this.search["status"] = 1;
},
methods: {
handleImport1() {
@@ -981,16 +969,25 @@
uploadAfter1(res, done, loading, column) {
window.console.log(column);
this.excelBox1 = false;
- // this.refreshChange();
+ this.refreshChange();
done();
},
handleTemplate1() {
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();
+ },
//行点击事件
rowClick(row) {
- console.log(row, 111);
+ // console.log(row, 111);
this.$router.push({
path: "/securityGuardDetail",
query: { row: JSON.stringify(row) },
@@ -1043,61 +1040,45 @@
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,
- 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,
- userPractitionersInfo: userPractitionersList,
+ 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(
() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!",
});
- this.initFlag = false;
- this.onLoad(this.page);
done();
},
(error) => {
@@ -1110,42 +1091,16 @@
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: "操作成功!",
- });
- });
this.initFlag = false;
this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
done();
},
(error) => {
@@ -1154,23 +1109,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(() => {
- row.status = "0";
- return update(row);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
+ .then(({ value }) => {
+ console.log(value);
+ row.reasonForLeav = value;
+ row.status = "2";
+ // console.log(update);
+ // return;
+ update(row).then((res) => {
+ this.$message({
+ type: "success",
+ message: "操作成功",
+ });
});
- });
+ this.refreshChange();
+ })
+ .catch(() => {});
},
rowCheck(row) {
this.$confirm("确定审查异常标记?", {
@@ -1349,6 +1319,7 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
+ params = this.search;
var that = this;
//判断是否是从保安公司进来
@@ -1361,11 +1332,7 @@
roleIds.forEach((roleId) => {
getRoleDetail(roleId).then((res) => {
var roleAlias = res.data.data.roleAlias;
- if (
- roleAlias == "保安公司管理员" ||
- roleAlias == "保安" ||
- roleAlias == "未持证保安"
- ) {
+ if (roleAlias == "保安公司管理员" || roleAlias == "保安") {
//去除保安公司查询
const column = that.findObject(that.option.column, "deptId");
column.search = false;
@@ -1375,7 +1342,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 == "公安管理员") {
@@ -1433,7 +1400,6 @@
d[key]["age"] = +datayear - +year;
// d[key].securitynumber = "赣洪202100009";
}
- console.log(d);
that.data = data.records;
that.loading = false;
that.selectionClear();
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index c3ca953..366c2f5 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -220,6 +220,7 @@
callback();
}
};
+
return {
isguanli: true,
@@ -261,19 +262,22 @@
treeOption: {
nodeKey: "id",
lazy: true,
- treeLoad: function (node, resolve) {
- const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree(parentId).then((res) => {
- resolve(
- res.data.data.map((item) => {
- return {
- ...item,
- leaf: !item.hasChildren,
- };
- })
- );
- });
- },
+ treeLoad: "", //处理权限 在created中
+ // function (node, resolve) {
+ // const parentId = node.level === 0 ? 0 : node.data.id;
+ // //公安局进入
+
+ // getDeptLazyTree(parentId, jurisdiction).then((res) => {
+ // resolve(
+ // res.data.data.map((item) => {
+ // return {
+ // ...item,
+ // leaf: !item.hasChildren,
+ // };
+ // })
+ // );
+ // });
+ // },
addBtn: false,
menu: false,
size: "small",
@@ -781,6 +785,39 @@
this.deptids = null;
this.sizes = [5, 19];
}
+
+ //公安局进入
+ var jurisdiction = "";
+ if (this.userInfo.role_name == "公安管理员") {
+ jurisdiction = this.userInfo.jurisdiction;
+ this.treeOption.treeLoad = function (node, resolve) {
+ const parentId = node.level === 0 ? 0 : node.data.id;
+ getDeptLazyTree(parentId, jurisdiction).then((res) => {
+ resolve(
+ res.data.data.map((item) => {
+ return {
+ ...item,
+ leaf: !item.hasChildren,
+ };
+ })
+ );
+ });
+ };
+ } else {
+ this.treeOption.treeLoad = function (node, resolve) {
+ const parentId = node.level === 0 ? 0 : node.data.id;
+ getDeptLazyTree(parentId).then((res) => {
+ resolve(
+ res.data.data.map((item) => {
+ return {
+ ...item,
+ leaf: !item.hasChildren,
+ };
+ })
+ );
+ });
+ };
+ }
},
mounted() {
// 非保安单位模式默认加载管理组数据
@@ -1041,6 +1078,11 @@
onLoad(page, params = {}) {
this.loading = true;
var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ params["jurisdiction"] = this.userInfo.jurisdiction;
+ }
+
getList(
page.currentPage,
page.pageSize,
--
Gitblit v1.9.3