diff --git a/src/views/PersonManager/user/components/add.vue b/src/views/PersonManager/user/components/add.vue index 2124c47..fa4df89 100644 --- a/src/views/PersonManager/user/components/add.vue +++ b/src/views/PersonManager/user/components/add.vue @@ -302,11 +302,18 @@ - + { - if (this.form.IS_LEVEL_THREE == '0') { - this.form.photosOfLevel = [] - callback() - } else { - if (this.form.photosOfLevel.length == 0) callback(new Error('三级培训不为空')) - } - callback() - } + // var hasLevelThree = (rule, value, callback) => { + // if (this.form.IS_LEVEL_THREE == '0') { + // this.form.photosOfLevel = [] + // callback() + // } else { + // if (this.form.photosOfLevel.length == 0) callback(new Error('三级培训不为空')) + // } + // callback() + // } var hasCARD = (rule, value, callback) => { requestFN( '/user/goCheck?CARD_NO=' + value @@ -606,7 +613,7 @@ export default { insuranceFileList: [{ required: false, message: '请上传合保险图片', trigger: 'blur' }], userCardFile: [{ type: 'array', required: true, message: '请上传身份证图片', trigger: 'blur' }], zhebaoZhaopian: [{ type: 'array', required: false, message: '请上传社保卡照片', trigger: 'blur' }], - photosOfLevel: [{ type: 'array', required: true, message: '请上传三级教育照片', trigger: 'blur', validator: hasLevelThree }], + // photosOfLevel: [{ type: 'array', required: true, message: '请上传三级教育照片', trigger: 'blur', validator: hasLevelThree }], gongshangbaoxianFile: [{ type: 'array', required: false, message: '请上传工伤保险凭证', trigger: 'blur' }], SOCIAL_NUMBER: [{ required: true, message: '社会保障号码不能为空', trigger: 'blur' }, { validator: hasSOCIAL }], diff --git a/src/views/PersonManager/user/components/edit.vue b/src/views/PersonManager/user/components/edit.vue index e6ad350..41729c2 100644 --- a/src/views/PersonManager/user/components/edit.vue +++ b/src/views/PersonManager/user/components/edit.vue @@ -305,11 +305,18 @@ - + { this.form = Object.assign(this.form, data.pd) // copy obj console.log(this.form) + if (this.form.IS_INJURIES_PAY_TIME_START && this.form.IS_INJURIES_PAY_TIME_END) { + this.form.IS_INJURIES_PAY_TIME = [this.form.IS_INJURIES_PAY_TIME_START, this.form.IS_INJURIES_PAY_TIME_END]; + } if (data.userPhotoFile) { data.userPhotoFile.map(item => { const obj = { id: item.IMGFILES_ID, name: item.FILENAME, url: config.fileUrl + item.FILEPATH } diff --git a/src/views/PersonManager/user/components/view.vue b/src/views/PersonManager/user/components/view.vue index f341d35..e328aa9 100644 --- a/src/views/PersonManager/user/components/view.vue +++ b/src/views/PersonManager/user/components/view.vue @@ -105,7 +105,7 @@ 是否按期缴纳工伤保险 {{ formatLabel(dataForm.IS_INJURIES_PAY) }} 工伤保险有效期 - {{ dataForm.IS_INJURIES_PAY_TIME }} + {{ dataForm.IS_INJURIES_PAY_TIME_START + ' - ' + dataForm.IS_INJURIES_PAY_TIME_END}} 工伤保险凭证