From a7977aac3851fa49a83f0a389221e6b3825dcb0b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 22 四月 2024 19:11:48 +0800
Subject: [PATCH] feat: 将劳资案件改为仲裁案件
---
src/views/user/Informationinput.vue | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index bb22151..0cc686e 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -37,7 +37,7 @@
<span :class="thisShowIndex===10?'selectedTimeline':''">工伤案件</span>
</el-timeline-item>
<el-timeline-item v-show="timelineShow('empLabortrouble:list')" @click.native="isShow(showArr[11].show, 11)">
- <span :class="thisShowIndex===11?'selectedTimeline':''">劳资案件</span>
+ <span :class="thisShowIndex===11?'selectedTimeline':''">仲裁案件</span>
</el-timeline-item>
<el-timeline-item v-show="timelineShow('empBadrecord:list')" @click.native="isShow(showArr[12].show, 12)">
<span :class="thisShowIndex===12?'selectedTimeline':''">不良记录</span>
@@ -115,7 +115,7 @@
<el-table-column
prop="insuranceType"
show-overflow-tooltip
- label="保险类型"
+ label="社保档位"
width="80"
:formatter="insuranceTypeFormat"
/>
@@ -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">
@@ -1138,7 +1138,15 @@
/>
</el-form-item>
<el-form-item label="性别" prop="sex">
- <el-input v-model="contractInfoForm.sex" />
+ <!-- <el-input v-model="contractInfoForm.sex" />-->
+ <el-select v-model="contractInfoForm.sex" placeholder="请选择性别">
+ <el-option
+ v-for="dict in sexOptions"
+ :key="dict.dicItemCode"
+ :label="dict.dicItemName"
+ :value="dict.dicItemCode"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="合同签订日期" prop="signingDate">
<el-date-picker
@@ -1935,7 +1943,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="劳资案件" :visible.sync="dialogshowArr[11].show" width="50%">
+ <el-dialog title="仲裁案件" :visible.sync="dialogshowArr[11].show" width="50%">
<el-form
ref="laborTroubleForm"
:model="laborTroubleForm"
@@ -2213,7 +2221,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 +2299,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 +3129,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 => {
@@ -3861,7 +3869,7 @@
// 起始日期有，进行判断
if (this.compareDate(this.contractInfoForm.signingDate, value)) {
// 如果起始在结束之前
- this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'y')
+ this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'o')
callback()
} else {
callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
@@ -3876,7 +3884,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('结束日期不能在开始始日期之前，请重新选择'))
@@ -4348,6 +4356,7 @@
this.empBaseInfoForm.version = row.version
this.dialogshowArr[0].show = true
this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + row.empId
+ this.empBaseInfoForm.insuranceType = row.insuranceType
},
putEmpBase(formName) {
this.$refs[formName].validate((valid) => {
--
Gitblit v1.8.0