From 06963d397d023ba076508808c8a0ec55da85067e Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期三, 10 三月 2021 13:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/Informationinput.vue | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 3cfebbe..9105e04 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -101,7 +101,7 @@
<!-- </el-table-column>-->
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="50" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
<el-table-column show-overflow-tooltip prop="empType" label="员工类别" width="80" :formatter="empTypeFormat" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
@@ -149,7 +149,7 @@
</template>
</el-table-column>
<el-table-column prop="empNumb" label="编号" width="100" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column prop="empName" label="姓名" width="100" />
<el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
<el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
<el-table-column prop="beginDate" label="开始日期" width="120" />
@@ -183,8 +183,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
@@ -230,8 +230,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="150" />
+ <el-table-column prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
@@ -262,8 +262,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
@@ -296,9 +296,9 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="120" />
<el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="120" />
@@ -329,9 +329,9 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
@@ -359,8 +359,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" />
@@ -390,8 +390,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
@@ -423,8 +423,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="名称" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
@@ -469,7 +469,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
@@ -516,7 +516,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -568,7 +568,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="120" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -598,7 +598,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="180" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="120" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -625,14 +625,14 @@
<el-row>
<el-col span="24">
<el-form-item label="员工模板下载" prop="region">
- <a href="http://120.24.23.155:8000/员工信息.xls" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
+ <a :href="downloadEmpExcel" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
<span style="margin-left: 100px;">点击下载</span>
</el-form-item>
<el-form-item label="导入员工">
<el-upload
ref="upload"
class="upload-demo"
- action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
+ :action="uploadEmpExcel"
accept=".xls, .xlsx, .excel"
:headers="headers()"
:on-success="importHandleAvatarSuccess"
@@ -2163,6 +2163,8 @@
components: { Treeselect, Pagination },
data() {
return {
+ downloadEmpExcel: pages.downloadEmpExcel,
+ uploadEmpExcel: pages.uploadEmpExcel,
defaultImg: require('../../assets/avatar/20180414165936.jpg'),
baseicInformationForm: {},
dialogShowDryg: false,
@@ -2183,7 +2185,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
@@ -3117,6 +3119,7 @@
this.initDept()
this.thisShowIndex = 1
this.isShow(false, 0)
+ this.initJob()
},
methods: {
importHandleAvatarError() {
@@ -3126,7 +3129,7 @@
})
},
importHandleAvatarSuccess(res, file) {
- if (res.data === null) {
+ if (res.data === null || res.data.length === 0) {
this.$notify({
title: '成功',
message: '导入成功!',
@@ -3387,6 +3390,11 @@
resetDeptTree() {
this.$refs.deptTree.setCheckedKeys([])
},
+ initJob() {
+ this.$get('system/position/dicJob').then((r) => {
+ this.restaurJob = r.data.data
+ })
+ },
butDelete() {
let selected
switch (this.thisShowIndex) {
@@ -3617,7 +3625,7 @@
}
break
case 11:
- selected = this.$refs.occupationalTable.selection
+ selected = this.$refs.laborTroubleTable.selection
if (selected.length > 0) {
const delIds = []
selected.forEach((j) => {
--
Gitblit v1.8.0