From 6c0b67172bc799fa4d3f9891ce9da5261a3de43f Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:45:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/Informationinput.vue | 101 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index c1eb49c..1f8ee73 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -439,13 +439,13 @@
<el-form ref="empBaseInfoForm" :model="empBaseInfoForm" :rules="rules" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
- <el-form-item label="档案号">
+ <el-form-item label="档案号" prop="archivesNumb">
<el-input v-model="empBaseInfoForm.archivesNumb" />
</el-form-item>
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="empBaseInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="身份证号码">
+ <el-form-item label="身份证号码" prop="certificateNumb">
<el-input
v-model="empBaseInfoForm.certificateNumb"
@input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
@@ -457,7 +457,7 @@
<el-option label="临时工" value="2" />
</el-select>
</el-form-item>
- <el-form-item label="民族">
+ <el-form-item label="民族" prop="nation">
<el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
<el-option label="汉族" value="01" />
<el-option label="蒙古族" value="02" />
@@ -519,7 +519,7 @@
<el-option label="外国民族" value="98" />
</el-select>
</el-form-item>
- <el-form-item label="婚姻状态">
+ <el-form-item label="婚姻状态" prop="marriage">
<el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态">
<el-option label="未婚" value="1" />
<el-option label="已婚" value="2" />
@@ -529,10 +529,10 @@
<el-option label="其它" value="9" />
</el-select>
</el-form-item>
- <el-form-item label="身高(cm)">
+ <el-form-item label="身高(cm)" prop="stature">
<el-input v-model="empBaseInfoForm.stature" />
</el-form-item>
- <el-form-item label="政治面貌">
+ <el-form-item label="政治面貌" prop="politics">
<el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌">
<el-option label="中共党员" value="01" />
<el-option label="预备党员" value="02" />
@@ -549,7 +549,7 @@
<el-option label="群众" value="13" />
</el-select>
</el-form-item>
- <el-form-item label="最高学历">
+ <el-form-item label="最高学历" prop="education">
<el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历">
<el-option label="博士" value="10" />
<el-option label="硕士" value="11" />
@@ -563,7 +563,7 @@
<el-option label="无学历" value="91" />
</el-select>
</el-form-item>
- <el-form-item label="籍贯">
+ <el-form-item label="籍贯" prop="nativePlaceName">
<el-autocomplete
v-model="empBaseInfoForm.nativePlaceName"
class="inline-input"
@@ -572,19 +572,19 @@
@select="placeNameSelect"
/>
</el-form-item>
- <el-form-item label="现住址">
+ <el-form-item label="现住址" prop="currentAddress">
<el-input v-model="empBaseInfoForm.currentAddress" />
</el-form-item>
- <el-form-item label="电话号码">
+ <el-form-item label="电话号码" prop="telePhone">
<el-input v-model="empBaseInfoForm.telePhone" />
</el-form-item>
- <el-form-item label="招聘介绍人">
+ <el-form-item label="招聘介绍人" prop="introducer">
<el-input v-model="empBaseInfoForm.introducer" />
</el-form-item>
- <el-form-item label="银行名称">
+ <el-form-item label="银行名称" prop="bankName">
<el-input v-model="empBaseInfoForm.bankName" />
</el-form-item>
- <el-form-item label="保险类型">
+ <el-form-item label="保险类型" prop="insuranceType">
<el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型">
<el-option label="（深户）五险一档" value="1" />
<el-option label="（非深户）五险一档" value="2" />
@@ -593,10 +593,10 @@
<el-option label="（非深户）四险一档" value="5" />
</el-select>
</el-form-item>
- <el-form-item label="家庭成员及关系">
+ <el-form-item label="家庭成员及关系" prop="family">
<el-input v-model="empBaseInfoForm.family" />
</el-form-item>
- <el-form-item label="紧急联系电话">
+ <el-form-item label="紧急联系电话" prop="urgencyPhone">
<el-input v-model="empBaseInfoForm.urgencyPhone" />
</el-form-item>
</el-col>
@@ -629,13 +629,18 @@
<el-option label="女" value="2" />
</el-select>
</el-form-item>
- <el-form-item label="身份证有效期">
- <el-input v-model="empBaseInfoForm.certificateValidity" />
+ <el-form-item label="身份证有效期" prop="certificateValidity">
+ <el-date-picker
+ v-model="empBaseInfoForm.certificateValidity"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ />
</el-form-item>
- <el-form-item label="年龄">
+ <el-form-item label="年龄" prop="age">
<el-input v-model="empBaseInfoForm.age" />
</el-form-item>
- <el-form-item label="出生日期">
+ <el-form-item label="出生日期" prop="birthdate">
<el-date-picker
v-model="empBaseInfoForm.birthdate"
type="date"
@@ -643,45 +648,46 @@
placeholder="选择日期"
/>
</el-form-item>
- <el-form-item label="入职日期">
+ <el-form-item label="入职日期" prop="entryDate">
<el-date-picker
v-model="empBaseInfoForm.entryDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
+ @input="calculateSeniority"
/>
</el-form-item>
- <el-form-item label="入司工龄">
+ <el-form-item label="入司工龄" prop="seniority">
<el-input v-model="empBaseInfoForm.seniority" />
</el-form-item>
- <el-form-item label="户籍地址">
+ <el-form-item label="户籍地址" prop="censusAddress">
<el-input v-model="empBaseInfoForm.censusAddress" />
</el-form-item>
- <el-form-item label="保安员证号">
+ <el-form-item label="保安员证号" prop="guardNumb">
<el-input v-model="empBaseInfoForm.guardNumb" />
</el-form-item>
- <el-form-item label="保安员回执">
+ <el-form-item label="保安员回执" prop="returnReceipt">
<el-input v-model="empBaseInfoForm.returnReceipt" />
</el-form-item>
- <el-form-item label="档案情况">
+ <el-form-item label="档案情况" prop="archivesStatus">
<el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况">
<el-option label="未移交" value="0" />
<el-option label="已移交" value="1" />
</el-select>
</el-form-item>
- <el-form-item label="银行账号">
+ <el-form-item label="银行账号" prop="bankNumb">
<el-input v-model="empBaseInfoForm.bankNumb" />
</el-form-item>
- <el-form-item label="社保电脑号">
+ <el-form-item label="社保电脑号" prop="socialNumb">
<el-input v-model="empBaseInfoForm.socialNumb" />
</el-form-item>
- <el-form-item label="员工手册">
+ <el-form-item label="员工手册" prop="handbookStatus">
<el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册">
<el-option label="未发" value="0" />
<el-option label="已发" value="1" />
</el-select>
</el-form-item>
- <el-form-item label="工作证">
+ <el-form-item label="工作证" prop="empCardStatus">
<el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证">
<el-option label="未发" value="0" />
<el-option label="已发" value="1" />
@@ -689,7 +695,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="相关证件">
+ <el-form-item label="相关证件" prop="certificateList">
<el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件">
<el-option label="高中毕业证" value="1" />
<el-option label="专科毕业证" value="2" />
@@ -1812,7 +1818,7 @@
</div>
</template>
<script>
-import { toCardGetUserInfo } from '@/utils/myUtil'
+import { calculateSeniority, toCardGetUserInfo } from '@/utils/myUtil'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Pagination from '@/components/Pagination'
@@ -1847,13 +1853,23 @@
certificateNumb: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
jobName: [{ required: true, message: '请选择岗位', trigger: 'change' }],
nativePlaceName: [{ required: true, message: '请选择籍贯', trigger: 'change' }],
- bankName: [{ required: true, message: '请输入银行名称', trigger: 'blur' }],
+ bankName: [{ required: true, message: '请输入银行名称', trigger: 'blur' }, { max: 36, message: '长度不超过36个字符', trigger: 'blur' }],
insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
- bankNumb: [{ required: true, message: '请输入银行账号', trigger: 'blur' }],
- empType: [{ required: true, message: '请选择员工类型', trigger: 'change' }]
+ bankNumb: [{ required: true, message: '请输入银行账号', trigger: 'blur' }, { max: 32, message: '长度不超过32个字符', trigger: 'blur' }],
+ empType: [{ required: true, message: '请选择员工类型', trigger: 'change' }],
+ censusAddress: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
+ currentAddress: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
+ guardNumb: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+ telePhone: [{ max: 30, message: '长度不超过30个字符', trigger: 'blur' }],
+ returnReceipt: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+ introducer: [{ max: 32, message: '长度不超过32个字符', trigger: 'blur' }],
+ socialNumb: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+ family: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
+ certificateValidity: [{ required: true, message: '请选择身份证有效期', trigger: 'change' }],
+ urgencyPhone: [{ max: 30, message: '长度不超过30个字符', trigger: 'blur' }]
},
workExperienceRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
@@ -2171,6 +2187,7 @@
modifyTime: '',
modifier: '',
delFlag: '',
+ empStatus: 0,
version: ''
},
laborTroubleForm: {
@@ -2197,6 +2214,7 @@
modifier: '',
delFlag: '',
version: '',
+ empStatus: 0,
remark: ''
},
occupationalForm: {
@@ -2243,6 +2261,7 @@
modifier: '',
delFlag: '',
version: '',
+ empStatus: 0,
remark: ''
},
accidentCasesForm: {
@@ -2280,6 +2299,7 @@
modifyTime: '',
modifier: '',
delFlag: '',
+ empStatus: 0,
version: ''
},
insuranceForm: {
@@ -2305,6 +2325,7 @@
modifier: '',
delFlag: '',
version: '',
+ empStatus: 0,
remark: ''
},
unemploymentForm: {
@@ -2328,6 +2349,7 @@
modifyTime: '',
modifier: '',
delFlag: '',
+ empStatus: 0,
version: ''
},
resignForm: {
@@ -2350,6 +2372,7 @@
modifier: '',
delFlag: '',
version: '',
+ empStatus: 0,
remark: ''
},
leaveInfoForm: {
@@ -2375,6 +2398,7 @@
modifier: '',
delFlag: '',
version: '',
+ empStatus: 0,
remark: ''
},
contractInfoForm: {
@@ -2400,6 +2424,7 @@
modifyTime: '',
modifier: '',
delFlag: '',
+ empStatus: 0,
version: ''
},
dimissionAttendForm: {
@@ -2426,6 +2451,7 @@
modifier: '',
delFlag: '',
version: '',
+ empStatus: 0,
remark: ''
},
physicalExamForm: {
@@ -2453,6 +2479,7 @@
modifyTime: '',
modifier: '',
delFlag: '',
+ empStatus: 0,
version: ''
},
workExperienceForm: {
@@ -2475,6 +2502,7 @@
modifyTime: '',
modifier: '',
delFlag: '',
+ empStatus: 0,
version: ''
},
empBaseInfoForm: {
@@ -2524,6 +2552,7 @@
modifyTime: '',
modifier: '',
delFlag: '',
+ empStatus: 0,
version: ''
},
badRecordForm: {
@@ -2546,6 +2575,7 @@
modifier: '',
delFlag: '',
version: '',
+ empStatus: 0,
remark: ''
}
}
@@ -4863,6 +4893,9 @@
this.empBaseInfoForm.sex = userinfo.sex
break
}
+ },
+ calculateSeniority(val) {
+ this.empBaseInfoForm.seniority = calculateSeniority(val)
}
}
}
--
Gitblit v1.8.0