From 1eb2f6fbf05b7cd22078002bda353a8b0e5bee4d Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 02 三月 2021 22:21:31 +0800
Subject: [PATCH] 提交 bug
---
src/views/user/archivesEdit.vue | 1203 +++++++++++++++++++++++++++++++++++++++++++++-----------
src/views/dashboard/tgUser.vue | 7
2 files changed, 963 insertions(+), 247 deletions(-)
diff --git a/src/views/dashboard/tgUser.vue b/src/views/dashboard/tgUser.vue
index a78fc18..991805e 100644
--- a/src/views/dashboard/tgUser.vue
+++ b/src/views/dashboard/tgUser.vue
@@ -9,7 +9,7 @@
>
<div class="app-container">
<div class="filter-container" style="margin-left: -340px;">
- <el-input v-model="queryParams.name" placeholder="姓名" class="filter-item search-item" />
+ <el-input v-model="queryParams.name" placeholder="姓名/身份证号/护卫点/员工编号" class="filter-item search-item" />
<el-button class="filter-item" type="primary" @click="search">
{{ $t('table.search') }}
</el-button>
@@ -24,7 +24,10 @@
width="50%"
>
<el-table-column type="selection" :reserve-selection="false" width="55" />
- <el-table-column prop="empName" label="员工姓名" width="180" />
+ <el-table-column prop="empNumb" label="员工编号" width="100" />
+ <el-table-column prop="deptName" label="护卫点" width="100" />
+ <el-table-column prop="empName" label="姓名" width="100" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="oldDeptName" label="原护卫点" width="180" />
<el-table-column prop="oldJobName" label="原岗位名称" width="180" />
<el-table-column prop="newDeptName" label="新护卫点" width="180" />
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index fd42c53..faa0bed 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -11,6 +11,7 @@
<div class="conDetails">
<div class="menu dadetails">
<div>
+
<el-upload
class="avatar-uploader"
action="#"
@@ -18,6 +19,7 @@
:on-change="handlePictureCardPreview"
:auto-upload="false"
>
+ <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过4MB</div>
<img v-if="empBaseInfoImageUrl" :src="empBaseInfoImageUrl" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon" />
</el-upload>
@@ -135,6 +137,7 @@
<el-input v-model="empBaseInfoForm.archivesNumb" />
</el-form-item>
</el-col>
+
<el-col :span="8">
<el-form-item label="姓名" prop="empName">
<el-input v-model="empBaseInfoForm.empName" />
@@ -176,8 +179,13 @@
<el-col :span="8">
<el-form-item label="员工类别" prop="empType">
<el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型">
- <el-option label="正式工" value="1" />
- <el-option label="临时工" value="2" />
+ <el-option label="高层" value="01" />
+ <el-option label="高级管理人员" value="02" />
+ <el-option label="中级管理人员" value="03" />
+ <el-option label="初级管理人员" value="04" />
+ <el-option label="文职人员" value="05" />
+ <el-option label="一般人员" value="06" />
+ <el-option label="其他" value="07" />
</el-select>
</el-form-item>
</el-col>
@@ -410,6 +418,70 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item label="民族" prop="nation">
+ <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
+ <el-option label="汉族" value="01" />
+ <el-option label="蒙古族" value="02" />
+ <el-option label="回族" value="03" />
+ <el-option label="藏族" value="04" />
+ <el-option label="维吾尔族" value="05" />
+ <el-option label="苗族" value="06" />
+ <el-option label="彝族" value="07" />
+ <el-option label="壮族" value="08" />
+ <el-option label="布衣族" value="09" />
+ <el-option label="朝鲜族" value="10" />
+ <el-option label="满族" value="11" />
+ <el-option label="侗族" value="12" />
+ <el-option label="瑶族" value="13" />
+ <el-option label="白族" value="14" />
+ <el-option label="土家族" value="15" />
+ <el-option label="哈尼族" value="16" />
+ <el-option label="哈萨克族" value="17" />
+ <el-option label="傣族" value="18" />
+ <el-option label="黎族" value="19" />
+ <el-option label="傈傈族" value="20" />
+ <el-option label="瓦族" value="21" />
+ <el-option label="畲族" value="22" />
+ <el-option label="高山族" value="23" />
+ <el-option label="拉祜族" value="24" />
+ <el-option label="水族" value="25" />
+ <el-option label="东乡族" value="26" />
+ <el-option label="纳西族" value="27" />
+ <el-option label="景颇族" value="28" />
+ <el-option label="柯尔克孜族" value="29" />
+ <el-option label="土族" value="30" />
+ <el-option label="达斡尔族" value="31" />
+ <el-option label="仫佬族" value="32" />
+ <el-option label="羌族" value="33" />
+ <el-option label="布朗族" value="34" />
+ <el-option label="撒拉族" value="35" />
+ <el-option label="毛难族" value="36" />
+ <el-option label="仡佬族" value="37" />
+ <el-option label="锡伯族" value="38" />
+ <el-option label="阿昌族" value="39" />
+ <el-option label="普米族" value="40" />
+ <el-option label="塔吉克族" value="41" />
+ <el-option label="怒族" value="42" />
+ <el-option label="乌孜别克族" value="43" />
+ <el-option label="俄罗斯族" value="44" />
+ <el-option label="鄂温克族" value="45" />
+ <el-option label="崩龙族" value="46" />
+ <el-option label="保安族" value="47" />
+ <el-option label="裕固族" value="48" />
+ <el-option label="京族" value="49" />
+ <el-option label="塔塔尔族" value="50" />
+ <el-option label="独龙族" value="51" />
+ <el-option label="鄂伦春" value="52" />
+ <el-option label="郝哲族" value="53" />
+ <el-option label="门巴族" value="54" />
+ <el-option label="珞巴族" value="55" />
+ <el-option label="基诺族" value="56" />
+ <el-option label="其他族" value="91" />
+ <el-option label="外国民族" value="98" />
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -429,12 +501,15 @@
:highlight-current-row="true"
@selection-change="onworkExperienceDataselection"
>
- <el-table-column type="workExperienceDataselection" align="center" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column v-if="fsnumShow" prop="workExperienceId" label="工作单位" />
- <el-table-column prop="workUnit" label="工作单位" />
- <el-table-column prop="workUnit" label="工作单位" />
<el-table-column prop="beginDate" label="开始日期" />
<el-table-column prop="endDate" label="结束日期" />
+ <el-table-column prop="workUnit" label="工作单位" />
<el-table-column prop="jobContent" label="主要工作内容" />
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
@@ -475,7 +550,11 @@
style="width: 100%;"
@selection-change="onphysicalExamDataselection"
>
- <el-table-column type="physicalExamDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
@@ -493,11 +572,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="physicalExamId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="100" />
- <el-table-column prop="deptName" label="护卫点" width="150" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="jobName" label="岗位" width="120" />
<el-table-column prop="hospital" label="体检医院" width="150" />
<el-table-column prop="physicalExamDate" label="体检日期" width="120" />
<el-table-column prop="physicalExamTypeName" label="体检类型" width="100" />
@@ -531,7 +605,11 @@
style="width: 100%;"
@selection-change="oncontractInfoDataselection"
>
- <el-table-column type="contractInfoDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
@@ -549,16 +627,11 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="contractId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="100" />
- <el-table-column prop="deptName" label="护卫点" width="150" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="jobName" label="岗位" width="120" />
<el-table-column prop="signingDate" label="合同签订日期" width="120" />
<el-table-column prop="endDate" label="合同结束日期" width="120" />
<el-table-column prop="contractPeriod" label="合同期限(年)" width="120" />
<el-table-column prop="contractStatusName" label="合同状态" width="100" />
- <el-table-column prop="transactor" label="合同办理人" width="100" />
+ <el-table-column prop="transactor" label="合同办理人" />
</el-table>
<pagination
v-show="contractInfoDatatotal>0"
@@ -578,6 +651,11 @@
:data="jobChangeData"
style="width: 100%;"
>
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column prop="newDeptName" label="现部门" />
<el-table-column prop="newJobName" label="现岗位" />
<el-table-column prop="empName" label="姓名" width="180" />
@@ -608,7 +686,11 @@
</el-button>
<div class="jbxxCon">
<el-table ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;" @selection-change="onleaveInfoDataselection">
- <el-table-column type="leaveInfoDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editLeaveInfo(scope.row)">编辑</el-button>
@@ -621,11 +703,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="leaveId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位名称" width="180" />
- <el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
<el-table-column prop="beginTime" label="开始时间" width="180" />
<el-table-column prop="endTime" label="结束时间" width="180" />
<el-table-column prop="leaveDay" label="请假天数" width="180" />
@@ -657,7 +734,11 @@
</el-button>
<div class="jbxxCon">
<el-table ref="resignTable" :data="resignData" style="width: 100%;" @selection-change="onresignDataselection">
- <el-table-column type="resignDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editResign(scope.row)">编辑</el-button>
@@ -670,11 +751,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="resignId" label="" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位名" width="180" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
<el-table-column prop="applayDate" label="辞职申请日期" width="180" />
<el-table-column prop="reason" label="辞职事由" width="180" />
<el-table-column prop="reporter" label="汇报人" width="180" />
@@ -690,7 +766,7 @@
</div>
<div ref="lzdykq" class="lzdykq">
<div class="jbxxTitle">
- 考勤情况
+ 离职当月考勤
</div>
<el-button class="filter-item" type="primary" @click.native="gzadd(4)">
{{ $t('table.add') }}
@@ -702,7 +778,11 @@
style="width: 100%;"
@selection-change="ondimissionAttendDataselection"
>
- <el-table-column type="dimissionAttendDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editDimissionAttend(scope.row)">编辑</el-button>
@@ -715,11 +795,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="dimissionAttendId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="100" />
- <el-table-column prop="deptName" label="护卫点" width="150" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="jobName" label="岗位" width="120" />
<el-table-column prop="attendMonth" label="离职考勤月份" width="120" />
<el-table-column prop="attendDays" label="出勤天数" width="120" />
<el-table-column prop="overtimeDay" label="加班（天）" width="120" />
@@ -747,8 +822,18 @@
:data="dimissionLogData"
style="width: 100%;"
>
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column prop="entryDate" label="入职日期" />
<el-table-column prop="dimissionDate" label="离职日期" />
+ <el-table-column prop="dimissionType" label="离职类型">
+ <template slot-scope="{row}">
+ {{ transDimissionType(row.dimissionType) }}
+ </template>
+ </el-table-column>
<el-table-column prop="selfLeaveDay" label="自离天数" />
<el-table-column prop="reporter" label="报备人" />
<el-table-column prop="remark" label="备注" />
@@ -775,7 +860,11 @@
style="width: 100%;"
@selection-change="onunemploymentDataselection"
>
- <el-table-column type="unemploymentDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editUnemployment(scope.row)">编辑</el-button>
@@ -788,11 +877,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="unemploymentId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位名称" width="180" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="applayDate" label="失业金申请日期" width="180" />
<el-table-column prop="applayReason" label="申报事由" width="180" />
<el-table-column prop="reporter" label="汇报人" width="180" />
@@ -816,7 +900,11 @@
</el-button>
<div class="jbxxCon">
<el-table ref="insuranceTable" :data="insuranceData" style="width: 100%;" @selection-change="oninsuranceDataselection">
- <el-table-column type="insuranceDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editInsurance(scope.row)">编辑</el-button>
@@ -829,11 +917,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="insuranceId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位名称" width="180" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="applayDate" label="社保申请日期" width="180" />
<el-table-column prop="proposer" label="申请人" width="180" />
<el-table-column prop="insuranceGaers" label="社保档位">
@@ -882,7 +965,11 @@
style="width: 100%;"
@selection-change="onaccidentCasesDataselection"
>
- <el-table-column type="accidentCasesDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editAccidentCases(scope.row)">编辑</el-button>
@@ -895,11 +982,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="accidentId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位名称" width="180" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="injuredTime" label="受伤日期" width="180" />
<el-table-column prop="injuredAddress" label="受伤地点" width="180" />
<el-table-column prop="injuredPart" label="受伤部位" width="180" />
@@ -942,7 +1024,11 @@
style="width: 100%;"
@selection-change="onoccupationalDataselection"
>
- <el-table-column type="occupationalDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editOccupational(scope.row)">编辑</el-button>
@@ -955,11 +1041,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="occupationalId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位" width="180" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="injuredTime" label="受伤日期" width="180" />
<el-table-column prop="injuredAddress" label="受伤地点" width="180" />
<el-table-column prop="injuredPart" label="受伤部位" width="180" />
@@ -1002,7 +1083,11 @@
style="width: 100%;"
@selection-change="onlaborTroubleDataselection"
>
- <el-table-column type="laborTroubleDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editLaborTrouble(scope.row)">编辑</el-button>
@@ -1015,11 +1100,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="arbitrationId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位" width="180" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />
<el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />
<el-table-column prop="arbitrationType" label="仲裁类型">
@@ -1063,7 +1143,11 @@
style="width: 100%;"
@selection-change="onbadRecordDataselection"
>
- <el-table-column type="onbadRecordDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
@@ -1081,11 +1165,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="badId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位" width="180" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="badDate" label="不良记录日期" width="180" />
<el-table-column prop="badContent" label="不良记录描述" width="180" />
<el-table-column prop="reporter" label="汇报人" width="180" />
@@ -1113,7 +1192,11 @@
style="width: 100%;"
@selection-change="onremarkInfoDataselection"
>
- <el-table-column type="onremarkInfoDataselection" width="55" />
+ <el-table-column type="index" label="序号" align="center" width="55">
+ <template slot-scope="scope">
+ <span v-text="getIndex(scope.$index)" />
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="editRemarkInfo(scope.row)">编辑</el-button>
@@ -1126,11 +1209,6 @@
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" prop="remarkId" label="" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位" width="180" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="remarkDate" label="备注日期" width="180" />
<el-table-column prop="remarkContent" label="备注信息" width="400" />
</el-table>
@@ -1147,36 +1225,319 @@
<div class="jbxxTitle">
记录截图
</div>
- <el-button
- class="filter-item"
- type="primary"
- @click.native.prevent="dialogShow"
- >
- 查看并上传
- </el-button>
- <div class="jbxxCon" />
+ <div class="jbxxCon">
+ <div class="zs-main">
+ <el-row class="search-title">
+ <el-col :span="18" class="title">
+ <div class="zs-title">上传附件</div>
+ </el-col>
+ <el-col :span="6" class="search">
+ <el-input
+ v-model="fileName"
+ maxlength="20"
+ minlength="1"
+ clearable
+ placeholder="请输入文件名"
+ show-word-limit
+ style="width:200px"
+ />
+ <el-button type="primary" @click="findFileByFileName()">查询</el-button>
+ </el-col>
+ </el-row>
+ <el-container style="background-color: #fff;">
+ <el-aside width="210px" style="background-color: #fff;text-align: center;">
+ <h4>{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
+ <el-timeline>
+ <el-timeline-item
+ v-for="(activity, index) in activities"
+ :key="index"
+ :icon="activity.icon"
+ :type="activity.type"
+ :color="activity.color"
+ :size="activity.size"
+ placement="bottom"
+ >
+ <span
+ style="position: relative; top: -5px;"
+ @click="clickTimeline(index, activity.id)"
+ >
+ {{ activity.timestamp }}</span>
+ </el-timeline-item>
+ </el-timeline>
+ </el-aside>
+ <el-container>
+ <el-header class="text-header">
+ <el-row><el-col :span="24">
+ <i
+ class="el-icon-bell"
+ style=" color: #a32c30; margin-right: 10px;"
+ />提示：文件不要超过10个，单个文件大小不超过50M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。</el-col>
+ </el-row>
+ <el-row style="background-color: rgba(0,0,0,0.2);">
+ <el-col :span="16">
+ <el-checkbox
+ v-model="checkAll"
+ class="myRedCheckBox"
+ style="color: #000; margin-left: 20px;"
+ @change="checkAllMethods()"
+ >全选</el-checkbox></el-col>
+ <el-col :span="8">
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="download()"
+ >下载</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="delFile()"
+ >删除</el-button>
+ <el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
+ <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
+ </el-popconfirm>
+ </el-col>
+ </el-row>
+ </el-header>
+ <el-dialog
+ title="移动文件"
+ :visible.sync="mvdialogFormVisible"
+ width="25%"
+ class="add-label"
+ append-to-body
+ >
+ <el-form ref="mvlabelfrom" :model="labelfrom" :rules="mvrules">
+ <el-form-item
+ label="目录名称:"
+ :label-width="formLabelWidth"
+ prop="labelid"
+ >
+ <el-select v-model="labelfrom.labelid" placeholder="请选择移动的标签">
+ <el-option
+ v-for="item in activities"
+ :key="item.id"
+ :value="item.id"
+ :label="item.timestamp"
+ />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="mvdialogFormVisible = false">取 消</el-button>
+ <el-button
+ type="primary"
+ @click="mvlabel('mvlabelfrom')"
+ >确 定</el-button>
+ </div>
+ </el-dialog>
+ <el-main style="background-color: #fff;">
+ <el-row v-for="(data, index) in filesUploadData" :key="index">
+ <template v-for="(node, nodeIndex) in data.node">
+ <el-col v-if="node.isUpload === false" :key="node.filesid" :span="3">
+ <el-card
+ shadow="never"
+ @click.native="clickCard(index * 8 + nodeIndex)"
+ >
+ <img
+ :src="showFileImg(node.filesformat)"
+ class="uploading-image"
+ >
+ <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
+ <div style="padding-top: 14px;">
+ <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
+ </div>
+ </el-tooltip>
+ </el-card>
+ </el-col>
+ <el-col v-if="node.isUpload" :key="node.filesid" :span="3">
+ <el-card shadow="never">
+ <el-upload
+ class="avatar-uploader"
+ :action="uploadSinglePath"
+ :show-file-list="false"
+ :before-upload="beforeAvatarUpload"
+ :headers="headers()"
+ :data="fileDate"
+ :on-success="handleAvatarSuccess"
+ :on-error="handleAvatarError"
+ :multiple="true"
+ :limit="10"
+ drag
+ >
+ <i class="el-icon-upload" />
+ </el-upload>
+ </el-card>
+ </el-col>
+ </template>
+ </el-row>
+ </el-main>
+ </el-container>
+ </el-container>
+ </div>
+ </div>
</div>
<div ref="xgfj" class="xgfj">
<div class="jbxxTitle">
相关附件
</div>
- <el-button
- class="filter-item"
- type="primary"
- @click.native.prevent="dialogShow"
- >
- 查看并上传
- </el-button>
- <div class="jbxxCon" />
+ <div class="jbxxCon">
+ <div class="zs-main">
+ <el-row class="search-title">
+ <el-col :span="18" class="title">
+ <div class="zs-title">上传附件</div>
+ </el-col>
+ <el-col :span="6" class="search">
+ <el-input
+ v-model="fileName"
+ maxlength="20"
+ minlength="1"
+ clearable
+ placeholder="请输入文件名"
+ show-word-limit
+ style="width:200px"
+ />
+ <el-button type="primary" @click="findFileByFileName()">查询</el-button>
+ </el-col>
+ </el-row>
+ <el-container style="background-color: #fff;">
+ <el-aside style="background-color: #fff;text-align: center;">
+ <h4>{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
+ <el-timeline>
+ <el-timeline-item
+ v-for="(activity, index) in activities"
+ :key="index"
+ :icon="activity.icon"
+ :type="activity.type"
+ :color="activity.color"
+ :size="activity.size"
+ placement="bottom"
+ >
+ <span
+ style="position: relative; top: -5px;"
+ @click="clickTimeline(index, activity.id)"
+ >
+ {{ activity.timestamp }}</span>
+ </el-timeline-item>
+ </el-timeline>
+ </el-aside>
+ <el-container>
+ <el-header class="text-header">
+ <el-row><el-col :span="24">
+ <i
+ class="el-icon-bell"
+ style=" color: #a32c30; margin-right: 10px;"
+ />提示：文件不要超过10个，单个文件大小不超过50M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。</el-col>
+ </el-row>
+ <el-row style="background-color: rgba(0,0,0,0.2);">
+ <el-col :span="16">
+ <el-checkbox
+ v-model="checkAll"
+ class="myRedCheckBox"
+ style="color: #000; margin-left: 20px;"
+ @change="checkAllMethods()"
+ >全选</el-checkbox></el-col>
+ <el-col :span="8">
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="download()"
+ >下载</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="delFile()"
+ >删除</el-button>
+ <el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
+ <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
+ </el-popconfirm>
+ </el-col>
+ </el-row>
+ </el-header>
+ <el-dialog
+ title="移动文件"
+ :visible.sync="mvdialogFormVisible"
+ width="25%"
+ class="add-label"
+ append-to-body
+ >
+ <el-form ref="mvlabelfrom" :model="labelfrom" :rules="mvrules">
+ <el-form-item
+ label="目录名称:"
+ :label-width="formLabelWidth"
+ prop="labelid"
+ >
+ <el-select v-model="labelfrom.labelid" placeholder="请选择移动的标签">
+ <el-option
+ v-for="item in activities"
+ :key="item.id"
+ :value="item.id"
+ :label="item.timestamp"
+ />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="mvdialogFormVisible = false">取 消</el-button>
+ <el-button
+ type="primary"
+ @click="mvlabel('mvlabelfrom')"
+ >确 定</el-button>
+ </div>
+ </el-dialog>
+ <el-main style="background-color: #fff;">
+ <el-row v-for="(data, index) in filesUploadData" :key="index">
+ <template v-for="(node, nodeIndex) in data.node">
+ <el-col v-if="node.isUpload === false" :key="node.filesid" :span="3">
+ <el-card
+ shadow="never"
+ @click.native="clickCard(index * 8 + nodeIndex)"
+ >
+ <img
+ :src="showFileImg(node.filesformat)"
+ class="uploading-image"
+ >
+ <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
+ <div style="padding-top: 14px;">
+ <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
+ </div>
+ </el-tooltip>
+ </el-card>
+ </el-col>
+ <el-col v-if="node.isUpload" :key="node.filesid" :span="3">
+ <el-card shadow="never">
+ <el-upload
+ class="avatar-uploader"
+ :action="uploadSinglePath"
+ :show-file-list="false"
+ :before-upload="beforeAvatarUpload"
+ :headers="headers()"
+ :data="fileDate"
+ :on-success="handleAvatarSuccess"
+ :on-error="handleAvatarError"
+ :multiple="true"
+ :limit="10"
+ drag
+ >
+ <i class="el-icon-upload" />
+ </el-upload>
+ </el-card>
+ </el-col>
+ </template>
+ </el-row>
+ </el-main>
+ </el-container>
+ </el-container>
+ </div>
+ </div>
</div>
</div>
</div>
- <el-dialog title="附件管理" append-to-body="true" :visible.sync="dialogShowUploadfj" width="80%" class="fjgl-class" top="10px" @close="closeDialog()">
- <uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" />
- </el-dialog>
- <el-dialog title="工作经历" append-to-body="true" :visible.sync="dialogshowArr[1].show" width="50%">
+ <el-dialog title="工作经历" append-to-body :visible.sync="dialogshowArr[1].show" width="50%">
<el-form ref="workExperienceForm" :model="workExperienceForm" :rules="workExperienceRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1249,7 +1610,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="体检信息" append-to-body="true" :visible.sync="dialogshowArr[2].show" width="50%">
+ <el-dialog title="体检信息" append-to-body :visible.sync="dialogshowArr[2].show" width="50%">
<el-form ref="physicalExamForm" :model="physicalExamForm" :rules="physicalExamRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1335,7 +1696,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="合同信息" append-to-body="true" :visible.sync="dialogshowArr[3].show" width="50%">
+ <el-dialog title="合同信息" append-to-body :visible.sync="dialogshowArr[3].show" width="50%">
<el-form ref="contractInfoForm" :model="contractInfoForm" :rules="contractInfoRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1410,7 +1771,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="离职当月考勤" append-to-body="true" :visible.sync="dialogshowArr[4].show" width="50%">
+ <el-dialog title="离职当月考勤" append-to-body :visible.sync="dialogshowArr[4].show" width="50%">
<el-form ref="dimissionAttendForm" :model="dimissionAttendForm" :rules="dimissionAttendRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1482,7 +1843,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="请假记录" append-to-body="true" :visible.sync="dialogshowArr[5].show" width="50%">
+ <el-dialog title="请假记录" append-to-body :visible.sync="dialogshowArr[5].show" width="50%">
<el-form ref="leaveInfoForm" :model="leaveInfoForm" :rules="leaveInfoRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1569,7 +1930,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="辞职申请" append-to-body="true" :visible.sync="dialogshowArr[6].show" width="50%">
+ <el-dialog title="辞职申请" append-to-body :visible.sync="dialogshowArr[6].show" width="50%">
<el-form ref="resignForm" :model="resignForm" :rules="resignRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1631,7 +1992,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="失业金领取" append-to-body="true" :visible.sync="dialogshowArr[7].show" width="50%">
+ <el-dialog title="失业金领取" append-to-body :visible.sync="dialogshowArr[7].show" width="50%">
<el-form ref="unemploymentForm" :model="unemploymentForm" :rules="unemploymentRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1693,7 +2054,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="社保申请" append-to-body="true" :visible.sync="dialogshowArr[8].show" width="50%">
+ <el-dialog title="社保申请" append-to-body :visible.sync="dialogshowArr[8].show" width="50%">
<el-form ref="insuranceForm" :model="insuranceForm" :rules="insuranceRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1772,7 +2133,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="意外险案件" append-to-body="true" :visible.sync="dialogshowArr[9].show" width="50%">
+ <el-dialog title="意外险案件" append-to-body :visible.sync="dialogshowArr[9].show" width="50%">
<el-form ref="accidentCasesForm" :model="accidentCasesForm" :rules="accidentCasesRules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -1906,7 +2267,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="工伤案件" append-to-body="true" :visible.sync="dialogshowArr[10].show" width="50%">
+ <el-dialog title="工伤案件" append-to-body :visible.sync="dialogshowArr[10].show" width="50%">
<el-form ref="occupationalForm" :model="occupationalForm" :rules="occupationalRules" label-position="right" label-width="140px">
<el-row>
<el-col :span="12">
@@ -2085,7 +2446,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="劳资案件" append-to-body="true" :visible.sync="dialogshowArr[11].show" width="50%">
+ <el-dialog title="劳资案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
<el-form ref="laborTroubleForm" :model="laborTroubleForm" :rules="laborTroubleRules" label-position="right" label-width="140px">
<el-row>
<el-col :span="12">
@@ -2171,7 +2532,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="不良记录" append-to-body="true" :visible.sync="dialogshowArr[12].show" width="50%">
+ <el-dialog title="不良记录" append-to-body :visible.sync="dialogshowArr[12].show" width="50%">
<el-form ref="badRecordForm" :model="badRecordForm" :rules="badRecordRules" label-position="right" label-width="140px">
<el-row>
<el-col :span="12">
@@ -2233,7 +2594,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="备注信息" append-to-body="true" :visible.sync="dialogshowArr[13].show" width="50%">
+ <el-dialog title="备注信息" append-to-body :visible.sync="dialogshowArr[13].show" width="50%">
<el-form
ref="remarkInfoForm"
:model="remarkInfoForm"
@@ -2298,6 +2659,8 @@
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Pagination from '@/components/Pagination'
+import { getToken } from '@/utils/auth'
+import { pages } from '@/settings'
export default {
name: 'ArchivesEdit',
components: { Treeselect, Pagination },
@@ -2317,12 +2680,32 @@
},
data() {
return {
- rowitem: {},
+ mvrules: {
+ labelid: [{ required: true, message: '请选择标签', trigger: 'change' }]
+ },
+ mvdialogFormVisible: false,
+ uploadSinglePath: pages.uploadSinglePath,
+ labelfrom: {
+ labelid: '',
+ empId: ''
+ },
+ fileDate: {
+ labelid: 0,
+ empId: ''
+ },
+ formLabelWidth: '100px',
+ beforeIndex: 0,
+ fileName: '',
+ checkedArr: [],
+ checkAll: false,
+ activities: [],
+ filesUploadData: [],
+ updateNum: 0,
dialogShowUploadfj: false,
queryParams: {}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
- size: 20,
+ size: 5,
num: 1
},
workExperienceModal: true,
@@ -2654,7 +3037,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
empStatus: 0,
version: ''
},
@@ -2680,7 +3063,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
version: '',
empStatus: 0,
remark: ''
@@ -2727,7 +3110,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
version: '',
empStatus: 0,
remark: ''
@@ -2766,7 +3149,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
empStatus: 0,
version: ''
},
@@ -2791,7 +3174,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
version: '',
empStatus: 0,
remark: ''
@@ -2816,7 +3199,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
empStatus: 0,
version: ''
},
@@ -2838,7 +3221,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
version: '',
empStatus: 0,
remark: ''
@@ -2864,7 +3247,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
version: '',
empStatus: 0,
remark: ''
@@ -2891,7 +3274,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
empStatus: 0,
version: ''
},
@@ -2917,7 +3300,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
version: '',
empStatus: 0,
remark: ''
@@ -2946,7 +3329,6 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
empStatus: 0,
version: ''
},
@@ -2969,7 +3351,6 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
empStatus: 0,
version: ''
},
@@ -3020,7 +3401,6 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
empStatus: 0,
version: ''
},
@@ -3043,7 +3423,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+
version: '',
empStatus: 0,
remark: ''
@@ -3083,6 +3463,256 @@
this.initDept()
},
methods: {
+ beforeAvatarUpload(file) {
+ this.fileDate.labelid = this.activities[this.beforeIndex].id
+ const isLt50M = file.size / 1024 / 1024 < 50
+ if (!isLt50M) {
+ this.$message.error('上传文件不能超过 50MB!')
+ }
+ return isLt50M
+ },
+ headers() {
+ const token = getToken()
+ if (token) {
+ return {
+ Authorization: 'bearer ' + token
+ }
+ } else {
+ return null
+ }
+ },
+ handleAvatarSuccess(response, file, fileList) {
+ this.$notify({
+ title: '成功',
+ message: '上传成功!',
+ type: 'success'
+ })
+ this.updateNum++
+ if (this.updateNum === fileList.length) {
+ this.updateNum = 0
+ // 生成查询文件的条件
+ var params = {
+ labelid: this.activities[this.beforeIndex].id,
+ filesname: this.fileName,
+ empid: this.empBaseInfoForm.empId
+ }
+ this.initFile(params)
+ }
+ },
+ handleAvatarError() {
+ this.updateNum = 0
+ this.$notify.error({
+ title: '失败',
+ message: '上传失败,请联系管理员!'
+ })
+ },
+ showFileImg(type) {
+ switch (type) {
+ case 'txt':
+ return require('../../assets/uploading/txt.png')
+ case 'apk':
+ return require('../../assets/uploading/apk.png')
+ case 'csv':
+ return require('../../assets/uploading/csv.png')
+ case 'excel':
+ return require('../../assets/uploading/excel.png')
+ case 'exe':
+ return require('../../assets/uploading/exe.png')
+ case 'folder':
+ return require('../../assets/uploading/folder.png')
+ case 'gif':
+ return require('../../assets/uploading/gif.png')
+ case 'html':
+ return require('../../assets/uploading/html.png')
+ case 'json':
+ return require('../../assets/uploading/json.png')
+ case 'mp3':
+ return require('../../assets/uploading/mp3.png')
+ case 'mp4':
+ return require('../../assets/uploading/mp4.png')
+ case 'pdf':
+ return require('../../assets/uploading/pdf.png')
+ case 'pic':
+ return require('../../assets/uploading/pic.png')
+ case 'ppt':
+ return require('../../assets/uploading/ppt.png')
+ case 'rar':
+ return require('../../assets/uploading/rar.png')
+ case 'svg':
+ return require('../../assets/uploading/svg.png')
+ case 'webpage':
+ return require('../../assets/uploading/webpage.png')
+ case 'word':
+ return require('../../assets/uploading/word.png')
+ case 'zip':
+ return require('../../assets/uploading/zip.png')
+ case 'jpg':
+ return require('../../assets/uploading/jpg.png')
+ case 'png':
+ return require('../../assets/uploading/png.png')
+ default:
+ return require('../../assets/uploading/unknown.png')
+ }
+ },
+ clickCard(index) {
+ if (this.checkedArr[index].isChecked) {
+ this.$set(this.checkedArr[index], 'isChecked', false)
+ } else {
+ this.$set(this.checkedArr[index], 'isChecked', true)
+ }
+ },
+ transDimissionType(dimissionType) {
+ switch (dimissionType) {
+ case '1':
+ return '正常离职'
+ case '2':
+ return '自动离职'
+ case '3':
+ return '公司劝退'
+ case '4':
+ return '公司辞退'
+ case '5':
+ return '试用期内'
+ }
+ },
+ mvlabel(formName) {
+ if (this.labelfrom.labelid === this.activities[this.beforeIndex].id) {
+ this.$message({
+ message: '文件在同一目录!',
+ type: 'warning'
+ })
+ return
+ }
+ var checke = []
+ this.checkedArr.forEach((v, i) => {
+ if (v.isChecked) {
+ checke.push(v.accessoryid)
+ }
+ })
+ if (checke.length <= 0) {
+ this.$message({
+ message: '请选择需要移动的文件!',
+ type: 'warning'
+ })
+ } else {
+ this.$refs[formName].validate(valid => {
+ if (valid) {
+ // 生成查询文件的条件
+ var params = { accessoryids: checke.join(','), labelid: this.labelfrom.labelid, empId: this.labelfrom.empId }
+ this.$post('hr/empAccessory/mvFiles', { ...params }).then(() => {
+ this.$message({
+ message: '移动成功!',
+ type: 'success'
+ })
+ this.mvdialogFormVisible = false
+ // 生成查询文件的条件
+ var initFileParams = {
+ labelid: this.activities[this.beforeIndex].id,
+ filesname: this.fileName,
+ empid: this.empBaseInfoForm.empId
+ }
+ this.initFile(initFileParams)
+ })
+ }
+ })
+ }
+ },
+ delFile() {
+ var checke = []
+ this.checkedArr.forEach((v, i) => {
+ if (v.isChecked) {
+ checke.push(v.accessoryid)
+ }
+ })
+ if (checke.length <= 0) {
+ this.$message({
+ message: '请选择需要删除的文件!',
+ type: 'warning'
+ })
+ } else {
+ // 生成查询文件的条件
+ var params = { accessoryids: checke.join(',') }
+ this.$delete('hr/empAccessory', { ...params }).then(() => {
+ this.$message({
+ message: '删除成功!',
+ type: 'success'
+ })
+ // 生成查询文件的条件
+ var initFileParams = {
+ labelid: this.activities[this.beforeIndex].id,
+ filesname: this.fileName,
+ empid: this.empBaseInfoForm.empId
+ }
+
+ this.initFile(initFileParams)
+ })
+ }
+ },
+ download() {
+ var checke = []
+ this.checkedArr.forEach((v, i) => {
+ if (v.isChecked) {
+ checke.push(v.accessoryid)
+ }
+ })
+ if (checke.length <= 0) {
+ this.$message({
+ message: '请选择需要下载的文件!',
+ type: 'warning'
+ })
+ } else {
+ // 生成查询文件的条件
+ var params = { accessoryids: checke.join(',') }
+ this.$download('hr/empAccessory/download', { ...params }, this.activities[this.beforeIndex].timestamp + '.zip').then(() => {
+ this.$message({
+ message: '下载成功!',
+ type: 'success'
+ })
+ })
+ }
+ },
+ checkAllMethods() {
+ if (this.checkAll) {
+ this.checkedArr.forEach((v, i) => {
+ this.$set(v, 'isChecked', true)
+ })
+ } else {
+ this.checkedArr.forEach((v, i) => {
+ this.$set(v, 'isChecked', false)
+ })
+ }
+ },
+ clickTimeline(index, id) {
+ // 不这样操作的不会响应式更新
+ // 赋值到新的列表
+ var list = this.activities
+ // 将之前的数组置为空
+ this.activities = []
+ // 删除之前下标的颜色
+ delete list[this.beforeIndex].color
+ // 将新下标存储起来
+ this.beforeIndex = index
+ // 将新下标修改颜色
+ list[index]['color'] = '#a32c30'
+ // 将修改好的数组放回去
+ this.activities = list
+ this.checkAll = false
+ // 生成查询文件的条件
+ var params = {
+ labelid: this.activities[this.beforeIndex].id,
+ filesname: this.fileName,
+ empid: this.empBaseInfoForm.empId
+ }
+ this.initFile(params)
+ },
+ findFileByFileName() {
+ // 生成查询文件的条件
+ var params = {
+ filesname: this.fileName,
+ empid: this.empBaseInfoForm.empId
+ }
+ this.initFile(params)
+ },
onremarkInfoDataselection(selection) {
this.remarkInfoDataselection = selection
},
@@ -3122,8 +3752,70 @@
oncontractInfoDataselection(selection) {
this.contractInfoDataselection = selection
},
+ async initlabel() {
+ await this.$get('hr/label').then(r => {
+ this.activities = []
+ this.beforeIndex = 0
+ r.data.data.forEach((v, i) => {
+ if (i === 0) {
+ this.activities.push({
+ timestamp: v.labelname,
+ id: v.labelid,
+ color: '#a32c30'
+ })
+ } else {
+ this.activities.push({ timestamp: v.labelname, id: v.labelid })
+ }
+ })
+ })
+ var params = { labelid: this.activities[this.beforeIndex].id,
+ filesname: this.fileName,
+ empid: this.empBaseInfoForm.empId }
+ this.initFile(params)
+ },
+ initFile(params) {
+ var node = { node: [] }
+ // 文件列表置为空
+ this.filesUploadData = []
+ this.checkedArr = []
+ this.$get('hr/empAccessory', { ...params }).then(r => {
+ r.data.data.forEach((v, i) => {
+ this.checkedArr.push({ isChecked: false, accessoryid: v.accessoryid })
+ // 一行8个 等于8就换行
+ if (i % 8 === 0 && i !== 0) {
+ this.filesUploadData.push(node)
+ node = { node: [] }
+ }
+ // 添加一个新的元素判断是否是上传用的
+ this.$set(v, 'isUpload', false)
+ // 添加
+ node.node.push(v)
+ // 如果是最后一个元素,需要手动丢到列表里面去
+ if (i === r.data.data.length - 1) {
+ this.filesUploadData.push(node)
+ }
+ })
+ // 如果列表为空,增加一个上传的
+ if (this.filesUploadData.length === 0) {
+ this.filesUploadData.push({ node: [{ isUpload: true }] })
+ } else {
+ // 如果不为空,但是这一行刚好满8个了,就将数组,新增一个对象
+ if (this.filesUploadData[this.filesUploadData.length - 1].node.length === 8) {
+ this.filesUploadData.push({ node: [{ isUpload: true }] })
+ } else {
+ // 新增一个上传
+ this.filesUploadData[this.filesUploadData.length - 1].node.push({
+ isUpload: true
+ })
+ }
+ }
+ })
+ },
setArchives(val) {
this.empBaseInfoForm = { ...val }
+ this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
+ this.fileDate.empId = this.empBaseInfoForm.empId
+ this.labelfrom.empId = this.empBaseInfoForm.empId
this.remarkInfoForm = { ...val }
this.laborTroubleForm = { ...val }
this.occupationalForm = { ...val }
@@ -3137,7 +3829,7 @@
this.physicalExamForm = { ...val }
this.workExperienceForm = { ...val }
this.badRecordForm = { ...val }
-
+ this.initlabel()
this.initphysicalExamData()
this.initList() // 工作经历
this.initjobChangeData() // 调岗记录
@@ -3183,7 +3875,7 @@
initdimissionLogData(params = {}) {
params.pageSize = this.pagination.size
params.pageNum = this.pagination.num
- params.empNumb = this.empBaseInfoForm.empNumb
+ params.dimissionType = ''
params.delFlag = '0'
this.$get('hr/empDimissionlog/list', {
...params
@@ -3261,7 +3953,6 @@
this.$get('hr/empInsurance/list', {
...params
}).then((r) => {
- debugger
const data = r.data.data
this.insuranceDatatotal = data.total
this.insuranceData = data.rows
@@ -3320,7 +4011,6 @@
})
},
dialogShow() {
- this.rowitem = this.empBaseInfoForm
this.dialogShowUploadfj = true
},
initaccidentCasesData(params = {}) {
@@ -3434,15 +4124,6 @@
},
cleanContractInfo() {
this.contractInfoForm.contractId = ''
- this.contractInfoForm.empId = ''
- this.contractInfoForm.empNumb = ''
- this.contractInfoForm.empName = ''
- this.contractInfoForm.certificateNumb = ''
- this.contractInfoForm.sex = ''
- this.contractInfoForm.deptId = ''
- this.contractInfoForm.deptName = ''
- this.contractInfoForm.JobId = ''
- this.contractInfoForm.jobName = ''
this.contractInfoForm.beginDate = ''
this.contractInfoForm.endDate = ''
this.contractInfoForm.contractStatus = ''
@@ -3454,7 +4135,6 @@
this.contractInfoForm.creator = ''
this.contractInfoForm.modifyTime = ''
this.contractInfoForm.modifier = ''
- this.contractInfoForm.delFlag = ''
this.contractInfoForm.version = ''
},
putDimissionAttend(formName) {
@@ -3487,15 +4167,6 @@
},
cleanDimissionAttend() {
this.dimissionAttendForm.dimissionAttendId = ''
- this.dimissionAttendForm.empId = ''
- this.dimissionAttendForm.empNumb = ''
- this.dimissionAttendForm.empName = ''
- this.dimissionAttendForm.sex = ''
- this.dimissionAttendForm.certificateNumb = ''
- this.dimissionAttendForm.deptId = ''
- this.dimissionAttendForm.deptName = ''
- this.dimissionAttendForm.JobId = ''
- this.dimissionAttendForm.jobName = ''
this.dimissionAttendForm.attendMonth = ''
this.dimissionAttendForm.overtimeHour = ''
this.dimissionAttendForm.overtimeDay = ''
@@ -3506,7 +4177,6 @@
this.dimissionAttendForm.creator = ''
this.dimissionAttendForm.modifyTime = ''
this.dimissionAttendForm.modifier = ''
- this.dimissionAttendForm.delFlag = ''
this.dimissionAttendForm.version = ''
this.dimissionAttendForm.remark = ''
},
@@ -3540,15 +4210,6 @@
},
cleanLeaveInfo() {
this.leaveInfoForm.leaveId = ''
- this.leaveInfoForm.empId = ''
- this.leaveInfoForm.empNumb = ''
- this.leaveInfoForm.empName = ''
- this.leaveInfoForm.sex = ''
- this.leaveInfoForm.certificateNumb = ''
- this.leaveInfoForm.deptId = ''
- this.leaveInfoForm.deptName = ''
- this.leaveInfoForm.JobId = ''
- this.leaveInfoForm.jobName = ''
this.leaveInfoForm.beginTime = ''
this.leaveInfoForm.endTime = ''
this.leaveInfoForm.leaveType = ''
@@ -3559,7 +4220,6 @@
this.leaveInfoForm.creator = ''
this.leaveInfoForm.modifyTime = ''
this.leaveInfoForm.modifier = ''
- this.leaveInfoForm.delFlag = ''
this.leaveInfoForm.version = ''
this.leaveInfoForm.remark = ''
},
@@ -3593,15 +4253,6 @@
},
cleanResign() {
this.resignForm.resignId = ''
- this.resignForm.empId = ''
- this.resignForm.empNumb = ''
- this.resignForm.empName = ''
- this.resignForm.sex = ''
- this.resignForm.certificateNumb = ''
- this.resignForm.deptId = ''
- this.resignForm.deptName = ''
- this.resignForm.JobId = ''
- this.resignForm.jobName = ''
this.resignForm.applayDate = ''
this.resignForm.reporter = ''
this.resignForm.reason = ''
@@ -3609,7 +4260,6 @@
this.resignForm.creator = ''
this.resignForm.modifyTime = ''
this.resignForm.modifier = ''
- this.resignForm.delFlag = ''
this.resignForm.version = ''
this.resignForm.remark = ''
},
@@ -3643,15 +4293,6 @@
},
cleanUnemployment() {
this.unemploymentForm.unemploymentId = ''
- this.unemploymentForm.empId = ''
- this.unemploymentForm.empNumb = ''
- this.unemploymentForm.empName = ''
- this.unemploymentForm.sex = ''
- this.unemploymentForm.certificateNumb = ''
- this.unemploymentForm.deptId = ''
- this.unemploymentForm.deptName = ''
- this.unemploymentForm.JobId = ''
- this.unemploymentForm.jobName = ''
this.unemploymentForm.applayDate = ''
this.unemploymentForm.applayReason = ''
this.unemploymentForm.reporter = ''
@@ -3661,7 +4302,6 @@
this.unemploymentForm.creator = ''
this.unemploymentForm.modifyTime = ''
this.unemploymentForm.modifier = ''
- this.unemploymentForm.delFlag = ''
this.unemploymentForm.version = ''
},
handlePictureCardPreview(file) {
@@ -3737,15 +4377,6 @@
},
cleanInsurance() {
this.insuranceForm.insuranceId = ''
- this.insuranceForm.empId = ''
- this.insuranceForm.empNumb = ''
- this.insuranceForm.empName = ''
- this.insuranceForm.sex = ''
- this.insuranceForm.certificateNumb = ''
- this.insuranceForm.deptId = ''
- this.insuranceForm.deptName = ''
- this.insuranceForm.JobId = ''
- this.insuranceForm.jobName = ''
this.insuranceForm.applayDate = ''
this.insuranceForm.proposer = ''
this.insuranceForm.insuranceGaers = ''
@@ -3756,7 +4387,6 @@
this.insuranceForm.creator = ''
this.insuranceForm.modifyTime = ''
this.insuranceForm.modifier = ''
- this.insuranceForm.delFlag = ''
this.insuranceForm.version = ''
this.insuranceForm.remark = ''
},
@@ -3790,15 +4420,6 @@
},
cleanAccidentCases() {
this.accidentCasesForm.accidentId = ''
- this.accidentCasesForm.empId = ''
- this.accidentCasesForm.empNumb = ''
- this.accidentCasesForm.empName = ''
- this.accidentCasesForm.sex = ''
- this.accidentCasesForm.certificateNumb = ''
- this.accidentCasesForm.deptId = ''
- this.accidentCasesForm.deptName = ''
- this.accidentCasesForm.JobId = ''
- this.accidentCasesForm.jobName = ''
this.accidentCasesForm.injuredTime = ''
this.accidentCasesForm.injuredAddress = ''
this.accidentCasesForm.injuredPart = ''
@@ -3822,7 +4443,6 @@
this.accidentCasesForm.creator = ''
this.accidentCasesForm.modifyTime = ''
this.accidentCasesForm.modifier = ''
- this.accidentCasesForm.delFlag = ''
this.accidentCasesForm.version = ''
},
putOccupational(formName) {
@@ -3853,17 +4473,11 @@
}
})
},
+ getIndex($index) {
+ return (this.pagination.num - 1) * this.pagination.size + $index + 1
+ },
cleanOccupational() {
this.occupationalForm.occupationalId = ''
- this.occupationalForm.empId = ''
- this.occupationalForm.empNumb = ''
- this.occupationalForm.empName = ''
- this.occupationalForm.sex = ''
- this.occupationalForm.certificateNumb = ''
- this.occupationalForm.deptId = ''
- this.occupationalForm.deptName = ''
- this.occupationalForm.JobId = ''
- this.occupationalForm.jobName = ''
this.occupationalForm.injuredTime = ''
this.occupationalForm.injuredAddress = ''
this.occupationalForm.injuredPart = ''
@@ -3895,7 +4509,6 @@
this.occupationalForm.creator = ''
this.occupationalForm.modifyTime = ''
this.occupationalForm.modifier = ''
- this.occupationalForm.delFlag = ''
this.occupationalForm.version = ''
this.occupationalForm.remark = ''
},
@@ -3936,7 +4549,6 @@
this.workExperienceForm.creator = ''
this.workExperienceForm.modifyTime = ''
this.workExperienceForm.modifier = ''
- this.workExperienceForm.delFlag = ''
this.workExperienceForm.version = ''
},
putLaborTrouble(formName) {
@@ -3969,15 +4581,6 @@
},
cleanLaborTrouble() {
this.laborTroubleForm.arbitrationId = ''
- this.laborTroubleForm.empId = ''
- this.laborTroubleForm.empNumb = ''
- this.laborTroubleForm.empName = ''
- this.laborTroubleForm.sex = ''
- this.laborTroubleForm.certificateNumb = ''
- this.laborTroubleForm.deptId = ''
- this.laborTroubleForm.deptName = ''
- this.laborTroubleForm.JobId = ''
- this.laborTroubleForm.jobName = ''
this.laborTroubleForm.arbitrationDate = ''
this.laborTroubleForm.arbitrationType = ''
this.laborTroubleForm.arbitrationReason = ''
@@ -3989,7 +4592,6 @@
this.laborTroubleForm.creator = ''
this.laborTroubleForm.modifyTime = ''
this.laborTroubleForm.modifier = ''
- this.laborTroubleForm.delFlag = ''
this.laborTroubleForm.version = ''
this.laborTroubleForm.remark = ''
},
@@ -4023,15 +4625,6 @@
},
cleanBadRecord() {
this.badRecordForm.badId = ''
- this.badRecordForm.empId = ''
- this.badRecordForm.empName = ''
- this.badRecordForm.empNumb = ''
- this.badRecordForm.sex = ''
- this.badRecordForm.certificateNumb = ''
- this.badRecordForm.deptId = ''
- this.badRecordForm.deptName = ''
- this.badRecordForm.JobId = ''
- this.badRecordForm.jobName = ''
this.badRecordForm.badDate = ''
this.badRecordForm.reporter = ''
this.badRecordForm.badContent = ''
@@ -4039,7 +4632,6 @@
this.badRecordForm.creator = ''
this.badRecordForm.modifyTime = ''
this.badRecordForm.modifier = ''
- this.badRecordForm.delFlag = ''
this.badRecordForm.version = ''
this.badRecordForm.remark = ''
},
@@ -4073,22 +4665,12 @@
},
cleanRemarkInfo() {
this.remarkInfoForm.remarkId = ''
- this.remarkInfoForm.empId = ''
- this.remarkInfoForm.empNumb = ''
- this.remarkInfoForm.empName = ''
- this.remarkInfoForm.sex = ''
- this.remarkInfoForm.certificateNumb = ''
- this.remarkInfoForm.JobId = ''
- this.remarkInfoForm.deptId = ''
- this.remarkInfoForm.deptName = ''
- this.remarkInfoForm.jobName = ''
this.remarkInfoForm.remarkContent = ''
this.remarkInfoForm.remarkDate = ''
this.remarkInfoForm.createTime = ''
this.remarkInfoForm.creator = ''
this.remarkInfoForm.modifyTime = ''
this.remarkInfoForm.modifier = ''
- this.remarkInfoForm.delFlag = ''
this.remarkInfoForm.version = ''
},
dialogIsShow() {
@@ -4341,7 +4923,6 @@
},
editInsurance(row) {
this.isAdd = false
-
this.insuranceForm.insuranceId = row.insuranceId
this.insuranceForm.empId = row.empId
this.insuranceForm.empNumb = row.empNumb
@@ -4542,7 +5123,6 @@
this.dialogshowArr[index].show = true
},
gzdelete(tables, selection, Id) {
- debugger
if (!selection.length) {
this.$message({
message: this.$t('tips.noDataSelected'),
@@ -4835,7 +5415,6 @@
} else {
// update
this.$put('system/sysConfig', { ...this.sysConfig }).then(() => {
- debugger
this.buttonLoading = false
this.isVisible = false
this.$message({
@@ -4931,4 +5510,138 @@
.el-date-editor.el-input__inner {
width: 100%;
}
+
+.el-main {
+ margin-top: 2%;
+}
+.app-main {
+ background-color: #ffffff;
+}
+.el-button,
+.el-button--primary {
+ background: #a32c30;
+ border-color: #a32c30;
+ color: #fff;
+ outline: none;
+}
+.zs-main .text-header {
+ line-height: 40px;
+}
+.el-card {
+ border: none;
+}
+.el-input-number {
+ width: 100%;
+}
+
+.clearfix:before,
+.clearfix:after {
+ display: table;
+ content: '';
+}
+
+.clearfix:after {
+ clear: both;
+}
+.add-folder {
+ text-align: initial;
+}
+.zs-main {
+ .search-title {
+ height: 50px;
+ .search {
+ position: relative;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+ .title {
+ position: relative;
+ top: 40%;
+ transform: translateY(-50%);
+ }
+ .zs-title {
+ border-left: 4px solid #a32c30;
+ padding-left: 10px;
+ font-size: 16px;
+ }
+ }
+ .add-folder-but {
+ background: #fff !important;
+ color: #a32c30 !important;
+ margin-bottom: 20px;
+ }
+ padding: 0 15px 0 15px;
+ .text-header {
+ line-height: 60px;
+ }
+ .uploading-image {
+ width: 100%;
+ height: 100%;
+ display: block;
+ }
+}
+
+.el-timeline-item__timestamp {
+ font-size: 15px;
+ color: #000;
+}
+
+/* 设置带边框的checkbox，选中后边框的颜色 */
+.myRedCheckBox.is-bordered.is-checked {
+ border-color: #a32c30;
+}
+
+/* 设置选中后的文字颜色 */
+.myRedCheckBox .el-checkbox__input.is-checked + .el-checkbox__label {
+ color: #a32c30;
+}
+
+/* 设置选中后对勾框的边框和背景颜色 */
+.myRedCheckBox .el-checkbox__input.is-checked .el-checkbox__inner,
+.myRedCheckBox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ border-color: #a32c30;
+ background-color: #a32c30;
+}
+
+/* 设置checkbox获得焦点后，对勾框的边框颜色 */
+.myRedCheckBox .el-checkbox__input.is-focus .el-checkbox__inner {
+ border-color: #a32c30;
+}
+
+/* 设置鼠标经过对勾框，对勾框边框的颜色 */
+.myRedCheckBox .el-checkbox__inner:hover {
+ border-color: #a32c30;
+}
+
+.avatar-uploader .el-upload {
+ border: 1px dashed #d9d9d9;
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+ border-color: #409eff;
+}
+.avatar-uploader-icon {
+ font-size: 28px;
+ color: #8c939d;
+ width: 178px;
+ height: 178px;
+ line-height: 178px;
+ text-align: center;
+}
+.avatar {
+ width: 178px;
+ height: 178px;
+ display: block;
+}
+.avatar-uploader .el-upload-dragger .el-icon-upload {
+ margin: 20px 0 16px;
+}
+.avatar-uploader .el-upload-dragger {
+ border: none;
+ width: 100px;
+ height: 100px;
+}
</style>
--
Gitblit v1.8.0