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

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

@ -519,56 +519,56 @@ export default {
trigger: "change", trigger: "change",
}, },
], ],
nation: [ // nation: [
{ // {
required: true, // required: true,
message: "Please select nationality", // message: "Please select nationality",
trigger: "change", // trigger: "change",
}, // },
{ // {
required: true, // required: true,
message: "Please select nationality", // message: "Please select nationality",
trigger: "submit", // trigger: "submit",
}, // },
], // ],
nativePlace: [ // nativePlace: [
{ // {
required: true, // required: true,
message: "Please enter your native place", // message: "Please enter your native place",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
issuingAuthorityForIdcard: [ // issuingAuthorityForIdcard: [
{ // {
required: true, // required: true,
message: "Please enter the issuing authority", // message: "Please enter the issuing authority",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
idCardEndDate: [ // idCardEndDate: [
{ // {
required: true, // required: true,
message: "Please select an effective date", // message: "Please select an effective date",
trigger: "submit", // trigger: "submit",
}, // },
{ // {
required: true, // required: true,
message: "Please select an effective date", // message: "Please select an effective date",
trigger: "change", // trigger: "change",
}, // },
], // ],
idCardUpPhotoUrl: [ // idCardUpPhotoUrl: [
{ // {
required: true, // required: true,
message: "Please choose to upload your ID card", // message: "Please choose to upload your ID card",
trigger: "submit", // trigger: "submit",
}, // },
{ // {
required: true, // required: true,
message: "Please choose to upload your ID card", // message: "Please choose to upload your ID card",
trigger: "change", // trigger: "change",
}, // },
], // ],
phoneNumber: [ phoneNumber: [
{ {
required: true, required: true,
@ -576,20 +576,20 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
emergentPerson: [ // emergentPerson: [
{ // {
required: true, // required: true,
message: "Please enter an emergency contact", // message: "Please enter an emergency contact",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
emergentPhone: [ // emergentPhone: [
{ // {
required: true, // required: true,
message: "Please enter your emergency contact number", // message: "Please enter your emergency contact number",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
}, },
queryFails: 'The query fails', queryFails: 'The query fails',
creditCode: 'Please enter the correct social uniform credit code', 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 return
} }
if (this.personForm.idCardUpPhotoUrl == '') { // if (this.personForm.idCardUpPhotoUrl == '') {
this.$message.error( // this.$message.error(
this.$t('message.laborMange.pleaseUploadTheNationalEmblemOfIdCard') // this.$t('message.laborMange.pleaseUploadTheNationalEmblemOfIdCard')
) // )
return // return
} // }
if (this.personForm.idCardDownPhotoUrl == '') { // if (this.personForm.idCardDownPhotoUrl == '') {
this.$message.error( // this.$message.error(
this.$t('message.laborMange.pleaseUploadYourIDCardPortrait') // this.$t('message.laborMange.pleaseUploadYourIDCardPortrait')
) // )
return // return
} // }
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {