admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-lhk' into shenzhen-dev

Browse Source
This commit is contained in:
kun 2024-03-11 11:45:10 +08:00
commit 5a6dbe869f
3 changed files with 140 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/assets/i18n/langs/cn/laborManage/personManage.js
View File

@ -611,56 +611,56 @@ export default {
trigger: "change",
},
],
nation: [
{
required: true,
message: "请选择民族",
trigger: "change",
},
{
required: true,
message: "请选择民族",
trigger: "submit",
},
],
nativePlace: [
{
required: true,
message: "请输入籍贯",
trigger: "blur",
},
],
issuingAuthorityForIdcard: [
{
required: true,
message: "请输入签发机关",
trigger: "blur",
},
],
idCardEndDate: [
{
required: true,
message: "请选择有效日期",
trigger: "submit",
},
{
required: true,
message: "请选择有效日期",
trigger: "change",
},
],
idCardUpPhotoUrl: [
{
required: true,
message: "请选择上传身份证",
trigger: "submit",
},
{
required: true,
message: "请选择上传身份证",
trigger: "change",
},
],
// nation: [
// {
// required: true,
// message: "请选择民族",
// trigger: "change",
// },
// {
// required: true,
// message: "请选择民族",
// trigger: "submit",
// },
// ],
// nativePlace: [
// {
// required: true,
// message: "请输入籍贯",
// trigger: "blur",
// },
// ],
// issuingAuthorityForIdcard: [
// {
// required: true,
// message: "请输入签发机关",
// trigger: "blur",
// },
// ],
// idCardEndDate: [
// {
// required: true,
// message: "请选择有效日期",
// trigger: "submit",
// },
// {
// required: true,
// message: "请选择有效日期",
// trigger: "change",
// },
// ],
// idCardUpPhotoUrl: [
// {
// required: true,
// message: "请选择上传身份证",
// trigger: "submit",
// },
// {
// required: true,
// message: "请选择上传身份证",
// trigger: "change",
// },
// ],
phoneNumber: [
{
required: true,
@ -668,20 +668,20 @@ export default {
trigger: "blur",
},
],
emergentPerson: [
{
required: true,
message: "请输入紧急联系人",
trigger: "blur",
},
],
emergentPhone: [
{
required: true,
message: "请输入紧急联系人电话",
trigger: "blur",
},
],
// emergentPerson: [
// {
// required: true,
// message: "请输入紧急联系人",
// trigger: "blur",
// },
// ],
// emergentPhone: [
// {
// required: true,
// message: "请输入紧急联系人电话",
// trigger: "blur",
// },
// ],
},
queryFails: '查询失败',
creditCode: '请输入正确的社会统一信用代码',

128
src/assets/i18n/langs/en/laborManage/personManage.js
View File

@ -519,56 +519,56 @@ export default {
trigger: "change",
},
],
nation: [
{
required: true,
message: "Please select nationality",
trigger: "change",
},
{
required: true,
message: "Please select nationality",
trigger: "submit",
},
],
nativePlace: [
{
required: true,
message: "Please enter your native place",
trigger: "blur",
},
],
issuingAuthorityForIdcard: [
{
required: true,
message: "Please enter the issuing authority",
trigger: "blur",
},
],
idCardEndDate: [
{
required: true,
message: "Please select an effective date",
trigger: "submit",
},
{
required: true,
message: "Please select an effective date",
trigger: "change",
},
],
idCardUpPhotoUrl: [
{
required: true,
message: "Please choose to upload your ID card",
trigger: "submit",
},
{
required: true,
message: "Please choose to upload your ID card",
trigger: "change",
},
],
// nation: [
// {
// required: true,
// message: "Please select nationality",
// trigger: "change",
// },
// {
// required: true,
// message: "Please select nationality",
// trigger: "submit",
// },
// ],
// nativePlace: [
// {
// required: true,
// message: "Please enter your native place",
// trigger: "blur",
// },
// ],
// issuingAuthorityForIdcard: [
// {
// required: true,
// message: "Please enter the issuing authority",
// trigger: "blur",
// },
// ],
// idCardEndDate: [
// {
// required: true,
// message: "Please select an effective date",
// trigger: "submit",
// },
// {
// required: true,
// message: "Please select an effective date",
// trigger: "change",
// },
// ],
// idCardUpPhotoUrl: [
// {
// required: true,
// message: "Please choose to upload your ID card",
// trigger: "submit",
// },
// {
// required: true,
// message: "Please choose to upload your ID card",
// trigger: "change",
// },
// ],
phoneNumber: [
{
required: true,
@ -576,20 +576,20 @@ export default {
trigger: "blur",
},
],
emergentPerson: [
{
required: true,
message: "Please enter an emergency contact",
trigger: "blur",
},
],
emergentPhone: [
{
required: true,
message: "Please enter your emergency contact number",
trigger: "blur",
},
],
// emergentPerson: [
// {
// required: true,
// message: "Please enter an emergency contact",
// trigger: "blur",
// },
// ],
// emergentPhone: [
// {
// required: true,
// message: "Please enter your emergency contact number",
// trigger: "blur",
// },
// ],
},
queryFails: 'The query fails',
creditCode: 'Please enter the correct social uniform credit code',

24
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -2999,18 +2999,18 @@ export default {
)
return
}
if (this.personForm.idCardUpPhotoUrl == '') {
this.$message.error(
this.$t('message.laborMange.pleaseUploadTheNationalEmblemOfIdCard')
)
return
}
if (this.personForm.idCardDownPhotoUrl == '') {
this.$message.error(
this.$t('message.laborMange.pleaseUploadYourIDCardPortrait')
)
return
}
// if (this.personForm.idCardUpPhotoUrl == '') {
// this.$message.error(
// this.$t('message.laborMange.pleaseUploadTheNationalEmblemOfIdCard')
// )
// return
// }
// if (this.personForm.idCardDownPhotoUrl == '') {
// this.$message.error(
// this.$t('message.laborMange.pleaseUploadYourIDCardPortrait')
// )
// return
// }
this.$refs[formName].validate((valid) => {
if (valid) {