From 58e1c1cc748a79b9bc47e8e71799e46d44eca99f Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Mon, 1 Jul 2024 18:04:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/information/update.vue | 20 +- pages/related_party_units/add.vue | 293 ++++++++++++++++++----------- pages/related_party_units/edit.vue | 20 +- pages/related_party_units/view.vue | 42 +++-- 4 files changed, 230 insertions(+), 145 deletions(-) diff --git a/pages/mine/information/update.vue b/pages/mine/information/update.vue index 92d0dd2..d8656d1 100644 --- a/pages/mine/information/update.vue +++ b/pages/mine/information/update.vue @@ -23,9 +23,17 @@ - - + + + + + + + + 温馨提示：用户需上传身份证正反面（身份证照片数量需≥2张），才能进行人员培训 + + @@ -1034,5 +1042,9 @@ diff --git a/pages/related_party_units/add.vue b/pages/related_party_units/add.vue index 65abc60..87206ca 100644 --- a/pages/related_party_units/add.vue +++ b/pages/related_party_units/add.vue @@ -33,11 +33,20 @@ - - - + + + + + + + + + + 温馨提示：用户需上传身份证正反面（身份证照片数量需≥2张），才能进行人员培训 + + + - - - - - - + + + + + + @@ -78,22 +87,22 @@ - - - + + + + + - - - + + + + + + + + + + + - - - - - - + + + + + + + + + + @@ -194,9 +213,12 @@ - + + + @@ -282,6 +304,7 @@ showIsSocial: false, showLaborContract: false, showEmploymentInjuryInsurance: false, + showInsurance: false, showEmploymentPayInsurance: false, showSafetyTraining: false, showAdmissionSafetyNotification: false, @@ -324,15 +347,18 @@ contractFile: [], ISPAY: '', ISPAY_NAME: '', - IS_INJURIES_PAY: '', + IS_BF: '', + IS_BF_NAME: '', + IS_INJURIES_PAY: '', IS_INJURIES_PAY_NAME: '', + safetytraining: [], insuranceFile: [], IS_LEVEL_THREE: '', IS_LEVEL_THREE_NAME: '', IS_SAFETY_TELL: '', IS_SAFETY_TELL_NAME: '', IS_BODY_ADAPT: '', - IS_BODY_ADAPT_NAME: '', + // IS_BODY_ADAPT_NAME: '', IS_SPECIAL_JOB: '', IS_SPECIAL_JOB_NAME: '', ISFLOW: '', @@ -389,16 +415,16 @@ message: '请上传身份证照片', trigger: ['change'] }, - HKLOCAL: { - required: true, - message: '请填写户口所在地', - trigger: ['blur'] - }, - ADDRESS: { - required: true, - message: '请填写现住址', - trigger: ['blur'] - }, + // HKLOCAL: { + // required: true, + // message: '请填写户口所在地', + // trigger: ['blur'] + // }, + // ADDRESS: { + // required: true, + // message: '请填写现住址', + // trigger: ['blur'] + // }, PHONE: [{ required: true, message: '请填写联系电话', @@ -442,21 +468,21 @@ // message: '请输入工种', // trigger: ['change'] // }, - CORP_START_DATE: { - required: true, - message: '请选择本企业从业开始日期', - trigger: ['change'] - }, + // CORP_START_DATE: { + // required: true, + // message: '请选择本企业从业开始日期', + // trigger: ['change'] + // }, POST_ID: { required: true, message: '请选择岗位名称', trigger: ['blur'] }, - ENTRY_DATE: { - required: true, - message: '请选择本岗位从业开始日期', - trigger: ['change'] - }, + // ENTRY_DATE: { + // required: true, + // message: '请选择本岗位从业开始日期', + // trigger: ['change'] + // }, SOCIAL_NUMBER: { required: true, message: '请填写社会保障号码', @@ -484,7 +510,11 @@ message: '请上传劳动合同附件', trigger: ['change'] }, - IS_INJURIES_PAY_NAME: { + IS_BF_NAME: { + required: true, + message: '请选择是否缴纳保险', + trigger: ['change'] + },IS_INJURIES_PAY_NAME: { required: true, message: '请选择是否按期缴纳工伤保险', trigger: ['change'] @@ -511,6 +541,12 @@ message: '请上传保险附件', trigger: ['change'] }, + safetytraining: { + type: 'array', + required: true, + message: '请上传三方安全培训图片', + trigger: ['change'] + }, IS_LEVEL_THREE_NAME: { required: true, message: '请选择是否参加三级安全培训', @@ -526,16 +562,16 @@ message: '请选择安全告知培训合格日期', trigger: ['change'] }, - IS_BODY_ADAPT_NAME: { - required: true, - message: '请选择身体状况是否适应本岗位工作', - trigger: ['change'] - }, - IS_SPECIAL_JOB_NAME: { - required: true, - message: '请选择是否特殊工种', - trigger: ['change'] - }, + // IS_BODY_ADAPT_NAME: { + // required: true, + // message: '请选择身体状况是否适应本岗位工作', + // trigger: ['change'] + // }, + // IS_SPECIAL_JOB_NAME: { + // required: true, + // message: '请选择是否特殊工种', + // trigger: ['change'] + // }, ISFLOW_NAME: { required: true, message: '请选择是否流动人员', @@ -593,7 +629,11 @@ } else if (this.form.IS_SIGN_LABOR === '1') { this.form.IS_SIGN_LABOR_NAME = '是' } - if (this.form.IS_INJURIES_PAY === '0') { + if (this.form.IS_BF === '0') { + this.form.IS_BF_NAME = '否' + } else if (this.form.IS_BF === '1') { + this.form.IS_BF_NAME = '是' + }if (this.form.IS_INJURIES_PAY === '0') { this.form.IS_INJURIES_PAY_NAME = '否' } else if (this.form.IS_INJURIES_PAY === '1') { this.form.IS_INJURIES_PAY_NAME = '是' @@ -608,16 +648,16 @@ } else if (this.form.IS_SAFETY_TELL === '1') { this.form.IS_SAFETY_TELL_NAME = '是' } - if (this.form.IS_BODY_ADAPT === '0') { - this.form.IS_BODY_ADAPT_NAME = '否' - } else if (this.form.IS_BODY_ADAPT === '1') { - this.form.IS_BODY_ADAPT_NAME = '是' - } - if (this.form.IS_SPECIAL_JOB === '0') { - this.form.IS_SPECIAL_JOB_NAME = '否' - } else if (this.form.IS_SPECIAL_JOB === '1') { - this.form.IS_SPECIAL_JOB_NAME = '是' - } + // if (this.form.IS_BODY_ADAPT === '0') { + // this.form.IS_BODY_ADAPT_NAME = '否' + // } else if (this.form.IS_BODY_ADAPT === '1') { + // this.form.IS_BODY_ADAPT_NAME = '是' + // } + // if (this.form.IS_SPECIAL_JOB === '0') { + // this.form.IS_SPECIAL_JOB_NAME = '否' + // } else if (this.form.IS_SPECIAL_JOB === '1') { + // this.form.IS_SPECIAL_JOB_NAME = '是' + // } if (this.form.ISFLOW === '0') { this.form.ISFLOW_NAME = '否' } else if (this.form.ISFLOW === '1') { @@ -643,14 +683,14 @@ showCount: 9999, currentPage: 1, }); - this.certificateInformationLength = resData.varList.length - if (resData.varList.length > 0) { - this.form.IS_SPECIAL_JOB = '1' - this.form.IS_SPECIAL_JOB_NAME = '是' - } else { - this.form.IS_SPECIAL_JOB = '0' - this.form.IS_SPECIAL_JOB_NAME = '否' - } + // this.certificateInformationLength = resData.varList.length + // if (resData.varList.length > 0) { + // this.form.IS_SPECIAL_JOB = '1' + // this.form.IS_SPECIAL_JOB_NAME = '是' + // } else { + // this.form.IS_SPECIAL_JOB = '0' + // this.form.IS_SPECIAL_JOB_NAME = '否' + // } }, async fnIDCardDeduplication(CARD_ID = this.form.CARD_ID) { let resData = await getIDCardDeduplication({ @@ -782,9 +822,17 @@ fnShowEmploymentInjuryInsurance() { this.showEmploymentInjuryInsurance = !this.showEmploymentInjuryInsurance }, + fnShowInjuryInsurance() { + this.showInsurance = !this.showInsurance + }, fnShowEmploymentPayInsurance() { this.showEmploymentPayInsurance = !this.showEmploymentPayInsurance }, + fnEInsuranceConfirm(e) { + this.form.IS_BF = e.value[0].id + this.form.IS_BF_NAME = e.value[0].name + this.fnShowInjuryInsurance() + }, fnEmploymentInjuryInsuranceConfirm(e) { this.form.IS_INJURIES_PAY = e.value[0].id this.form.IS_INJURIES_PAY_NAME = e.value[0].name @@ -812,6 +860,14 @@ fnAttachmentToLaborContractDelete(event) { this.form.contractFile.splice(event.index, 1) }, + fnSafetyTrainingAfterRead2(event) { + for (let i = 0; i < event.file.length; i++) { + this.form.safetytraining.push(event.file[i]) + } + }, + fnSafetyTrainingAttachmentsDelete(event) { + this.form.safetytraining.splice(event.index, 1) + }, fnInsuranceAttachmentsAfterRead2(event) { for (let i = 0; i < event.file.length; i++) { this.form.insuranceFile.push(event.file[i]) @@ -909,33 +965,33 @@ fnInjuriesPayTiemAttachmentsDelete(event) { this.form.injuriesPayTiemFile.splice(event.index, 1) }, - fnAdaptToTheJobPositionConfirm(e) { - this.form.IS_BODY_ADAPT = e.value[0].id - this.form.IS_BODY_ADAPT_NAME = e.value[0].name - this.fnShowAdaptToTheJobPosition() - }, + // fnAdaptToTheJobPositionConfirm(e) { + // this.form.IS_BODY_ADAPT = e.value[0].id + // this.form.IS_BODY_ADAPT_NAME = e.value[0].name + // this.fnShowAdaptToTheJobPosition() + // }, fnShowSpecialTypeOfWork() { this.showSpecialTypeOfWork = !this.showSpecialTypeOfWork }, - fnSpecialTypeOfWorkConfirm(e) { - this.form.IS_SPECIAL_JOB = e.value[0].id - this.form.IS_SPECIAL_JOB_NAME = e.value[0].name - this.fnShowSpecialTypeOfWork() - if (e.value[0].id === '1' && this.certificateInformationLength === 0) { - uni.showModal({ - title: '提示', - content: '当前没有证书信息，请完善证书信息', - showCancel: false, - success: (res) => { - if (res.confirm) { - uni.$u.route({ - url: '/pages/certificate_information/index', - }) - } - } - }) - } - }, + // fnSpecialTypeOfWorkConfirm(e) { + // this.form.IS_SPECIAL_JOB = e.value[0].id + // this.form.IS_SPECIAL_JOB_NAME = e.value[0].name + // this.fnShowSpecialTypeOfWork() + // if (e.value[0].id === '1' && this.certificateInformationLength === 0) { + // uni.showModal({ + // title: '提示', + // content: '当前没有证书信息，请完善证书信息', + // showCancel: false, + // success: (res) => { + // if (res.confirm) { + // uni.$u.route({ + // url: '/pages/certificate_information/index', + // }) + // } + // } + // }) + // } + // }, fnShowFloatingPersonnel() { this.showFloatingPersonnel = !this.showFloatingPersonnel }, @@ -997,7 +1053,18 @@ } }) } - for (let i = 0; i < this.form.insuranceFile.length; i++) { + for (let i = 0; i < this.form.safetytraining.length; i++) { + await setUploadAttachments({ + filePath: this.form.safetytraining[i].url, + name: 'files', + formData: { + TYPE: '19', + FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID, + CORPINFO_ID: this.CORPINFO_ID, + } + }) + } + for (let i = 0; i < this.form.insuranceFile.length; i++) { await setUploadAttachments({ filePath: this.form.insuranceFile[i].url, name: 'files', @@ -1063,5 +1130,9 @@ diff --git a/pages/related_party_units/edit.vue b/pages/related_party_units/edit.vue index e2024a9..2fffab5 100644 --- a/pages/related_party_units/edit.vue +++ b/pages/related_party_units/edit.vue @@ -6,16 +6,16 @@ - - - - - - + + + + + + + + + + 基础信息 - 修改 + @@ -46,8 +46,8 @@ - - + +