Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhaomeijing
2022-05-06 18:17:06 +08:00
13 changed files with 1030 additions and 21 deletions
@@ -135,7 +135,7 @@
<div class="title-text">
<span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" prop="remark">
<a-textarea
:placeholder="$t('PleaseEnter')+$t('remarks')"
:disabled="false"
@@ -214,29 +214,56 @@
certificationEngineerName: [
{
required: true,
message: this.$t('certifiedEngineer') + this.$t('certifiedEngineer'),
message: this.$t('certifiedEngineer') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
dutyTerritory: [
{
required: true,
message: this.$t('certifiedEngineer') + this.$t('areaOfResponsibility'),
message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('areaOfResponsibility') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
lawEngineerName: [
{
required: true,
message: this.$t('certifiedEngineer') + this.$t('regulatoryEngineer'),
message: this.$t('regulatoryEngineer') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('regulatoryEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
engineeringInterfacePersonName: [
{
required: true,
message: this.$t('certifiedEngineer') + this.$t('engineeringInterfacePerson'),
message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('engineeringInterfacePerson') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
remark: [
{
max: 500,
message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
]
},
@@ -297,6 +324,7 @@
this.editVisible = true
this.$nextTick(() => {
this.formInline = JSON.parse(JSON.stringify(item))
this.$refs.ruleForm.clearValidate()
})
},
PersonnelSelectionChange(value, id) {