[系统优化](dev):

- 工伤保险有效期更新为开始时间-结束时间
- 三级安全教育照片非必填
- 推送工匠学院头像问题修复
dev
huangyuxuan 2025-02-20 16:59:25 +08:00
parent 7b416f962c
commit 24882f914a
3 changed files with 37 additions and 18 deletions

View File

@ -302,11 +302,18 @@
<el-radio v-model="form.IS_INJURIES_PAY" label="0"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.IS_INJURIES_PAY ==='1'" label="工伤保险有效期" prop="IS_INJURIES_PAY_TIME" style="float:left">
<el-form-item
v-if="form.IS_INJURIES_PAY ==='1'"
label="工伤保险有效期"
prop="IS_INJURIES_PAY_TIME"
style="float:left"
>
<el-date-picker
v-model="form.IS_INJURIES_PAY_TIME"
type="date"
placeholder="选择日期"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
style="width: 290px"
@ -426,15 +433,15 @@ export default {
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 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 }],

View File

@ -305,11 +305,18 @@
<el-radio v-model="form.IS_INJURIES_PAY" label="0"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.IS_INJURIES_PAY ==='1'" label="工伤保险有效期" prop="IS_INJURIES_PAY_TIME" style="float:left">
<el-form-item
v-if="form.IS_INJURIES_PAY ==='1'"
label="工伤保险有效期"
prop="IS_INJURIES_PAY_TIME"
style="float:left"
>
<el-date-picker
v-model="form.IS_INJURIES_PAY_TIME"
type="date"
placeholder="选择日期"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
style="width: 290px"
@ -615,7 +622,7 @@ export default {
insuranceFileList: [{ required: false, message: '请上传合保险图片', trigger: 'blur' }],
userCardFile: [{ type: 'array', required: true, message: '请上传身份证图片', trigger: 'blur' }],
zhebaoZhaopian: [{ type: 'array', required: true, message: '请上传社保卡照片', trigger: 'blur' }, { validator: hasSOCIALPHTOT }],
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 }],
ISPAY: [{ required: false, message: '请选择是否缴纳商业保险', trigger: 'blur' }],
@ -717,6 +724,8 @@ export default {
IS_SAFETY_TELL: '',
ISPAY: '',
IS_INJURIES_PAY_TIME: '',
IS_INJURIES_PAY_TIME_START: '',
IS_INJURIES_PAY_TIME_END: '',
ISPAY_NUMBER: '',
IS_SIGN_LABOR: '',
IS_HAZARDCONFIRMER: 0,
@ -1268,6 +1277,9 @@ export default {
).then((data) => {
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 }

View File

@ -105,7 +105,7 @@
<th>是否按期缴纳工伤保险</th>
<td :colspan="dataForm.IS_INJURIES_PAY === '1' ? '':5">{{ formatLabel(dataForm.IS_INJURIES_PAY) }}</td>
<th v-if="dataForm.IS_INJURIES_PAY === '1'"></th>
<td v-if="dataForm.IS_INJURIES_PAY === '1'">{{ dataForm.IS_INJURIES_PAY_TIME }}</td>
<td v-if="dataForm.IS_INJURIES_PAY === '1'">{{ dataForm.IS_INJURIES_PAY_TIME_START + ' - ' + dataForm.IS_INJURIES_PAY_TIME_END}}</td>
<th v-if="dataForm.IS_INJURIES_PAY === '1'"></th>
<td v-if="dataForm.IS_INJURIES_PAY === '1'">
<span>