diff --git a/src/views/PersonManager/user/components/add.vue b/src/views/PersonManager/user/components/add.vue index 2953b17..80ac782 100644 --- a/src/views/PersonManager/user/components/add.vue +++ b/src/views/PersonManager/user/components/add.vue @@ -183,7 +183,7 @@ - + - - + +
diff --git a/src/views/PersonManager/user/components/edit.vue b/src/views/PersonManager/user/components/edit.vue index 54aadc5..c916c88 100644 --- a/src/views/PersonManager/user/components/edit.vue +++ b/src/views/PersonManager/user/components/edit.vue @@ -133,8 +133,8 @@ - + @@ -170,7 +170,6 @@ - @@ -184,7 +183,7 @@ - + - @@ -236,6 +234,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1008,6 +1100,33 @@ export default { } } } + if (this.form.IS_INJURIES_PAY === '1') { + if (this.$refs['gongshangFileList'].uploadFiles.length > 0) { + for (let i = 0; i < this.$refs['gongshangFileList'].uploadFiles.length; i++) { + if (this.$refs['gongshangFileList'].uploadFiles[i]) { + formData.append('WORK_INSURANCE_LIST', this.$refs['gongshangFileList'].uploadFiles[i].raw) + } + } + } + } + if (this.form.ISPAY === '1') { + if (this.form.insuranceFileList.length > 0) { + for (let i = 0; i < this.form.insuranceFileList.length; i++) { + if (this.form.insuranceFileList[i]) { + formData.append('insuranceFile', this.form.insuranceFileList[i].raw) + } + } + } + } + if (this.form.IS_SIGN_LABOR === '1') { + if (this.form.contractFileList.length > 0) { + for (let i = 0; i < this.form.contractFileList.length; i++) { + if (this.form.contractFileList[i]) { + formData.append('contractFile', this.form.contractFileList[i].raw) + } + } + } + } // 社保照片 if (this.form.IS_SOCIAL === '1') { if (this.$refs['zhenbaoUpload'].uploadFiles.length > 0) { @@ -1088,24 +1207,24 @@ export default { this.form.photosOfLevel.push(obj) }) } - // if (data.gongshangbaoxianFile) { - // data.gongshangbaoxianFile.map(item => { - // const obj = { id: item.IMGFILES_ID, name: item.FILENAME, url: config.fileUrl + item.FILEPATH } - // this.form.gongshangbaoxianFile.push(obj) - // }) - // } - // if (data.insuranceFile) { - // data.insuranceFile.map(item => { - // const obj = { id: item.IMGFILES_ID, name: item.FILENAME, url: config.fileUrl + item.FILEPATH } - // this.form.insuranceFileList.push(obj) - // }) - // } - // if (data.contractFile) { - // data.contractFile.map(item => { - // const obj = { id: item.IMGFILES_ID, name: item.FILENAME, url: config.fileUrl + item.FILEPATH } - // this.form.contractFileList.push(obj) - // }) - // } + if (data.gongshangbaoxianFile) { + data.gongshangbaoxianFile.map(item => { + const obj = { id: item.IMGFILES_ID, name: item.FILENAME, url: config.fileUrl + item.FILEPATH } + this.form.gongshangbaoxianFile.push(obj) + }) + } + if (data.insuranceFile) { + data.insuranceFile.map(item => { + const obj = { id: item.IMGFILES_ID, name: item.FILENAME, url: config.fileUrl + item.FILEPATH } + this.form.insuranceFileList.push(obj) + }) + } + if (data.contractFile) { + data.contractFile.map(item => { + const obj = { id: item.IMGFILES_ID, name: item.FILENAME, url: config.fileUrl + item.FILEPATH } + this.form.contractFileList.push(obj) + }) + } this.EMPLOYMENT_APPLY_MANAGEMENT_ID = data.pdrelated.EMPLOYMENT_APPLY_MANAGEMENT_ID const node = {} node.id = this.form.DEPARTMENT_ID @@ -1149,7 +1268,6 @@ export default { } }) }, - changeLearnerCategory() { this.form.LEARNERCATEGORY = '' if (this.form.LEARNERCATEGORYSTATUS === 'select') { @@ -1166,7 +1284,6 @@ export default { this.form.LEARNERCATEGORYSTATUS = 'select' } }, - // 判断按钮权限,用于是否显示按钮 hasButton() { var keys = 'user:add,user:del,user:edit' @@ -1231,7 +1348,6 @@ export default { this.form.insuranceFileList.push(file) this.hideInsuranceUpload = fileList.length >= 4 }, - // 保险图片remove handleInsuranceFileRemove(file, fileList) { this.form.insuranceFileList = fileList @@ -1250,7 +1366,6 @@ export default { this.form.contractFileList.push(file) this.hideContractUpload = fileList.length >= 4 }, - // 合同图片remove handleContractFileRemove(file, fileList) { this.form.contractFileList = fileList diff --git a/src/views/PersonManager/user/components/view.vue b/src/views/PersonManager/user/components/view.vue index d765542..f341d35 100644 --- a/src/views/PersonManager/user/components/view.vue +++ b/src/views/PersonManager/user/components/view.vue @@ -7,8 +7,8 @@

人员信息

- 照片 - + 照片 +
@@ -18,9 +18,9 @@ - 姓名 + 姓名 {{ dataForm.NAME }} - 性别 + 性别 {{ dataForm.SEX === '0' ? '男' : '女' }} @@ -102,6 +102,68 @@ + 是否按期缴纳工伤保险 + {{ formatLabel(dataForm.IS_INJURIES_PAY) }} + 工伤保险有效期 + {{ dataForm.IS_INJURIES_PAY_TIME }} + 工伤保险凭证 + + + + + + + + + + 是否缴纳商业保险 + + {{ formatLabel(dataForm.ISPAY) }} + + 商业保险附件 + + + + + + + + 商业保险单号 + {{ dataForm.ISPAY_NUMBER }} + + + 是否签订劳动合同 + + {{ formatLabel(dataForm.IS_SIGN_LABOR) }} + + 劳动合同附件 + + + + + + + + + 是否参加三级安全培训 {{ formatLabel(dataForm.IS_LEVEL_THREE) }} 三级安全培训照片 @@ -125,7 +187,7 @@ 是否特殊工种 {{ formatLabel(dataForm.IS_SPECIAL_JOB) }} 是否流动人员 - {{ formatLabel(dataForm.ISFLOW) }} + {{ formatLabel(dataForm.ISFLOW) }}
@@ -246,11 +308,11 @@ export default { this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH } this.photosOfLevel = data.photosOfLevel - // this.insuranceFileList = data.insuranceFile - // this.contractFileList = data.contractFile + this.insuranceFileList = data.insuranceFile + this.contractFileList = data.contractFile this.userCardIDPhotoFile = data.userCardIDPhotoFile this.socialPhotoFile = data.socialPhotoFile - // this.gongshangbaoxianFile = data.gongshangbaoxianFile + this.gongshangbaoxianFile = data.gongshangbaoxianFile }).catch((e) => { this.listLoading = false })