From 706672829b43ac55837bfcb34132550fb97f41ef Mon Sep 17 00:00:00 2001
From: 楚江漓i <85093541@qq.com>
Date: 星期五, 12 三月 2021 00:04:39 +0800
Subject: [PATCH] 信息录入调整
---
src/views/user/Informationinput.vue | 221 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 120 insertions(+), 101 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index e6cefc9..a0b87c0 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -80,33 +80,33 @@
编辑
</span>
</template>
- </el-table-column>
- <el-table-column label="照片" width="60">
- <template slot-scope="scope">
- <!-- <img :src="scope.row.imagePath">-->
- <el-image
- v-if="scope.row.imagePath && scope.row.imagePath != ''"
- style="width: 30px; height: 30px"
- :src="scope.row.imagePath"
- fit="cover"
- />
+ </el-table-column>-->
+ <!-- <el-table-column label="照片" width="60">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <!– <img :src="scope.row.imagePath">–>-->
+ <!-- <el-image-->
+ <!-- v-if="scope.row.imagePath && scope.row.imagePath != ''"-->
+ <!-- style="width: 30px; height: 30px"-->
+ <!-- :src="scope.row.imagePath"-->
+ <!-- fit="cover"-->
+ <!-- />-->
- <el-image
- v-else
- style="width: 30px; height: 30px"
- :src="defaultImg"
- fit="cover"
- />
- </template>
- </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-image-->
+ <!-- v-else-->
+ <!-- style="width: 30px; height: 30px"-->
+ <!-- :src="defaultImg"-->
+ <!-- fit="cover"-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
<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" />
<el-table-column show-overflow-tooltip prop="nation" label="民族" width="50" :formatter="nationFormat" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="marriage" label="婚姻状况" width="80" :formatter="marriageFormat" />
<el-table-column show-overflow-tooltip prop="politics" label="政治面貌" width="80" :formatter="politicsFormat" />
<el-table-column show-overflow-tooltip prop="education" label="学历" width="50" :formatter="educationFormat" />
@@ -118,8 +118,8 @@
width="80"
:formatter="insuranceTypeFormat"
/>
- <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" />
- <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" />
+ <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" width="100" />
+ <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" width="100" />
<el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" width="80" />
<el-table-column prop="archivesStatusName" show-overflow-tooltip label="档案情况" />
</el-table>
@@ -149,12 +149,12 @@
</template>
</el-table-column>
<el-table-column prop="empNumb" 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" />
- <el-table-column prop="endDate" label="结束日期" width="120" />
- <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" />
+ <el-table-column prop="empName" label="姓名" width="100" />
+ <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" width="180" />
+ <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" width="160" />
+ <el-table-column prop="beginDate" label="开始日期" width="140" />
+ <el-table-column prop="endDate" label="结束日期" width="140" />
+ <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" min-width="120" />
</el-table>
<el-table
v-show="showArr[2].show"
@@ -183,11 +183,11 @@
</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="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
+ <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" min-width="100" />
<el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
<el-table-column
show-overflow-tooltip
@@ -199,8 +199,8 @@
<el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="60" />
<el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
<el-table-column prop="ecg" show-overflow-tooltip label="心电图" width="80" :formatter="ecgNameFormat" />
- <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" />
- <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查记录" />
+ <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" min-width="100" />
+ <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查日期" min-width="100" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
</el-table>
<el-table
@@ -230,15 +230,15 @@
</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="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
- <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" />
- <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" />
- <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
- <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" />
+ <el-table-column prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="155" />
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
+ <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" width="80" />
+ <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="100" />
</el-table>
<el-table
v-show="showArr[4].show"
@@ -262,10 +262,10 @@
</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="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
<el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
<el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="100" />
@@ -296,15 +296,15 @@
</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="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="120" />
- <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <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="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="110" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="110" />
<el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
<el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="80" :formatter="leaveTypeFormat" />
- <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="110" />
<el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -328,11 +328,11 @@
</span>
</template>
</el-table-column>
- <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="empNumb" label="编号" />
- <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="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <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="身份证号码" width="160" />
<el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
@@ -359,10 +359,10 @@
</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="allDeptName" label="部门(护卫点)" width="300" />
+ <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="certificateNumb" label="身份证号码" width="150" />
<el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" />
<el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
@@ -390,16 +390,16 @@
</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="allDeptName" label="部门(护卫点)" width="300" />
+ <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="社保申请日期" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="120" />
<el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="80" />
- <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
+ <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" width="80" />
<el-table-column prop="reportStatus " label="是否已报告" width="100" :formatter="reportStatusFormat" />
- <el-table-column prop="applayStatus" label="状态" width="100" :formatter="applayStatusFormat" />
- <el-table-column prop="auditor" label="审核人" width="100" />
+ <el-table-column prop="applayStatus" label="状态" width="80" :formatter="applayStatusFormat" />
+ <el-table-column prop="auditor" label="审核人" width="80" />
<el-table-column prop="remark" label="备注" />
</el-table>
<el-table
@@ -422,13 +422,13 @@
</span>
</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="empNumb" label="编号" width="70" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <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="受伤日期" />
- <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="80" />
<el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
<el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
<el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="120" />
@@ -468,8 +468,8 @@
</span>
</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="empNumb" label="编号" width="70" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<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,11 +516,10 @@
</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="allDeptName" label="部门(护卫点)" width="280" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<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="arbitrationDate" label="仲裁日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
<el-table-column
show-overflow-tooltip
@@ -529,18 +528,18 @@
width="100"
:formatter="arbitrationTypeFormat"
/>
- <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
- <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
+ <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" min-width="100" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="70" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
<el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="120" />
<el-table-column
show-overflow-tooltip
prop="arbitrationStatus"
label="状态"
- width="80"
+ width="50"
:formatter="arbitrationStatusFormat"
/>
- <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
</el-table>
<el-table
v-show="showArr[12].show"
@@ -568,12 +567,12 @@
</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="allDeptName" label="部门(护卫点)" width="300" />
<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="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
<el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" />
- <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" min-width="120" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="120" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -597,12 +596,12 @@
</span>
</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="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<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="身份证号码" />
- <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="150" />
<el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
</el-table>
<pagination
@@ -625,14 +624,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"
@@ -795,6 +794,7 @@
:clear-value-text="$t('common.clear')"
placeholder="请选择部门(护卫点)"
style="width:100%"
+ @select="DeptNameSelect"
/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
@@ -1077,8 +1077,13 @@
<el-form-item label="体检结论" prop="conclusion">
<el-input v-model="physicalExamForm.conclusion" />
</el-form-item>
- <el-form-item label="复查记录" prop="reviewRecord">
- <el-input v-model="physicalExamForm.reviewRecord" />
+ <el-form-item label="复查日期" prop="reviewRecord">
+ <el-date-picker
+ v-model="physicalExamForm.reviewRecord"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="选择复查日期"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -1336,12 +1341,12 @@
<el-input v-model="leaveInfoForm.leaveDay" />
</el-form-item>
- <el-form-item label="到岗时间" prop="returnDate">
+ <el-form-item label="返岗时间" prop="returnDate">
<el-date-picker
v-model="leaveInfoForm.returnDate"
value-format="yyyy-MM-dd"
type="date"
- placeholder="选择到岗时间"
+ placeholder="选择返岗时间"
/>
</el-form-item>
@@ -2158,6 +2163,8 @@
components: { Treeselect, Pagination },
data() {
return {
+ downloadEmpExcel: pages.downloadEmpExcel,
+ uploadEmpExcel: pages.uploadEmpExcel,
defaultImg: require('../../assets/avatar/20180414165936.jpg'),
baseicInformationForm: {},
dialogShowDryg: false,
@@ -2178,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' }],
@@ -2282,7 +2289,7 @@
beginTime: [{ required: true, validator: this.startDate }],
leaveType: [{ required: true, message: '请选择请假类型', trigger: 'change' }],
endTime: [{ required: true, validator: this.endDate }],
- returnDate: [{ required: true, message: '请选择到岗时间', trigger: 'change' }],
+ returnDate: [{ required: true, message: '请选择返岗时间', trigger: 'change' }],
reporter: [{ required: true, message: '请输入报备人', trigger: 'blur' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
@@ -3112,6 +3119,7 @@
this.initDept()
this.thisShowIndex = 1
this.isShow(false, 0)
+ this.initJob()
},
methods: {
importHandleAvatarError() {
@@ -3121,7 +3129,7 @@
})
},
importHandleAvatarSuccess(res, file) {
- if (res.data === null) {
+ if (res.data === null || res.data.length === 0) {
this.$notify({
title: '成功',
message: '导入成功!',
@@ -3382,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) {
@@ -3612,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) => {
@@ -4347,6 +4360,7 @@
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.isAdd) {
+ this.workExperienceForm.delFlag = '2'
this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
this.buttonLoading = false
this.$message({
@@ -4375,6 +4389,7 @@
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.isAdd) {
+ this.workExperienceForm.delFlag = '2'
this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
this.buttonLoading = false
this.$message({
@@ -5823,6 +5838,10 @@
}, jobNameSelect(item) {
this.empBaseInfoForm.jobName = item.value
this.empBaseInfoForm.JobId = item.code
+ }, DeptNameSelect(val) {
+ this.empBaseInfoForm.deptId = val.deptId
+ this.empBaseInfoForm.deptName = val.label
+ this.empBaseInfoForm.allDeptName = val.allDeptName
},
generateUserInfo(index, val) {
var userinfo = toCardGetUserInfo(val)
--
Gitblit v1.8.0