From 1f8f4772ad2afc1989a996b5695832c1f39afbf6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 02 三月 2024 14:58:47 +0800
Subject: [PATCH] 员工基本信息将【家庭成员及关系】改为【家庭成员及关系1】，【紧急联系电话】改成【家庭成员及关系2】 - 信息录入→基本信息新增界面修改完成 - 在职员工：新增、修改、查看档案、导出excel选择字段界面调整完成 - 离职员工：查看档案、导出excel选择字段界面调整完成 - 员工智搜：导出excel选择字段界面调整完成
---
src/views/user/Informationinput.vue | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 3d06897..234b926 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -115,7 +115,7 @@
<el-table-column
prop="insuranceType"
show-overflow-tooltip
- label="保险类型"
+ label="社保档位"
width="80"
:formatter="insuranceTypeFormat"
/>
@@ -409,7 +409,7 @@
<el-table-column prop="reportStatus " label="是否已报告" width="100" :formatter="reportStatusFormat" />
<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-column prop="remark" label="备注" width="300" />
</el-table>
<el-table
v-show="showArr[9].show"
@@ -772,11 +772,11 @@
<el-form-item label="招聘介绍人" prop="introducer">
<el-input v-model="empBaseInfoForm.introducer" />
</el-form-item>
- <el-form-item label="银行名称" prop="bankName">
+ <el-form-item label="银行名称">
<el-input v-model="empBaseInfoForm.bankName" />
</el-form-item>
- <el-form-item label="保险类型" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型">
+ <el-form-item label="社保档位" prop="insuranceType">
+ <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择社保档位">
<el-option
v-for="dict in insuranceTypeOptions"
:key="dict.dicItemCode"
@@ -785,10 +785,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="家庭成员及关系" prop="family">
+ <el-form-item label="家庭成员及关系1" prop="family">
<el-input v-model="empBaseInfoForm.family" />
</el-form-item>
- <el-form-item label="紧急联系电话" prop="urgencyPhone">
+ <el-form-item label="家庭成员及关系2" prop="urgencyPhone">
<el-input v-model="empBaseInfoForm.urgencyPhone" />
</el-form-item>
</el-col>
@@ -879,7 +879,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="银行账号" prop="bankNumb">
+ <el-form-item label="银行账号">
<el-input v-model="empBaseInfoForm.bankNumb" />
</el-form-item>
<el-form-item label="社保电脑号" prop="socialNumb">
@@ -2213,7 +2213,7 @@
message: '长度不超过36个字符',
trigger: 'blur'
}],
- insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
+ insuranceType: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
@@ -2291,10 +2291,10 @@
pattern: /^\d{1,2}(\.\d{1,1})?$/,
message: '出勤天数精确到1位小数'
}],
- overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
- overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
- leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
- absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
+ overtimeDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
+ overtimeHour: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
+ leaveDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
+ absenteeism: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
leaveInfoRules: {
@@ -3121,7 +3121,7 @@
this.getDicts('LEAVETYPE').then(response => {
this.leaveTypeOptions = response.data
})
- this.getDicts('insuranceGaers').then(response => {
+ this.getDicts('INSURANCETYPE').then(response => {
this.insuranceGaersOptions = response.data
})
this.getDicts('applayStatus').then(response => {
@@ -3876,7 +3876,7 @@
// 起始日期有，进行判断
if (this.compareDate(this.leaveInfoForm.beginTime, value)) {
// 如果起始在结束之前
- this.leaveInfoForm.leaveDay = dateDifference(this.leaveInfoForm.beginTime, this.leaveInfoForm.endTime, 'd')
+ // this.leaveInfoForm.leaveDay = dateDifference(this.leaveInfoForm.beginTime, this.leaveInfoForm.endTime, 'd')
callback()
} else {
callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
--
Gitblit v1.8.0