From c8e279927a36c755fd78769cfa8e489568192aa4 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 28 Aug 2021 16:31:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityEquipment/equipments.js | 71 --
src/views/trainExam/index.vue | 14
src/views/applyexam/index.vue | 4
vue.config.js | 80 +-
src/views/securityGuard/securityGuard.vue | 2
src/views/trainExam/performance.vue | 12
src/views/trainApply/index.vue | 25
src/views/securityEquipment/gun.vue | 5
src/views/trainingRegistration/index.vue | 2
src/views/applydetailed/index.vue | 6
src/views/dispatch/dispatchChildoperable.vue | 87 ++-
src/views/people/data.js | 868 ++++++++++++++++----------------
src/views/securityGuard/data.js | 2
src/views/securityUnitChild/data.js | 45 -
src/views/exam/performance.vue | 4
src/views/securityEquipment/car.vue | 6
src/views/workreport/workreport.vue | 21
src/views/securityEquipment/gun.js | 37
src/views/trainExam/singleperformance.vue | 7
src/views/desk/notice.vue | 5
src/views/dispatch/dispatch.vue | 158 -----
src/views/securityEquipment/equipments.vue | 7
src/views/securityEquipment/car.js | 60 +-
src/views/securityMan/data.js | 2
src/views/exam/startexam.vue | 9
src/views/securityGuard/securityGuardRegistration.vue | 2
src/views/securityGuard/securityGuardOnce.vue | 2
src/views/exam/singleperformance.vue | 5
28 files changed, 715 insertions(+), 833 deletions(-)
diff --git a/src/views/applydetailed/index.vue b/src/views/applydetailed/index.vue
index b300b20..cd1dffb 100644
--- a/src/views/applydetailed/index.vue
+++ b/src/views/applydetailed/index.vue
@@ -39,13 +39,12 @@
>清册打印
</el-button>
<el-button
- style="display:none"
type="success"
size="small"
plain
icon="el-icon-receiving"
@click="handleImport"
- >清册打印
+ >清册导入
</el-button>
</template>
@@ -104,6 +103,7 @@
export default {
data() {
+ var examId = this.$route.query.id;
return {
obj: {
name: "张三",
@@ -462,7 +462,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/apply/import-apply",
+ action: "/api/apply/import-applys?examId="+examId,
},
{
label: "模板下载",
diff --git a/src/views/applyexam/index.vue b/src/views/applyexam/index.vue
index 04d848c..621a50e 100644
--- a/src/views/applyexam/index.vue
+++ b/src/views/applyexam/index.vue
@@ -76,7 +76,7 @@
icon="el-icon-folder-checked"
v-if="permission.applyexam_import"
@click="handleImport"
- >清册导入
+ >批量报名
</el-button>
</template>
@@ -131,7 +131,7 @@
</el-dialog>
<el-dialog
- title="清册数据导入"
+ title="批量报名导入"
append-to-body
:visible.sync="excelBox"
width="555px"
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index 7c82918..fa52ade 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -162,14 +162,15 @@
label: "通知时间",
prop: "releaseTimeRange",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
searchRange: true,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
search: true,
+ searchSpan:6,
rules: [
{
required: true,
diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index b0c21f3..806c805 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -109,7 +109,7 @@
remove1,
} from "@/api/dispatch/dispatch";
import { mapGetters } from "vuex";
-
+import { mapState } from "vuex";
export default {
data() {
return {
@@ -296,7 +296,7 @@
overHidden: true,
labelWidth: 118,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=1123598813738675201",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
@@ -322,7 +322,7 @@
overHidden: true,
labelWidth: 118,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=1123598813738675201",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
@@ -379,6 +379,16 @@
},
};
},
+ created() {
+ if (this.userInfo.role_name == "保安公司管理员") {
+ const deptColumn = this.findObject(this.option.column, "deptId");
+ deptColumn.search = false;
+ deptColumn.addDisplay = false;
+ deptColumn.editDisplay = false;
+ deptColumn.viewDisplay = false;
+ deptColumn.hide = true;
+ }
+ },
computed: {
...mapGetters(["userInfo"]),
ids() {
@@ -395,6 +405,9 @@
});
return ids1.join(",");
},
+ ...mapState({
+ userInfo: (state) => state.user.userInfo,
+ })
},
methods: {
handleChangeTABS(column) {
@@ -423,13 +436,7 @@
// this.$message.success("页码" + val);
},
rowSave(form, done, loading) {
- // var that = this;
- // var form = this.data[0];
- // delete form.id;
- // for (var k = 0; k < 13; k++) {
form["deptId"] = this.userInfo.dept_id;
- // form["tenantName"] = form.this.userInfo.user_name;
-
adddata(form).then(
(res) => {
this.onLoad(this.page);
@@ -457,7 +464,6 @@
this.onLoad(this.page);
},
rowUpdate(row, index, done, loading) {
- console.log(row);
update(row).then(
() => {
this.onLoad(this.page);
@@ -603,138 +609,6 @@
this.refreshChange();
done();
},
-
- //派遣服务公司登记
-
- //派遣记录
- // sizeChange1(val) {
- // this.page1.currentPage = 1;
- // this.page1.pageSize = val;
- // // this.getData();
- // this.onLoad1(this.page1, this.query1);
- // // this.$message.success("行数" + val);
- // },
- // currentChange1(val) {
- // this.page1.currentPage = val;
- // // this.getData();
- // this.onLoad1(this.page1, this.query1);
- // // this.$message.success("页码" + val);
- // },
- // rowSave1(form, done, loading) {
- // var that = this;
- // var form = this.data1[0];
- // delete form.id;
- // for (var k = 0; k < 13; k++) {
- // adddata1(form).then(
- // (res) => {
- // this.onLoad1(this.page1);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // done();
- // },
- // (error) => {
- // window.console.log(error);
- // loading();
- // }
- // );
- // }
- // },
- // searchChange1(params, done) {
- // this.query1 = params;
- // this.page1.currentPage = 1;
- // this.onLoad1(this.page1, params);
- // done();
- // },
- // searchReset1() {
- // this.query = {};
- // this.onLoad1(this.page1);
- // },
- // rowUpdate1(row, index, done, loading) {
- // console.log(row);
- // update1(row).then(
- // () => {
- // this.onLoad1(this.page1);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // done();
- // },
- // (error) => {
- // window.console.log(error);
- // loading();
- // }
- // );
- // },
- // rowDel1(row) {
- // this.$confirm("确定将选择数据删除?", {
- // confirmButtonText: "确定",
- // cancelButtonText: "取消",
- // type: "warning",
- // })
- // .then(() => {
- // return remove1(row.id);
- // })
- // .then(() => {
- // this.onLoad1(this.page1);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // });
- // },
- // selectionChange1(list) {
- // this.selectionList1 = list;
- // console.log(this.selectionList1.length);
- // },
- // handleDelete1() {
- // console.log(this.selectionList1);
- // if (this.selectionList1.length === 0) {
- // this.$message.warning("请选择至少一条数据");
- // return;
- // }
- // this.$confirm("确定将选择数据删除?", {
- // confirmButtonText: "确定",
- // cancelButtonText: "取消",
- // type: "warning",
- // })
- // .then(() => {
- // return remove1(this.ids1);
- // })
- // .then(() => {
- // this.onLoad1(this.page1);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // this.$refs.crudrec1.toggleSelection();
- // });
- // },
- // refreshChange1() {
- // // console.log(4534)
- // this.onLoad1(this.page1, this.query1);
- // },
-
- // //
- // onLoad1(page, params = {}) {
- // this.loading1 = true;
- // // console.log(page);
- // getdata1(
- // page.currentPage,
- // page.pageSize,
- // Object.assign(params, this.query)
- // ).then((res) => {
- // // console.log(res);
- // const data = res.data.data;
- // this.page1.total = data.total;
- // this.data1 = data.records;
- // console.log(this.data1, 1);
- // this.loading1 = false;
- // });
- // },
- //派遣记录
},
mounted() {
this.typeTABS = this.optionTABS.column[0];
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 702bb90..d858ed2 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -23,7 +23,13 @@
</template>
<script>
-import { getdata1, adddata1, update1, remove1,getDispatcherUnitByDeptId} from "@/api/dispatch/dispatch";
+import {
+ getdata1,
+ adddata1,
+ update1,
+ remove1,
+ getDispatcherUnitByDeptId,
+} from "@/api/dispatch/dispatch";
import { getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";
@@ -269,15 +275,14 @@
},
};
},
- created () {
-
-
- if(this.userInfo.role_name=="保安公司管理员"){
- const deptColumn = this.findObject(this.option1.column, "deptId");
-
- deptColumn.search = false;
-
- }
+ created() {
+ if (this.userInfo.role_name == "保安公司管理员") {
+ const deptColumn = this.findObject(this.option1.column, "deptId");
+ deptColumn.search = false;
+ }else{
+ const deptColumn = this.findObject(this.option1.column, "dispatcherUnitId");
+ deptColumn.search = false;
+ }
},
computed: {
// },
@@ -291,8 +296,11 @@
...mapState({
userInfo: (state) => state.user.userInfo,
}),
+ deps() {
+ return this.form.deptId;
+ },
},
-
+
methods: {
handleChangeTABS(column) {
this.typeTABS = column;
@@ -422,12 +430,12 @@
beforeOpen(done, type) {
var that = this;
- if (["add","edit", "view"].includes(type)) {
- if(this.userInfo.role_name=="保安公司管理员"){
- getListByDeptId(that.userInfo.dept_id).then((res)=>{
+ if (["add", "edit", "view"].includes(type)) {
+ if (this.userInfo.role_name == "保安公司管理员") {
+ getListByDeptId(that.userInfo.dept_id).then((res) => {
const userColumn = that.findObject(this.option1.column, "userIds");
userColumn.dicData = res.data.data;
- })
+ });
}
}
this.initFlag = true;
@@ -475,13 +483,13 @@
};
}
- if(this.userInfo.role_name=="保安公司管理员"){
+ if (this.userInfo.role_name == "保安公司管理员") {
const deptColumn = this.findObject(this.option1.column, "deptId");
deptColumn.disabled = true;
// deptColumn.search = false; //会报错
deptColumn.value = this.userInfo.dept_id;
this.initData(2);
- }else{
+ } else {
this.initData(1);
}
@@ -496,29 +504,42 @@
this.data1 = data.records;
this.loading1 = false;
// this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
- console.log(this.form,111111);
+ console.log(this.form, 111111);
});
},
- initData(type){
+ initData(type) {
var that = this;
- if(type==1){
- getDispatcherUnitByDeptId(null).then((res)=>{
- const dispatcherUnitIdColumn = that.findObject(this.option1.column, "dispatcherUnitId");
- dispatcherUnitIdColumn.dicData = res.data.data;
-
- })
+ if (type == 1) {
+ getDispatcherUnitByDeptId(null).then((res) => {
+ const dispatcherUnitIdColumn = that.findObject(
+ this.option1.column,
+ "dispatcherUnitId"
+ );
+ console.log(res.data.data,111);
+ dispatcherUnitIdColumn.dicData = res.data.data;
+ });
}
- if(type==2){
- getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res)=>{
- const dispatcherUnitIdColumn = that.findObject(this.option1.column, "dispatcherUnitId");
- dispatcherUnitIdColumn.dicData = res.data.data;
- })
+ if (type == 2) {
+ getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res) => {
+ const dispatcherUnitIdColumn = that.findObject(
+ this.option1.column,
+ "dispatcherUnitId"
+ );
+ dispatcherUnitIdColumn.dicData = res.data.data;
+ });
+ getListByDeptId(that.userInfo.dept_id).then((res) => {
+ const userIdsColumn = that.findObject(this.option1.column, "userIds");
+ userIdsColumn.dicData = res.data.data;
+ });
}
- }
+ },
},
// watch: {
- // "form.deptId"() {
- // this.initData();
+ // // "form.deptId"() {
+ // // this.initData();
+ // // }
+ // deps(){
+ // console.log(this.deps,5646646)
// }
// },
mounted() {
diff --git a/src/views/exam/performance.vue b/src/views/exam/performance.vue
index bfddb79..fad79a9 100644
--- a/src/views/exam/performance.vue
+++ b/src/views/exam/performance.vue
@@ -186,7 +186,8 @@
trigger: "blur",
},
],
- overHidden: true,
+ // overHidden: true,
+ width:230,
},
{
label: "用户名",
@@ -245,6 +246,7 @@
trigger: "blur",
},
],
+ width:250,
},
{
label: "考试开始时间",
diff --git a/src/views/exam/singleperformance.vue b/src/views/exam/singleperformance.vue
index 8958b74..8f4ed78 100644
--- a/src/views/exam/singleperformance.vue
+++ b/src/views/exam/singleperformance.vue
@@ -161,7 +161,8 @@
trigger: "blur",
},
],
- overHidden:true,
+ // overHidden:true,
+ width:230,
},
{
label: "用户名",
@@ -188,6 +189,7 @@
trigger: "blur",
},
],
+ width:160,
},
{
label: "所属公司",
@@ -219,6 +221,7 @@
trigger: "blur",
},
],
+ width:250,
},
{
label: "考试开始时间",
diff --git a/src/views/exam/startexam.vue b/src/views/exam/startexam.vue
index 5a429d7..fc874e2 100644
--- a/src/views/exam/startexam.vue
+++ b/src/views/exam/startexam.vue
@@ -54,6 +54,7 @@
<template slot="menuLeft">
<el-button
+ style="display:none"
type="danger"
size="small"
icon="el-icon-delete"
@@ -108,14 +109,14 @@
form: {},
questionBankOption: {
// 操作栏多余按钮去除
- delBtn: true,
- editBtn: true,
- addBtn: true,
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
selection: true,
menu: true,
// 导出按钮
excelBtn: false,
- viewBtn: true,
+ viewBtn: false,
// title: '题库',
diff --git a/src/views/people/data.js b/src/views/people/data.js
index be42d52..5bc15ab 100644
--- a/src/views/people/data.js
+++ b/src/views/people/data.js
@@ -1,314 +1,314 @@
//保安员基本信息
export var securityBaseInfoColumn = [{
- label: "",
- labelWidth: "20",
- type: 'title',
- prop: "title",
- span: 24,
- styles: {
- fontSize: '24px'
- }
-},
-{
- 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,
- span: 24,
-},
-{
- label: "登录账号",
- prop: "account",
- disabled: true
-},
-{
- label: "用户姓名",
- prop: "realName",
- disabled: true,
-},
-{
- label: "用户昵称",
- prop: "name",
- disabled: true
-},
-{
- label: "手机号码",
- prop: "phone",
- disabled: true
-},
-{
- label: "电子邮箱",
- prop: "email",
- disabled: true
-},
-{
- label: "身份证号",
- prop: "cardid",
- disabled: true
-},
-{
- label: "籍贯",
- prop: "nativeplace",
- disabled: true
-},
-{
- label: "民族",
- prop: "nation",
- disabled: true
-},
-{
- label: "是否持证",
- prop: "hold",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- type: "select",
- disabled: true
-},
-{
- label: "保安员证编号",
- prop: "securitynumber",
- disabled: true
-},
-{
- label: "所属辖区",
- prop: "jurisdiction",
- // multiple: true,
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
- props: {
- label: "title",
- value: "id",
- },
- disabled: true
-},
-{
- label: "最高学历",
- prop: "education",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- disabled: true
-},
-{
- label: "政治面貌",
- prop: "politicaloutlook",
- disabled: true
-},
-{
- label: "身高",
- prop: "height",
- disabled: true
-},
-{
- label: "联系地址",
- prop: "address",
- disabled: true
-},
-{
- label: "户口所在地",
- prop: "registered",
- disabled: true
-},
-{
- label: "入职时间",
- prop: "rtime",
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- disabled: true
-},
-{
- label: "用户性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
+ label: "",
+ labelWidth: "20",
+ type: 'title',
+ prop: "title",
+ span: 24,
+ styles: {
+ fontSize: '24px'
+ }
},
{
- label: "女",
- value: 2
+ 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,
+ span: 24,
},
{
- label: "未知",
- value: 3
+ label: "登录账号",
+ prop: "account",
+ disabled: true
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ disabled: true,
+ },
+ {
+ label: "用户昵称",
+ prop: "name",
+ disabled: true
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ disabled: true
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
+ disabled: true
+ },
+ {
+ label: "身份证号",
+ prop: "cardid",
+ disabled: true
+ },
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ disabled: true
+ },
+ {
+ label: "民族",
+ prop: "nation",
+ disabled: true
+ },
+ {
+ label: "是否持证",
+ prop: "hold",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ type: "select",
+ disabled: true
+ },
+ {
+ label: "保安员证编号",
+ prop: "securitynumber",
+ disabled: true
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ // multiple: true,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ disabled: true
+ },
+ {
+ label: "最高学历",
+ prop: "education",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ disabled: true
+ },
+ {
+ label: "政治面貌",
+ prop: "politicaloutlook",
+ disabled: true
+ },
+ {
+ label: "身高",
+ prop: "height",
+ disabled: true
+ },
+ {
+ label: "联系地址",
+ prop: "address",
+ disabled: true
+ },
+ {
+ label: "户口所在地",
+ prop: "registered",
+ disabled: true
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ disabled: true
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ },
+ {
+ label: "未知",
+ value: 3
+ }
+ ],
+ disabled: true
+ },
+ {
+ label: "用户生日",
+ type: "date",
+ prop: "birthday",
+ disabled: true
}
- ],
- disabled: true
-},
-{
- label: "用户生日",
- type: "date",
- prop: "birthday",
- disabled: true
-}
]
export var securityBaseInfoColumns = [{
- label: "所属保安单位",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- disabled: true,
- span: 24,
-},
-{
- label: "登录账号",
- prop: "account",
- disabled: true
-},
-{
- label: "用户姓名",
- prop: "realName",
- rules: [{
- required: true,
- message: "请输入用户姓名",
- trigger: "blur"
- }, {
- min: 2,
- max: 5,
- message: '姓名长度在2到5个字符'
- }]
-},
-{
- label: "用户昵称",
- prop: "name"
-},
-{
- label: "手机号码",
- prop: "phone",
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入手机号",
- trigger: "blur"
- }]
-},
-{
- label: "电子邮箱",
- prop: "email",
- hide: true,
- overHidden: true
-},
-{
- label: "身份证号",
- prop: "cardid",
- hide: true,
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入身份证号",
- trigger: "blur"
- }]
-},
-{
- label: "籍贯",
- prop: "nativeplace",
- hide: true,
- overHidden: true
-},
-{
- label: "民族",
- prop: "nation",
- hide: true,
- overHidden: true
-},
-{
- label: "最高学历",
- prop: "education",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- rules: [{
- required: true,
- message: "请选择学历",
- trigger: "blur"
- }]
-},
-{
- label: "政治面貌",
- prop: "politicaloutlook",
- hide: true,
- overHidden: true
-},
-{
- label: "身高",
- prop: "height",
- hide: true,
- overHidden: true
-},
-{
- label: "联系地址",
- prop: "address",
- hide: true,
- overHidden: true
-},
-{
- label: "户口所在地",
- prop: "registered",
- hide: true,
- overHidden: true
-},
-{
- label: "入职时间",
- prop: "rtime",
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- hide: true,
- overHidden: true
-},
-{
- label: "用户性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
+ label: "所属保安单位",
+ prop: "tenantId",
+ type: "tree",
+ dicUrl: "/api/blade-system/tenant/select",
+ props: {
+ label: "tenantName",
+ value: "tenantId"
+ },
+ disabled: true,
+ span: 24,
},
{
- label: "女",
- value: 2
+ label: "登录账号",
+ prop: "account",
+ disabled: true
},
{
- label: "未知",
- value: 3
+ label: "用户姓名",
+ prop: "realName",
+ rules: [{
+ required: true,
+ message: "请输入用户姓名",
+ trigger: "blur"
+ }, {
+ min: 2,
+ max: 5,
+ message: '姓名长度在2到5个字符'
+ }]
+ },
+ {
+ label: "用户昵称",
+ prop: "name"
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入手机号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "身份证号",
+ prop: "cardid",
+ hide: true,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "民族",
+ prop: "nation",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "最高学历",
+ prop: "education",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择学历",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "政治面貌",
+ prop: "politicaloutlook",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "身高",
+ prop: "height",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "联系地址",
+ prop: "address",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "户口所在地",
+ prop: "registered",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ },
+ {
+ label: "未知",
+ value: 3
+ }
+ ],
+ hide: true
+ },
+ {
+ label: "用户生日",
+ type: "date",
+ prop: "birthday",
+ hide: true
}
- ],
- hide: true
-},
-{
- label: "用户生日",
- type: "date",
- prop: "birthday",
- hide: true
-}
]
@@ -443,153 +443,153 @@
export var securityFormPageColumn = [{
- label: "姓名",
- prop: "realName",
- search: true,
- searchSpan: 4,
- display: false
-},
-{
- label: "性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1,
+ label: "姓名",
+ prop: "realName",
+ search: true,
+ searchSpan: 4,
+ display: false
},
{
- label: "女",
- value: 2,
+ label: "性别",
+ prop: "sex",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1,
+ },
+ {
+ label: "女",
+ value: 2,
+ },
+ {
+ label: "未知",
+ value: 3,
+ },
+ ],
+ display: false
},
- {
- label: "未知",
- value: 3,
- },
- ],
- display: false
-},
-{
- label: "籍贯",
- prop: "nativeplace",
- display: false
-},
-{
- label: "民族",
- prop: "nation",
- display: false
-},
-{
- label: "出生日期",
- prop: "birthday",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- display: false
-},
-{
- label: "学历",
- prop: "education",
- display: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ display: false
},
- type: "select",
- hide: true,
- rules: [{
- required: true,
- message: "请选择学历",
- trigger: "blur"
- }],
-},
-{
- label: "联系电话",
- prop: "phone",
- display: false
-},
-{
- label: "邮箱",
- prop: "email",
- display: false,
- width: 150
-},
-{
- label: "入职时间",
- prop: "rtime",
- display: false
-},
-{
- label: "保安公司名称",
- searchLabelWidth: "110",
- // prop: "deptName",
- prop: "deptId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- props: {
- label: "title",
- value: "id",
+ {
+ label: "民族",
+ prop: "nation",
+ display: false
},
- slot: true,
- searchSpan: 6,
- display: false,
- search: true,
- width: 260
-},
-{
- label: "是否持证",
- prop: "hold",
- slot: true,
- display: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey"
+ {
+ label: "出生日期",
+ prop: "birthday",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ display: false
},
- type: "select",
- rules: [{
- required: true,
- message: "请选择",
- trigger: "blur"
- }],
-},
-// {
-// label: "入职时间",
-// prop: "rtime",
-// type: "datetime",
-// format: "yyyy-MM-dd",
-// valueFormat: "yyyy-MM-dd",
-// searchRange: true,
-// searchSpan: 6,
-// hide: true,
-// addDisplay: false,
-// editDisplay: false,
-// viewDisplay: false,
-// search: true,
-// rules: [{
-// required: true,
-// message: "请输入时间",
-// trigger: "blur"
-// }]
-// },
-{
- label: "在职状态",
- prop: "status",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
- props: {
- label: "dictValue",
- value: "dictKey"
+ {
+ label: "学历",
+ prop: "education",
+ display: false,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ type: "select",
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请选择学历",
+ trigger: "blur"
+ }],
},
- dataType: "number",
- display: false,
- searchSpan: 4,
- search: true,
- rules: [{
- required: true,
- message: "请选择在职状态",
- trigger: "blur"
- }]
-},
+ {
+ label: "联系电话",
+ prop: "phone",
+ display: false
+ },
+ {
+ label: "邮箱",
+ prop: "email",
+ display: false,
+ width: 150
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ display: false
+ },
+ {
+ label: "保安公司名称",
+ searchLabelWidth: "110",
+ // prop: "deptName",
+ prop: "deptId",
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ slot: true,
+ searchSpan: 6,
+ display: false,
+ search: true,
+ width: 260
+ },
+ {
+ label: "是否持证",
+ prop: "hold",
+ slot: true,
+ display: false,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ type: "select",
+ rules: [{
+ required: true,
+ message: "请选择",
+ trigger: "blur"
+ }],
+ },
+ // {
+ // label: "入职时间",
+ // prop: "rtime",
+ // type: "datetime",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // searchRange: true,
+ // searchSpan: 6,
+ // hide: true,
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: false,
+ // search: true,
+ // rules: [{
+ // required: true,
+ // message: "请输入时间",
+ // trigger: "blur"
+ // }]
+ // },
+ {
+ label: "在职状态",
+ prop: "status",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ display: false,
+ searchSpan: 4,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择在职状态",
+ trigger: "blur"
+ }]
+ },
]
\ No newline at end of file
diff --git a/src/views/securityEquipment/car.js b/src/views/securityEquipment/car.js
index dbcc8d7..e01794d 100644
--- a/src/views/securityEquipment/car.js
+++ b/src/views/securityEquipment/car.js
@@ -1,12 +1,10 @@
-var DIC = [
- {
- label: '招聘中',
- value: 1,
- }, {
- label: '停止招聘',
- value: 2,
- }
-]
+var DIC = [{
+ label: '招聘中',
+ value: 1,
+}, {
+ label: '停止招聘',
+ value: 2,
+}]
export var column = [
// {
@@ -19,7 +17,7 @@
{
label: "车牌号码",
prop: "carNumber",
- searchSpan: 4,
+ searchSpan: 3,
search: true,
rules: [{
required: true,
@@ -30,14 +28,21 @@
{
label: "号码种类",
prop: "numberType",
- searchSpan: 4,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=carNumberType",
+ search: true,
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ searchSpan: 3,
rules: [{
required: true,
message: "请输入号码种类",
trigger: "blur"
}],
- search: true,
- },//上面不显示
+ }, //上面不显示
{
label: "车辆类型",
prop: "carType",
@@ -45,17 +50,23 @@
required: true,
message: "请输入车辆类型",
trigger: "blur"
- }]
- // search: true,
- }
- , {
+ }],
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=carType",
+ search: true,
+ searchSpan: 3,
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ }, {
label: "车辆型号",
prop: "mode",
// search: true,
- searchSpan: 4,
width: 110,
overHidden: true,
- search: true,
+ // search: true,
rules: [{
required: true,
message: "请输入车辆型号",
@@ -83,13 +94,7 @@
label: "title",
value: "id"
},
- // search: true,
type: "select",
- // rules: [{
- // required: true,
- // message: "请选择学历",
- // trigger: "blur"
- // }],
},
{
label: "责任人",
@@ -117,7 +122,6 @@
{
label: "出厂日期",
prop: "dateForProduction",
- // search: true,
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
@@ -138,9 +142,9 @@
// search: true,
rules: [{
required: true,
- message: "请输入环保标志 ,国IV",
+ message: "请输入环保标志(如:国IV)",
trigger: "blur"
}],
searchSpan: 4,
}
-]
+]
\ No newline at end of file
diff --git a/src/views/securityEquipment/car.vue b/src/views/securityEquipment/car.vue
index f742e84..88a517e 100644
--- a/src/views/securityEquipment/car.vue
+++ b/src/views/securityEquipment/car.vue
@@ -26,6 +26,7 @@
>删 除
</el-button>
<el-button
+ style="display:none"
type="success"
size="small"
plain
@@ -113,6 +114,7 @@
menuWidth: 160,
align: "center",
selection: true,
+ labelWidth:110,
column: column,
},
};
@@ -257,9 +259,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- params["deptId"] = this.fromDeptId;
// console.log(params.deptId);
- if (params.deptId != undefined) {
+ if (this.fromDeptId != undefined) {
+ params["deptId"] = this.fromDeptId;
this.option.column[4].search = false;
this.option.column[4].hide = true;
this.option.column[4].addDisplay = false;
diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index 55e58a7..af74a6c 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -1,15 +1,12 @@
-var DIC = [
- {
- label: '招聘中',
- value: 1,
- }, {
- label: '停止招聘',
- value: 2,
- }
-]
+var DIC = [{
+ label: '招聘中',
+ value: 1,
+}, {
+ label: '停止招聘',
+ value: 2,
+}]
-export var column = [
- {
+export var column = [{
label: "id",
prop: "id",
hide: true,
@@ -29,36 +26,14 @@
}]
},
{
- label: "编号",
- prop: "number",
- searchSpan: 4,
- rules: [{
- required: true,
- message: "请输入编号",
- trigger: "blur"
- }],
- search: true,
- },//上面不显示
- {
- label: "规格",
- prop: "specifications",
- rules: [{
- required: true,
- message: "请输入规格",
- trigger: "blur"
- }]
- // search: true,
- },
- {
label: "型号",
prop: "mode",
- width: 70,
rules: [{
- required: true,
- message: "请输入型号",
- trigger: "blur"
- }]
- // search: true,
+ required: true,
+ message: "请输入型号",
+ trigger: "blur"
+ }]
+ // search: true,
},
{
label: "数量",
@@ -67,38 +42,30 @@
required: true,
message: "请输入数量",
trigger: "blur"
- }]
+ }],
// search: true,
+ width: 70,
},
{
label: "所属保安公司",
prop: "deptId",
- searchSpan: 4,
+ searchSpan: 6,
searchLabelWidth: 110,
rules: [{
required: true,
- message: "请输入组织机构",
+ message: "请输入所属保安公司",
trigger: "blur"
}],
hide: false,
search: true,
overHidden: true,
- // addDisplay: true,
- // editDisplay: true,
- // viewDisplay: true,
- // searchSpan: 4,
dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
label: "title",
value: "id"
},
- // search: true,
type: "select",
- // rules: [{
- // required: true,
- // message: "请选择学历",
- // trigger: "blur"
- // }],
+ width: 250,
},
{
label: "负责人",
@@ -138,4 +105,4 @@
trigger: "blur"
}]
}
-]
+]
\ No newline at end of file
diff --git a/src/views/securityEquipment/equipments.vue b/src/views/securityEquipment/equipments.vue
index 2f488f0..2f316cf 100644
--- a/src/views/securityEquipment/equipments.vue
+++ b/src/views/securityEquipment/equipments.vue
@@ -26,6 +26,7 @@
>删 除
</el-button>
<el-button
+ style="display:none"
type="success"
size="small"
plain
@@ -114,6 +115,7 @@
align: "center",
selection: true,
column: column,
+ labelWidth:110,
},
};
},
@@ -180,6 +182,7 @@
// }
},
searchChange(params, done) {
+ params = JSON.parse(JSON.stringify(params));
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
@@ -258,9 +261,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- params["deptId"] = this.fromDeptId;
// console.log(params.deptId);
- if (params.deptId != undefined) {
+ if (this.fromDeptId != undefined) {
+ params["deptId"] = this.fromDeptId;
this.option.column[6].search = false;
this.option.column[6].hide = true;
this.option.column[6].addDisplay = false;
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index ce39f63..cc2ae69 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -1,15 +1,12 @@
-var DIC = [
- {
- label: '招聘中',
- value: 1,
- }, {
- label: '停止招聘',
- value: 2,
- }
-]
+var DIC = [{
+ label: '招聘中',
+ value: 1,
+}, {
+ label: '停止招聘',
+ value: 2,
+}]
-export var column = [
- {
+export var column = [{
label: "id",
prop: "id",
hide: true,
@@ -42,23 +39,23 @@
trigger: "blur"
}],
search: true,
- },//上面不显示
+ }, //上面不显示
{
label: "公务用枪编号",
prop: "cardNumber",
labelWidth: 160,
searchLabelWidth: 110,
rules: [{
- required: true,
- message: "请输入公务用枪编号",
- trigger: "blur"
- }]
- // search: true,
+ required: true,
+ message: "请输入公务用枪编号",
+ trigger: "blur"
+ }]
+ // search: true,
},
{
label: "枪型",
prop: "gunMode",
- searchSpan: 4,
+ // searchSpan: 4,
width: 70,
labelWidth: 160,
rules: [{
@@ -66,7 +63,7 @@
message: "请输入枪型",
trigger: "blur"
}],
- search: true,
+ // search: true,
},
{
label: "所属保安公司",
@@ -132,4 +129,4 @@
trigger: "blur"
}]
}
-]
+]
\ No newline at end of file
diff --git a/src/views/securityEquipment/gun.vue b/src/views/securityEquipment/gun.vue
index 201dc21..7bc403c 100644
--- a/src/views/securityEquipment/gun.vue
+++ b/src/views/securityEquipment/gun.vue
@@ -59,6 +59,7 @@
align: "center",
border: true,
selection: true,
+ labelWidth:110,
column: column,
},
};
@@ -189,9 +190,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- params["deptId"] = this.fromDeptId;
// console.log(params.deptId);
- if (params.deptId != undefined) {
+ if (this.fromDeptId != undefined) {
+ params["deptId"] = this.fromDeptId;
this.option.column[5].search = false;
this.option.column[5].hide = true;
this.option.column[5].addDisplay = false;
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index e3ac2a2..a6eca98 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -83,7 +83,7 @@
prop: "jurisdiction",
// multiple: true,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index ff04663..6c765e7 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -617,7 +617,7 @@
prop: "jurisdiction",
// multiple: true,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
diff --git a/src/views/securityGuard/securityGuardOnce.vue b/src/views/securityGuard/securityGuardOnce.vue
index db4fe2a..76c2dd1 100644
--- a/src/views/securityGuard/securityGuardOnce.vue
+++ b/src/views/securityGuard/securityGuardOnce.vue
@@ -516,7 +516,7 @@
prop: "jurisdiction",
// multiple: true,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
diff --git a/src/views/securityGuard/securityGuardRegistration.vue b/src/views/securityGuard/securityGuardRegistration.vue
index b042061..624bf0e 100644
--- a/src/views/securityGuard/securityGuardRegistration.vue
+++ b/src/views/securityGuard/securityGuardRegistration.vue
@@ -161,7 +161,7 @@
prop: "jurisdiction",
// multiple: true,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
diff --git a/src/views/securityMan/data.js b/src/views/securityMan/data.js
index 030cab0..0c0d2fc 100644
--- a/src/views/securityMan/data.js
+++ b/src/views/securityMan/data.js
@@ -76,7 +76,7 @@
prop: "jurisdiction",
// multiple: true,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
diff --git a/src/views/securityUnitChild/data.js b/src/views/securityUnitChild/data.js
index 6345cbd..fc01ddc 100644
--- a/src/views/securityUnitChild/data.js
+++ b/src/views/securityUnitChild/data.js
@@ -1,16 +1,13 @@
-var DIC = [
- {
- label: '招聘中',
- value: 1,
- }, {
- label: '停止招聘',
- value: 2,
- }
-]
-var w = 160
- , s = 12;
-export var column = [
- {
+var DIC = [{
+ label: '招聘中',
+ value: 1,
+}, {
+ label: '停止招聘',
+ value: 2,
+}]
+var w = 160,
+ s = 12;
+export var column = [{
label: "",
labelWidth: 20,
type: 'title',
@@ -137,7 +134,7 @@
prop: "region",
// multiple: true,
type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
value: "id",
@@ -147,13 +144,11 @@
width: 110,
overHidden: true,
disabled: true,
- rules: [
- {
- required: false,
- message: "请选择所属辖区",
- trigger: "click",
- },
- ],
+ rules: [{
+ required: false,
+ message: "请选择所属辖区",
+ trigger: "click",
+ }, ],
},
{
label: "所属行业",
@@ -183,8 +178,7 @@
}
]
-export var column1 = [
- {
+export var column1 = [{
label: "id",
prop: "id",
hide: true,
@@ -242,8 +236,7 @@
},
]
-export var column2 = [
- {
+export var column2 = [{
label: "统一社会信用代码",
prop: "creditcode",
hide: true,
@@ -289,4 +282,4 @@
// labelWidth: w,
// span: s,
// }
-]
+]
\ No newline at end of file
diff --git a/src/views/trainApply/index.vue b/src/views/trainApply/index.vue
index 758fc16..231f28f 100644
--- a/src/views/trainApply/index.vue
+++ b/src/views/trainApply/index.vue
@@ -40,21 +40,20 @@
>导出
</el-button>
<el-button
- style="display:none"
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport"
- >导入
- </el-button>
- <el-button
type="warning"
size="small"
plain
- icon="el-icon-download"
+ icon="el-icon-receiving"
@click="handleExport"
>清册打印
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleImport"
+ >清册导入
</el-button>
</template>
@@ -117,7 +116,7 @@
export default {
data () {
-
+ var examId = this.$route.query.id;
return {
excelBox: false,
questionBankOption: {
@@ -447,7 +446,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/trainingRegistration/import-trainingRegistration",
+ action: "/api/trainingRegistration/import-trainingRegistration?examId="+examId,
},
{
label: "模板下载",
@@ -658,7 +657,7 @@
},
handleTemplate() {
window.open(
- `/api/apply/export-template`
+ `/api/trainingRegistration/export-template`
);
},
uploadAfter(res, done, loading, column) {
diff --git a/src/views/trainExam/index.vue b/src/views/trainExam/index.vue
index a789975..cfd1e6a 100644
--- a/src/views/trainExam/index.vue
+++ b/src/views/trainExam/index.vue
@@ -53,6 +53,7 @@
<template slot="menuLeft">
<el-button
+ style="display:none"
type="danger"
size="small"
icon="el-icon-delete"
@@ -144,8 +145,9 @@
border: true, //liu
index: true,
stripe: true,
- viewBtn: true,
- addBtn: true,
+ viewBtn: false,
+ addBtn: false,
+ editBtn: false,
selection: true,
excelBtn: false,
menuWidth: 230,
@@ -154,14 +156,14 @@
},
questionBankOption: {
// 操作栏多余按钮去除
- delBtn: true,
- editBtn: true,
- addBtn: true,
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
selection: true,
menu: true,
// 导出按钮
excelBtn: false,
- viewBtn: true,
+ viewBtn: false,
// title: '题库',
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index d105a65..95027d0 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -151,7 +151,7 @@
search: true,
searchSpan: 4,
slot: true,
- viewDisplay:false,
+ viewDisplay:true,
// 表单新增时是否禁止
addDisabled: false,
// 表单新增时是否可见
@@ -159,9 +159,10 @@
// 表单新增时是否为查看模式
addDetail: false,
// 表单编辑时是否禁止
- editDisabled: false,
+ editDisabled: true,
+ viewDisabled: true,
// 表单编辑时是否可见
- editDisplay: false,
+ editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
@@ -171,7 +172,8 @@
trigger: "blur",
},
],
- overHidden:true,
+ width:250,
+ // overHidden:true,
},
{
label: "用户名",
@@ -198,6 +200,7 @@
trigger: "blur",
},
],
+ width:160,
},
{
label: "所属公司",
@@ -229,6 +232,7 @@
trigger: "blur",
},
],
+ width:230,
},
{
label: "考试开始时间",
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index dde7ba1..adb0a7d 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -149,7 +149,7 @@
// 表单新增时是否为查看模式
addDetail: false,
// 表单编辑时是否禁止
- editDisabled: false,
+ editDisabled: true,
// 表单编辑时是否可见
editDisplay: false,
// 表单编辑时是否为查看模式
@@ -161,7 +161,8 @@
trigger: "blur",
},
],
- overHidden:true,
+ // overHidden:true,
+ width:250,
},
{
label: "用户名",
@@ -188,6 +189,7 @@
trigger: "blur",
},
],
+ width:160,
},
{
label: "所属公司",
@@ -219,6 +221,7 @@
trigger: "blur",
},
],
+ width:230,
},
{
label: "考试开始时间",
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index 3980661..1c99a65 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -47,7 +47,7 @@
icon="el-icon-folder-checked"
v-if="permission.trainingRegistration_import"
@click="handleImport"
- >清册导入
+ >批量导入
</el-button>
</template>
<template slot-scope="{ type, size, row }" slot="menu">
diff --git a/src/views/workreport/workreport.vue b/src/views/workreport/workreport.vue
index 4a9c1dd..a955138 100644
--- a/src/views/workreport/workreport.vue
+++ b/src/views/workreport/workreport.vue
@@ -239,20 +239,25 @@
).content.user_id;
var that = this;
- getDept(this.deptId).then((res) => {
- var deptCategory = res.data.data.deptCategory;
- deptCategory == 1
- ? (that.deptCategory = true)
- : (that.deptCategory = false);
+ // getDept(this.deptId).then((res) => {
+ // var deptCategory = res.data.data.deptCategory;
+ // deptCategory == 1
+ // ? (that.deptCategory = true)
+ // : (that.deptCategory = false);
+
+
//1:保安公司 2：公安 3：培训公司
- if(deptCategory == 1 || deptCategory == 3){
+ if(this.userInfo.role_name=="保安公司管理员"
+ || this.userInfo.role_name=="保安"
+ || this.userInfo.role_name=="未持证保安"
+ ){
const column = that.findObject(that.option.column, "category");
column.dicUrl = "/api/blade-system/dict-biz/dictionary?code=securityWorkReportCategory";
const columnReceivedIds = that.findObject(that.option.column, "receivedIds");
columnReceivedIds.dicUrl = "/api/blade-system/dept/lazy-tree-users?type={{key}}&deptId="+that.userInfo.dept_id;
}
- if(deptCategory == 2){
+ if(this.userInfo.role_name=="公安管理员"){
const column = that.findObject(that.option.column, "category");
column.dicUrl = "/api/blade-system/dict-biz/dictionary?code=workReportCategory";
const columnReceivedIds = that.findObject(that.option.column, "receivedIds");
@@ -272,7 +277,7 @@
this.loading = false;
this.selectionClear();
});
- });
+ // });
},
},
};
diff --git a/vue.config.js b/vue.config.js
index d505996..9a353fe 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,43 +1,43 @@
module.exports = {
- //路径前缀
- publicPath: "/",
- lintOnSave: true,
- productionSourceMap: false,
- chainWebpack: (config) => {
- //忽略的打包文件
- config.externals({
- 'vue': 'Vue',
- 'vue-router': 'VueRouter',
- 'vuex': 'Vuex',
- 'axios': 'axios',
- 'element-ui': 'ELEMENT',
- });
- const entry = config.entry('app');
- entry.add('babel-polyfill').end();
- entry.add('classlist-polyfill').end();
- entry.add('@/mock').end();
- },
- css: {
- extract: { ignoreOrder: true }
- },
- //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理。
- devServer: {
- port: 1888,
- // disableHostCheck: true,
- proxy: {
- '/api': {
- // 本地服务接口地址
- // target: 'http://localhost:81',
- target: 'http://192.168.0.114:81',//钟日健W
- // target: 'http://localhost:81',//原W
- // target: 'http://192.168.0.108:81',//原W
- // target: 'http://192.168.0.109:81',//唐N
- //远程演示服务地址,可用于直接启动项目
- ws: true,
- pathRewrite: {
- '^/api': '/'
+ //路径前缀
+ publicPath: "/",
+ lintOnSave: true,
+ productionSourceMap: false,
+ chainWebpack: (config) => {
+ //忽略的打包文件
+ config.externals({
+ 'vue': 'Vue',
+ 'vue-router': 'VueRouter',
+ 'vuex': 'Vuex',
+ 'axios': 'axios',
+ 'element-ui': 'ELEMENT',
+ });
+ const entry = config.entry('app');
+ entry.add('babel-polyfill').end();
+ entry.add('classlist-polyfill').end();
+ entry.add('@/mock').end();
+ },
+ css: {
+ extract: { ignoreOrder: true }
+ },
+ //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理。
+ devServer: {
+ port: 1888,
+ // disableHostCheck: true,
+ proxy: {
+ '/api': {
+ // 本地服务接口地址
+ // target: 'http://localhost:81',
+ // target: 'http://192.168.0.114:81',//钟日健W
+ target: 'http://localhost:81', //原W
+ // target: 'http://192.168.0.108:81',//原W
+ // target: 'http://192.168.0.109:81',//唐N
+ //远程演示服务地址,可用于直接启动项目
+ ws: true,
+ pathRewrite: {
+ '^/api': '/'
+ }
+ }
}
- }
}
- }
-};
+};
\ No newline at end of file
--
Gitblit v1.9.3