From 92d0cf73df170131eba84490d875bc954eb7a708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 20:41:58 +0800
Subject: [PATCH] 报名考试修改
---
src/views/securityGuard/securityGuard.vue | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 10 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 0eeaef8..ed4b4c3 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1,5 +1,5 @@
<template>
- <el-row>
+ <el-row class="securityGuard">
<el-col :span="0" style="display: none">
<div class="box">
<el-scrollbar>
@@ -38,6 +38,14 @@
@on-load="onLoad"
>
<template slot="menuLeft">
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport1"
+ >批量导入
+ </el-button>
<el-button
type="danger"
style="display: none"
@@ -208,6 +216,24 @@
</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>
@@ -254,6 +280,34 @@
}
};
return {
+ excelBox1: 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/examSubjectChoices/import-examSubject",
+ },
+ {
+ label: "模板下载",
+ prop: "excelTemplate",
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
+
form: {},
search: {},
roleBox: false,
@@ -322,10 +376,12 @@
searchMenuSpan: 6,
border: false,
stripe: true,
+ align: "center",
index: true,
delBtnText: "注销",
selection: true,
viewBtn: true,
+ defaultExpandAll: true,
//dialogType: 'drawer',
dialogClickModal: false,
column: securityFormPageColumn,
@@ -406,6 +462,24 @@
],
},
{
+ 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",
},
@@ -414,7 +488,7 @@
prop: "name",
},
{
- label: "所属行政区",
+ label: "所属辖区",
prop: "jurisdiction",
// multiple: true,
type: "tree",
@@ -428,7 +502,7 @@
rules: [
{
required: true,
- message: "请选择所属行政区",
+ message: "请选择所属辖区",
trigger: "click",
},
],
@@ -486,6 +560,11 @@
trigger: "blur",
},
],
+ },
+ {
+ label: "保安员证编号",
+ prop: "securitynumber",
+ hide: true,
},
{
label: "手机号码",
@@ -584,6 +663,8 @@
label: "生日",
type: "date",
prop: "birthday",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
},
],
},
@@ -844,6 +925,19 @@
}
},
methods: {
+ handleImport1() {
+ this.excelBox1 = true;
+ },
+ uploadAfter1(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox1 = false;
+ // this.refreshChange();
+ done();
+ },
+ handleTemplate1() {
+ window.open(`/api/examSubjectChoices/export-template`);
+ },
+
//行点击事件
rowClick(row) {
this.$router.push({
@@ -902,18 +996,18 @@
entryTime: item.entryTime,
name: row.realName,
leaving: item.leaving,
- cardid: row.cardid,
+ securityid: row.id,
post: item.post,
responsibilities: item.responsibilities,
};
userPractitionersList.push(info);
});
}
- var IdCardNo = row.cardid;
+ var IdCardNo = row.id;
add(row).then(
() => {
const experience = {
- cardid: IdCardNo,
+ securityid: IdCardNo,
userPractitionersInfo: userPractitionersList,
};
//新增从业信息
@@ -952,20 +1046,20 @@
entryTime: item.entryTime,
name: row.realName,
leaving: item.leaving,
- cardid: row.cardid,
+ securityid: row.id,
post: item.post,
responsibilities: item.responsibilities,
};
userPractitionersList.push(info);
});
}
- var IdCardNo = row.cardid;
+ var IdCardNo = row.id;
//值替换，education 放在页面会卡死
row.education = row.education1;
update(row).then(
() => {
const experience = {
- cardid: IdCardNo,
+ securityid: IdCardNo,
userPractitionersInfo: userPractitionersList,
};
//更新从业信息
@@ -1140,7 +1234,7 @@
}
var userInfo = res.data.data;
//获取用户从业信息
- getUserPractitionersInfo(userInfo.cardid).then((res1) => {
+ getUserPractitionersInfo(userInfo.id).then((res1) => {
that.form.UserPractitionersInfo = res1.data.data;
});
});
@@ -1167,6 +1261,10 @@
roleId: this.roleId,
...this.query,
};
+ 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) => {
--
Gitblit v1.9.3