From e2da516378bfbb1661177fecff15b9e71feeff9c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Jul 2021 10:57:19 +0800
Subject: [PATCH] 1.用户注册页面调整，删除修改为注销 2.导入导出租户修改为保安单位 3.新增保安入职登记页面
---
src/router/views/index.js | 54 +++++--
src/views/securityGuard/securityGuardRegistration.vue | 342 ++++++++++++++++++++++++++++++++++++++++++++++++
src/views/system/user.vue | 10 +
3 files changed, 389 insertions(+), 17 deletions(-)
diff --git a/src/router/views/index.js b/src/router/views/index.js
index aec0d81..1d009f0 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -11,7 +11,7 @@
i18n: 'dashboard'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/wel/index')
+ import ( /* webpackChunkName: "views" */ '@/views/wel/index')
}, {
path: 'dashboard',
name: '控制台',
@@ -20,7 +20,7 @@
menu: false,
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
+ import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
}]
}, {
path: '/test',
@@ -33,7 +33,7 @@
i18n: 'test'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/test')
+ import ( /* webpackChunkName: "views" */ '@/views/util/test')
}]
}, {
path: '/dict-horizontal',
@@ -46,7 +46,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
}]
}, {
path: '/dict-vertical',
@@ -59,7 +59,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
}]
}, {
path: '/info',
@@ -72,7 +72,7 @@
i18n: 'info'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+ import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
}]
}, {
path: '/work/process/leave',
@@ -85,7 +85,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
}, {
path: 'handle/:taskId/:processInstanceId/:businessId',
name: '处理请假流程',
@@ -93,7 +93,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
}, {
path: 'detail/:processInstanceId/:businessId',
name: '请假流程详情',
@@ -101,7 +101,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
}, {
path: '/securityAnalysis',
@@ -114,7 +114,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
+ import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
}]
}, {
path: '/recruitmentManagement',
@@ -127,7 +127,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
+ import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
}]
}, {
path: '/securityUnit',
@@ -140,7 +140,33 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
+ import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
+ }]
+}, {
+ path: '/securityGuard',
+ component: Layout,
+ redirect: '/securityGuard/securityGuardRegistration',
+ children: [{
+ path: 'index',
+ name: '保安员入职信息登记',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardRegistration')
+ }]
+}, {
+ path: '/securityGuard',
+ component: Layout,
+ redirect: '/securityGuard/securityGuard',
+ children: [{
+ path: 'index',
+ name: '保安员查询',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
}]
}, {
path: '/securityGuard',
@@ -153,7 +179,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
+ import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
}]
}, {
path: '/dispatch',
@@ -166,6 +192,6 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/dispatch/index')
+ import ( /* webpackChunkName: "views" */ '@/views/dispatch/index')
}]
}]
\ No newline at end of file
diff --git a/src/views/securityGuard/securityGuardRegistration.vue b/src/views/securityGuard/securityGuardRegistration.vue
new file mode 100644
index 0000000..76a2fa4
--- /dev/null
+++ b/src/views/securityGuard/securityGuardRegistration.vue
@@ -0,0 +1,342 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-05 16:31:54
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-07-07 18:01:57
+ * menu-name 保安详细资料
+ */
+<template>
+ <el-row class="morpheus-box">
+ <el-col :span="24">
+ <el-card>
+ <div class="card-body">
+ <el-tabs v-model="activeName"
+ @tab-click="handleClick">
+ <el-tab-pane label="基本信息"
+ name="first">
+
+ <el-form :model="form"
+ label-position="right"
+ size="mini"
+ label-width="100px">
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="姓名">
+ <el-input disabled="true"
+ v-model="form.realName"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="性别">
+ <el-input disabled="true"
+ :value="form.sex == 1 ? '男' : '女'"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-col span="12">
+ <el-form-item label="电子邮箱">
+ <el-input disabled="true"
+ v-model="form.emails"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="联系方式">
+ <el-input disabled="true"
+ v-model="form.phone"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="身高">
+ <el-input disabled="true"
+ v-model="form.height"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="联系地址">
+ <el-input disabled="true"
+ v-model="form.address"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+
+ <el-col span="12">
+ <el-form-item label="籍贯">
+ <el-input disabled="true"
+ v-model="form.nativePlace"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="户口所在地">
+ <el-input disabled="true"
+ v-model="form.registered"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="政治面貌">
+ <el-input disabled="true"
+ v-model="form.politicaloutlook"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+
+ <el-form-item label="身份证号">
+ <el-input disabled="true"
+ v-model="form.cardid"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+
+ <el-form-item label="所属角色">
+ <el-input disabled="true"
+ v-model="form.roleName"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="所属公司">
+ <el-input disabled="true"
+ v-model="form.deptName"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="入职时间">
+ <el-input disabled="true"
+ v-model="form.rtime"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="是否在职">
+ <el-input disabled="true"
+ :value="form.sex == 1 ? '是' : '否'"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ </el-form>
+
+ </el-tab-pane>
+ <el-tab-pane label="人员表现"
+ name="second">
+ <el-table :data="manifestationData"
+ style="width: 100%">
+
+ <el-table-column prop="name"
+ label="姓名"
+ align="center">
+ </el-table-column>
+
+ <el-table-column prop="securityid"
+ label="身份证号"
+ align="center">
+ </el-table-column>
+
+ <el-table-column prop="workingattitude"
+ align="center"
+ label="工作态度">
+ </el-table-column>
+
+ <el-table-column prop="workingability"
+ align="center"
+ label="工作能力">
+ </el-table-column>
+
+ <el-table-column prop="achievements"
+ align="center"
+ label="工作成效">
+ </el-table-column>
+
+ <el-table-column prop="score"
+ align="center"
+ label="评分">
+ </el-table-column>
+
+ <el-table-column prop="time"
+ align="center"
+ label="时间">
+ </el-table-column>
+
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="派遣记录"
+ name="third">
+ <el-table :data="dispatchData"
+ style="width: 100%">
+
+ <el-table-column prop="name"
+ label="姓名"
+ align="center">
+ </el-table-column>
+
+ <el-table-column prop="cardid"
+ label="身份证号"
+ align="center">
+ </el-table-column>
+
+ <el-table-column prop="dispatcher"
+ align="center"
+ label="派遣人">
+ </el-table-column>
+
+ <el-table-column prop="dispatchertime"
+ align="center"
+ label="派遣时间">
+ </el-table-column>
+
+ <el-table-column prop="dispatcheraddress"
+ align="center"
+ label="派遣地址">
+ </el-table-column>
+
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="相关荣誉"
+ name="fourth">
+ <el-table :data="honorchData"
+ style="width: 100%">
+
+ <el-table-column prop="name"
+ label="姓名"
+ align="center">
+ </el-table-column>
+
+ <el-table-column prop="cardid"
+ label="身份证号"
+ align="center">
+ </el-table-column>
+
+ <el-table-column prop="honor"
+ align="center"
+ label="荣誉">
+ </el-table-column>
+
+ <el-table-column prop="honortime"
+ align="center"
+ label="获取时间">
+ </el-table-column>
+
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+
+ </el-card>
+ </el-col>
+ </el-row>
+</template>
+
+<script>
+// import {
+// manifestationList,
+// dispatchList,
+// honorchList
+// } from "@/api/management/peopleDetails";
+
+
+export default {
+ data () {
+ return {
+ activeName: 'first',
+ form: {},
+ manifestationData: [],
+ dispatchData: [],
+ honorchData: [],
+ }
+ },
+ created () {
+ 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)
+
+ }
+
+
+ this.form = this.$route.query;
+
+ },
+ mounted () {
+
+ // this.$store.state.tags.tag.label = '保安详细资料'
+
+ },
+ methods: {
+ handleClick (tab) {
+ if (tab.index == 1) {
+ this.getManifestationData()
+ } else if (tab.index == 2) {
+ this.getDispatchData()
+ } else if (tab.index == 3) {
+ this.getHonorchData()
+ }
+ },
+ getManifestationData () {
+ manifestationList(this.form.cardid).then(res => {
+ this.manifestationData = res.data.data.records
+ this.manifestationData.forEach(item => {
+ item.name = this.form.realName
+ item.time = item.time.substring(0, 10)
+ })
+ })
+ },
+ getDispatchData () {
+ dispatchList(this.form.cardid).then(res => {
+
+ this.dispatchData = res.data.data.records
+
+ })
+ },
+ getHonorchData () {
+ honorchList(this.form.cardid).then(res => {
+
+ this.honorchData = res.data.data.records
+
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index a992a28..c38dea5 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -36,7 +36,7 @@
plain
icon="el-icon-delete"
v-if="permission.user_delete"
- @click="handleDelete">删 除
+ @click="handleDelete">注 销
</el-button>
<el-button type="info"
size="small"
@@ -260,6 +260,7 @@
searchMenuSpan: 6,
border: true,
index: true,
+ delBtnText:'注销',
selection: true,
viewBtn: true,
//dialogType: 'drawer',
@@ -324,6 +325,7 @@
group: [
{
label: '基础信息',
+ labelWidth:"110",
prop: 'baseInfo',
icon: 'el-icon-user-solid',
column: [
@@ -393,6 +395,7 @@
},
{
label: '详细信息',
+ labelWidth:"110",
prop: 'detailInfo',
icon: 'el-icon-s-order',
column: [
@@ -468,6 +471,7 @@
},
{
label: '职责信息',
+ labelWidth:"110",
prop: 'dutyInfo',
icon: 'el-icon-s-custom',
column: [
@@ -766,7 +770,7 @@
});
},
rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
+ this.$confirm("确定将选择用户注销?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@@ -805,7 +809,7 @@
this.$message.warning("请选择至少一条数据");
return;
}
- this.$confirm("确定将选择数据删除?", {
+ this.$confirm("确定将选择用户注销?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
--
Gitblit v1.9.3