From 14df83036ff529bcf8eae9c792b1b8f2a54efaf0 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 21 Aug 2021 15:35:18 +0800
Subject: [PATCH] 考试成绩查询修改
---
src/views/securityGuard/securityGuard.vue | 289 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 160 insertions(+), 129 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index fc9a98e..4b96a44 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -43,6 +43,7 @@
size="small"
plain
icon="el-icon-upload2"
+ v-if="permission.securityGuard_import"
@click="handleImport1"
>批量导入
</el-button>
@@ -52,7 +53,6 @@
size="small"
plain
icon="el-icon-delete"
- v-if="permission.user_delete"
@click="handleDelete"
>注 销
</el-button>
@@ -121,6 +121,7 @@
icon="el-icon-edit"
:size="size"
:type="type"
+ v-if="permission.securityGuard_delete"
@click.stop="rowDel(row)"
>离职登记
</el-button>
@@ -238,7 +239,7 @@
</el-col>
</el-row>
</template>
-
+
<script>
import {
getUser,
@@ -255,13 +256,13 @@
} from "@/api/system/user";
import { getList } from "@/api/securityGuard/securityGuard";
import { getDeptLazyTree } from "@/api/system/dept";
-import { getRoleTree,getRoleDetail } from "@/api/system/role";
+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';
+import { mapState } from "vuex";
export default {
data() {
@@ -282,8 +283,9 @@
}
};
return {
- securityid:"",
+ securityid: "",
excelBox1: false,
+ isSecurity: false,
excelForm1: {},
excelOption1: {
submitBtn: false,
@@ -376,9 +378,12 @@
calcHeight: 80,
tip: false,
searchShow: true,
+
+ indexWidth: 55,
searchMenuSpan: 6,
- border: false,
stripe: true,
+ border: true,
+
align: "center",
index: true,
delBtnText: "注销",
@@ -399,8 +404,8 @@
label: "所属保安公司",
prop: "deptId",
type: "tree",
- dicUrl:
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl:
+ // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
// dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
props: {
label: "title",
@@ -485,12 +490,12 @@
row: true,
prop: "myPicture",
},
-
+
// {
// label: "编号",
// prop: "code",
// },
-
+
{
label: "所属辖区",
prop: "jurisdiction",
@@ -623,6 +628,10 @@
{
label: "政治面貌",
prop: "politicaloutlook",
+ },
+ {
+ label: "健康状态",
+ prop: "healstats",
},
{
label: "身高",
@@ -844,32 +853,32 @@
tip: "请上传 .xls,.xlsx 标准格式文件",
action: "/api/blade-user/import-user",
},
- {
- label: "数据覆盖",
- prop: "isCovered",
- type: "switch",
- align: "center",
- width: 80,
- dicData: [
- {
- label: "否",
- value: 0,
- },
- {
- label: "是",
- value: 1,
- },
- ],
- value: 0,
- slot: true,
- rules: [
- {
- required: true,
- message: "请选择是否覆盖",
- trigger: "blur",
- },
- ],
- },
+ // {
+ // label: "数据覆盖",
+ // prop: "isCovered",
+ // type: "switch",
+ // align: "center",
+ // width: 80,
+ // dicData: [
+ // {
+ // label: "否",
+ // value: 0,
+ // },
+ // {
+ // label: "是",
+ // value: 1,
+ // },
+ // ],
+ // value: 0,
+ // slot: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择是否覆盖",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
{
label: "模板下载",
prop: "excelTemplate",
@@ -900,10 +909,10 @@
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.user_add, false),
+ addBtn: this.vaildData(this.permission.securityGuard_add, false),
viewBtn: this.vaildData(null, false),
- delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(this.permission.user_edit, false),
+ delBtn: this.vaildData(this.permission.securityGuard_delete, false),
+ editBtn: this.vaildData(this.permission.securityGuard_edit, false),
};
},
platformPermissionList() {
@@ -922,28 +931,17 @@
return ids.join(",");
},
...mapState({
- userInfo: state => state.user.userInfo
- })
+ userInfo: (state) => state.user.userInfo,
+ }),
},
+ beforeCreate() {},
+ created() {},
mounted() {
- this.option.column[0].hide = true
+ // this.option.column[0].hide = true
// 非保安单位模式默认加载管理组数据
if (!website.tenantMode) {
this.initData(website.tenantId);
}
-
- //获取当前登录人员的角色信息
- var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach(roleId =>{
- getRoleDetail(roleId).then((res) => {
- var roleAlias = res.data.data.roleAlias;
- if(roleAlias=="保安公司管理员" || roleAlias=="保安" || roleAlias=="未持证保安"){
- const column = this.findObject(this.option.column, "deptId");
- column.search = false;
-
- }
- })
- })
},
methods: {
handleImport1() {
@@ -956,7 +954,7 @@
done();
},
handleTemplate1() {
- window.open(`/api/examSubjectChoices/export-template`);
+ window.open(`/api/blade-user/export-template-security`);
},
//行点击事件
@@ -972,18 +970,18 @@
this.onLoad(this.page);
},
initData(tenantId) {
- getRoleTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "roleId");
- column.dicData = res.data.data;
- });
+ // getRoleTree(tenantId).then((res) => {
+ // const column = this.findObject(this.option.group, "roleId");
+ // column.dicData = res.data.data;
+ // });
// getDeptTree(tenantId).then((res) => {
// const column = this.findObject(this.option.group, "deptId");
// column.dicData = res.data.data;
// });
- getPostList(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "postId");
- column.dicData = res.data.data;
- });
+ // getPostList(tenantId).then((res) => {
+ // const column = this.findObject(this.option.group, "postId");
+ // column.dicData = res.data.data;
+ // });
},
submitRole() {
const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -1025,34 +1023,34 @@
});
}
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
- }
+ 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: user,
+ userPractitionersInfo: userPractitionersList,
+ };
securitySave(userMap).then(
() => {
this.$message({
@@ -1109,10 +1107,6 @@
});
this.initFlag = false;
this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
done();
},
(error) => {
@@ -1290,41 +1284,78 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- let values = {
- ...params,
- };
- values = {
- ...params,
- roleAlias:"111",
- ...this.query,
- };
-
+ var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach(roleId =>{
- getRoleDetail(roleId).then((res) => {
- var roleAlias = res.data.data.roleAlias;
- if(roleAlias=="保安公司管理员"){
- values["deptId"] = this.userInfo.dept_id;
- }
- })
- })
-
+ 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";
+ }
- if (this.userInfo.role_id == "1414840172333842433") {
- console.log("是公安add jurisdiction");
- values["jurisdiction"] = this.userInfo.jurisdiction;
- }
- this.loading = true;
- getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(
- (res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- }
- );
+ let values = {
+ ...params,
+ };
+ values = {
+ ...params,
+ roleAlias: "111",
+ ...that.query,
+ };
+
+ that.loading = true;
+ getList(page.currentPage, page.pageSize, values).then((res) => {
+ const data = res.data.data;
+ that.page.total = data.total;
+ var d = data.records;
+ var date = new Date();
+ var datayear = date.getFullYear();
+ for (const key in d) {
+ var year = d[key].cardid.slice(6, 10);
+ d[key]["age"] = +datayear - +year;
+ // d[key].securitynumber = "赣洪202100009";
+ }
+ that.data = data.records;
+ that.loading = false;
+ that.selectionClear();
+ });
+ });
+ });
},
platformRowUpdate(row, index, done, loading) {
updatePlatform(row.id, row.userType, row.userExt).then(
@@ -1394,7 +1425,7 @@
},
};
</script>
-
+
<style>
.box {
height: 800px;
@@ -1407,4 +1438,4 @@
.box .el-scrollbar__wrap {
overflow: scroll;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3