From 1564af86d4792d82c4aaeb9e370745c016e79022 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 8 Apr 2024 14:48:21 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E7=89=B9=E7=A7=8D=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/index.js | 2 +- pages/certificate_information/add.vue | 163 +++++++++++--------------- 2 files changed, 70 insertions(+), 95 deletions(-) diff --git a/api/index.js b/api/index.js index e077886..bd550d7 100644 --- a/api/index.js +++ b/api/index.js @@ -27,7 +27,7 @@ export const getUserInfo = (params) => post("/app/user/getDetailByUserIdAndCorpI export const setUserInfo = (params) => post("/app/user/edit", params) //修改用户信息 export const getCertificateInformationList = (params) => post("/app/specialUser/list", params) //证书信息列表 export const getCertificateInformationView = (params) => post("/app/specialUser/goEdit", params) //证书信息查看 -export const setCertificateInformationAdd = (params) => upload("/app/specialUser/add", params) //证书信息添加 +export const setCertificateInformationAdd = (params) => uploads("/app/specialUser/add", params) //证书信息添加 export const setCertificateInformationEdit = (params) => upload("/app/specialUser/edit", params) //证书信息修改 export const setCertificateInformationEditPost = (params) => post("/app/specialUser/edit", params) //证书信息修改 export const getDeptTree = (params) => post("/api/department/listzTree", params) //用户信息 diff --git a/pages/certificate_information/add.vue b/pages/certificate_information/add.vue index 71bea5a..c0cebf8 100644 --- a/pages/certificate_information/add.vue +++ b/pages/certificate_information/add.vue @@ -7,7 +7,7 @@ :fileList="form.fileList" @afterRead="fnAfterRead" @delete="fnDeletePic" - :maxCount="1" + :maxCount="2" previewFullImage > @@ -122,95 +122,57 @@ export default { REVIEW_TIME: '' }, rules: { - // fileList: { - // type: 'array', - // required: true, - // message: '请上传证书图片', - // trigger: ['change'] - // }, - // NAME: { - // required: true, - // message: '请填写姓名', - // trigger: ['blur'] - // }, - // SEX_NAME: { - // required: true, - // message: '请选择性别', - // trigger: ['change'] - // }, - // PHONE: [ - // { - // required: true, - // message: '请填写手机号', - // trigger: ['blur'] - // }, - // { - // validator: (rule, value, callback) => { - // return uni.$u.test.mobile(value); - // }, - // message: '手机号格式不正确', - // trigger: ['blur'], - // }, - // ], - // CARD_ID: [ - // { - // required: true, - // message: '请填写身份证号', - // trigger: ['blur'] - // }, - // { - // validator: (rule, value, callback) => { - // return uni.$u.test.idCard(value); - // }, - // message: '身份证号格式不正确', - // trigger: ['blur'], - // }, - // ], - // CER_TYPE_NAME: { - // required: true, - // message: '请选择证书类型', - // trigger: ['change'] - // }, - // CERTIFICATE: { - // required: true, - // message: '请填写证书名称', - // trigger: ['change'] - // }, - // SPECIAL_NUMBER: { - // required: true, - // message: '请填写证书编号', - // trigger: ['blur'] - // }, - // JOBS_TYPE: { - // required: true, - // message: '请填写工种', - // trigger: ['change'] - // }, - // specialName: { - // required: true, - // message: '请选择作业类别', - // trigger: ['change'] - // }, - // operationName: { - // required: true, - // message: '请选择操作项目', - // trigger: ['change'] - // }, - // ISSUING_AUTHORITY: { - // required: true, - // message: '请填写发证机关', - // trigger: ['blur'] - // }, - // VALIDITY_TIME_START: { - // required: true, - // message: '请选择有效期开始时间', - // trigger: ['change'] - // }, - // VALIDITY_TIME_END: { - // required: true, - // message: '请选择有效期结束时间', - // trigger: ['change'] - // }, + fileList: { + type: 'array', + required: true, + message: '请上传证书图片', + trigger: ['change'] + }, + CER_TYPE_NAME: { + required: true, + message: '请选择证书类型', + trigger: ['change'] + }, + CERTIFICATE: { + required: true, + message: '请填写证书名称', + trigger: ['change'] + }, + SPECIAL_NUMBER: { + required: true, + message: '请填写证书编号', + trigger: ['blur'] + }, + JOBS_TYPE: { + required: true, + message: '请填写工种', + trigger: ['change'] + }, + specialName: { + required: true, + message: '请选择作业类别', + trigger: ['change'] + }, + operationName: { + required: true, + message: '请选择操作项目', + trigger: ['change'] + }, + ISSUING_AUTHORITY: { + required: true, + message: '请填写发证机关', + trigger: ['blur'] + }, + VALIDITY_TIME_START: { + required: true, + message: '请选择有效期开始时间', + trigger: ['change'] + }, + VALIDITY_TIME_END: { + required: true, + message: '请选择有效期结束时间', + trigger: ['change'] + }, REVIEW_TIME: { required: true, message: '请选择复审时间', @@ -352,9 +314,9 @@ export default { }else{ uni.$u.toast('图片格式不正确，请上传jpg格式图片或者png格式图片') this.form.fileList=[] - + } - + }, fnDeletePic(event) { this.form.fileList.splice(event.index, 1) @@ -363,9 +325,22 @@ export default { console.info(this.$refs) this.$refs.form.validate().then(async () => { if(!this.SPECIAL_USER_ID){ + let files = [] + files.push({ + name: 'FILEPATH', + file: this.form.fileList[0], + uri: this.form.fileList[0].url, + }) + + files.push({ + name: 'FILEPATH_BACK', + file: this.form.fileList[1], + uri: this.form.fileList[1].url, + }) + await setCertificateInformationAdd({ - filePath: this.form.fileList[0].url, - name: 'file', + // filePath: this.form.fileList[0].url, + files: files, formData: { ...this.form } From 287a51c891ef495cdce42e23b0ed3720cd01bf12 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 8 Apr 2024 16:28:12 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E6=97=A0=E6=B3=95=E6=9B=B4=E6=8D=A2=E5=9B=BE=E7=89=87?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/index.js | 2 +- pages/certificate_information/add.vue | 113 +++++++++++++++++++------ pages/certificate_information/view.vue | 4 + 3 files changed, 90 insertions(+), 29 deletions(-) diff --git a/api/index.js b/api/index.js index bd550d7..678aa19 100644 --- a/api/index.js +++ b/api/index.js @@ -28,7 +28,7 @@ export const setUserInfo = (params) => post("/app/user/edit", params) //修改 export const getCertificateInformationList = (params) => post("/app/specialUser/list", params) //证书信息列表 export const getCertificateInformationView = (params) => post("/app/specialUser/goEdit", params) //证书信息查看 export const setCertificateInformationAdd = (params) => uploads("/app/specialUser/add", params) //证书信息添加 -export const setCertificateInformationEdit = (params) => upload("/app/specialUser/edit", params) //证书信息修改 +export const setCertificateInformationEdit = (params) => uploads("/app/specialUser/edit", params) //证书信息修改 export const setCertificateInformationEditPost = (params) => post("/app/specialUser/edit", params) //证书信息修改 export const getDeptTree = (params) => post("/api/department/listzTree", params) //用户信息 export const getEMPLOYMENTAPPLYMANAGEMENTID = (params) => post("/app/user/getEMPLOYMENTAPPLYMANAGEMENTID",params)//获取EMPLOYMENTAPPLYMANAGEMENTID diff --git a/pages/certificate_information/add.vue b/pages/certificate_information/add.vue index c0cebf8..94553e5 100644 --- a/pages/certificate_information/add.vue +++ b/pages/certificate_information/add.vue @@ -2,12 +2,21 @@ - + + + + @@ -105,6 +114,7 @@ export default { reviewTimeValue: new Date().toString(), form: { fileList: [], + fileListBack: [], NAME: '', SEX_NAME: '', PHONE: '', @@ -128,6 +138,12 @@ export default { message: '请上传证书图片', trigger: ['change'] }, + fileListBack: { + type: 'array', + required: true, + message: '请上传证书图片', + trigger: ['change'] + }, CER_TYPE_NAME: { required: true, message: '请选择证书类型', @@ -205,15 +221,22 @@ export default { }, methods: { async fnGetData() { - if(this.SPECIAL_USER_ID){ + if (this.SPECIAL_USER_ID) { let resData = await getCertificateInformationView({ - SPECIAL_USER_ID:this.SPECIAL_USER_ID + SPECIAL_USER_ID: this.SPECIAL_USER_ID }) - this.form = {...this.form, ...resData.pd,CER_TYPE_NAME:resData.pd.typeName} - this.$set(this.form,'fileList',[{url:this.$filePath + resData.pd.FILEPATH,FILEPATH:this.$filePath + resData.pd.FILEPATH}]) - let resDatares = await getDataDictionary({DICTIONARIES_ID:this.form.SPECIAL_TYPE}) - this.certificateTypeColumnsOpe = [resDatares.list] - }else { + this.form = {...this.form, ...resData.pd, CER_TYPE_NAME: resData.pd.typeName} + this.$set(this.form, 'fileList', [{ + url: this.$filePath + resData.pd.FILEPATH, + FILEPATH: this.$filePath + resData.pd.FILEPATH + }]) + this.$set(this.form, 'fileListBack', [{ + url: this.$filePath + resData.pd.FILEPATH_BACK, + FILEPATH: this.$filePath + resData.pd.FILEPATH_BACK + }]) + let resDatares = await getDataDictionary({DICTIONARIES_ID: this.form.SPECIAL_TYPE}) + this.certificateTypeColumnsOpe = [resDatares.list] + } else { let resData = await getUserInfo({ CORPINFO_ID: this.userInfo.CORPINFO_ID, }) @@ -221,9 +244,9 @@ export default { this.fnCardIdDisassembly(this.form.CARD_ID) this.fnCardIdDisassembly(this.form.CARD_ID) } - if (this.form.SEX_NAME == '0') { + if (this.form.SEX_NAME === '0') { this.form.SEX_NAME = '男' - } else if (this.form.SEX_NAME == '1') { + } else if (this.form.SEX_NAME === '1') { this.form.SEX_NAME = '女' } }, @@ -307,20 +330,32 @@ export default { this.form.REVIEW_TIME = uni.$u.timeFormat(event.value, 'yyyy-mm-dd') }, fnAfterRead(event) { - var houzhui = event.file.url.replace(/.+\./,""); - console.log(houzhui); - if(houzhui=="jpg"||houzhui=="png"){ - this.form.fileList.push(event.file) - }else{ - uni.$u.toast('图片格式不正确，请上传jpg格式图片或者png格式图片') - this.form.fileList=[] - - } + var houzhui = event.file.url.replace(/.+\./, ""); + console.log(houzhui); + if (houzhui == "jpg" || houzhui == "png") { + this.form.fileList.push(event.file) + } else { + uni.$u.toast('图片格式不正确，请上传jpg格式图片或者png格式图片') + this.form.fileList = [] + } + }, + fnAfterRead1(event) { + var houzhui = event.file.url.replace(/.+\./, ""); + console.log(houzhui); + if (houzhui == "jpg" || houzhui == "png") { + this.form.fileListBack.push(event.file) + } else { + uni.$u.toast('图片格式不正确，请上传jpg格式图片或者png格式图片') + this.form.fileListBack = [] + } }, fnDeletePic(event) { this.form.fileList.splice(event.index, 1) }, + fnDeletePic1(event) { + this.form.fileListBack.splice(event.index, 1) + }, async fnSubmit() { console.info(this.$refs) this.$refs.form.validate().then(async () => { @@ -334,22 +369,43 @@ export default { files.push({ name: 'FILEPATH_BACK', - file: this.form.fileList[1], - uri: this.form.fileList[1].url, + file: this.form.fileListBack[0], + uri: this.form.fileListBack[0].url, }) + if (files.length !== 2){ + uni.$u.toast('请上传证书正反面') + return + } + await setCertificateInformationAdd({ - // filePath: this.form.fileList[0].url, files: files, formData: { ...this.form } }) }else { - if (!this.form.fileList[0].FILEPATH) { + if (!this.form.fileList[0].FILEPATH || !this.form.fileListBack[0].FILEPATH) { + uni.$u.toast('1') + let files = [] + if (!this.form.fileList[0].FILEPATH){ + files.push({ + name: 'FILEPATH', + file: this.form.fileList[0], + uri: this.form.fileList[0].url, + }) + } + + if (!this.form.fileListBack[0].FILEPATH){ + files.push({ + name: 'FILEPATH_BACK', + file: this.form.fileListBack[0], + uri: this.form.fileListBack[0].url, + }) + } + await setCertificateInformationEdit({ - filePath: this.form.fileList[0].url, - name: 'file', + files: files, formData: { ...this.form } @@ -362,13 +418,14 @@ export default { } } - uni.$u.toast('保存成功') + // uni.$u.toast('保存成功') setTimeout(()=>{ uni.navigateBack() },2000) }).catch((e) => { console.info(e) - uni.$u.toast('请补全必填项') + // uni.$u.toast('请补全必填项') + uni.$u.toast(e) }) } }, diff --git a/pages/certificate_information/view.vue b/pages/certificate_information/view.vue index dab7046..55350b1 100644 --- a/pages/certificate_information/view.vue +++ b/pages/certificate_information/view.vue @@ -5,6 +5,7 @@ @@ -46,6 +47,9 @@ export default { }) this.info = resData.pd this.$set(this.info,'FILEPATH',this.$filePath + resData.pd.FILEPATH) + if (resData.pd.FILEPATH_BACK){ + this.$set(this.info,'FILEPATH_BACK',this.$filePath + resData.pd.FILEPATH_BACK) + } }, fnPreview() { uni.previewImage({ From bbea3b58db31dfec5d66c88d803fc2924f1c4fd7 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 6 Jun 2024 17:03:31 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9app=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/information/update.vue | 250 +++++++++++++++++++++++++----- 1 file changed, 209 insertions(+), 41 deletions(-) diff --git a/pages/mine/information/update.vue b/pages/mine/information/update.vue index badf1b0..5428f40 100644 --- a/pages/mine/information/update.vue +++ b/pages/mine/information/update.vue @@ -66,14 +66,29 @@ - + - + + + + + + + + + + + + + + + + + + + + + @@ -106,6 +134,13 @@ + + + + @@ -144,13 +179,18 @@ degreeOfEducationColumns: [], showPersonWorkType: false, showFloatingPersonnel: false, + showBf: false, + showIsSignLabor: false, + showPhotosOfLevel: false, personWorkTypeColumns: [], prePhotoId: [], form: { userPhoto: [], userCardIDPhotoFile: [], socialPhotoFile: [], - injuriesPayTiemFile: [], //工伤保险有效凭证 + contractFile:[], + injuriesPayTiemFile: [], + photosOfLevel:[], IS_INJURIES_PAY_TIME:'', NAME: '', USERNAME: '', @@ -169,6 +209,13 @@ ISFLOW_NAME: '', IS_SOCIAL:'', IS_SOCIAL_NAME:'', + IS_BF_NAME: '', + IS_BF: '', + IS_SIGN_LABOR: '', + IS_SIGN_LABOR_NAME: '', + POST_ID: '', + IS_LEVEL_THREE: '', + IS_LEVEL_THREE_NAME: '' }, rules: { userPhoto: { @@ -267,14 +314,43 @@ message: '请选择工伤保险有效期', trigger: ['change'] }, + IS_BF_NAME:{ + required: true, + message: '请选择是否是否缴纳保险', + trigger: ['change'] + }, + IS_SIGN_LABOR_NAME:{ + required: true, + message: '请选择是否签订劳动合同', + trigger: ['change'] + }, + contractFile:{ + type: 'array', + required: true, + message: '请上传劳动合同', + trigger: ['change'] + }, + POST_ID:{ + required: true, + message: '请填写岗位', + trigger: ['change'] + }, + photosOfLevel:{ + type: 'array', + required: true, + message: '请上传三级安全培训照片', + trigger: ['change'] + }, + IS_LEVEL_THREE_NAME:{ + required: true, + message: '请选择是否为三级人员', + trigger: ['change'] + } } } }, onLoad() { this.fnGetData() - // this.fnGetDataDictionary('d7d80f08d73a4accbccf4fd3d8d1d867', 'degreeOfEducationColumns') - // this.fnGetDataDictionary('55484e491a5e442d839c4595380713ec', 'personWorkTypeColumns') - }, computed: { userInfo() { @@ -330,20 +406,13 @@ if (event.file.id) { // 准备删除的数据 this.prePhotoId.push(event.file.id) - // await removeUploadAttachments({ - // IMGFILES_ID: event.file.id - // }) } uni.showToast({ title: '操作成功', duration: 2000 }); - // var pages = getCurrentPages(); // 获取当前页面栈 - // var prePage = pages[pages.length - 2]; // 上级页面 - // prePage.$vm.reloadx(); this.form.userCardIDPhotoFile.splice(event.index, 1) } else if (res.cancel) { - // console.log('用户点击取消'); } } }); @@ -363,17 +432,11 @@ if (res.confirm) { if (event.file.id) { this.prePhotoId.push(event.file.id) - // await removeUploadAttachments({ - // IMGFILES_ID: event.file.id - // }) } uni.showToast({ title: '操作成功', duration: 2000 }); - // var pages = getCurrentPages(); // 获取当前页面栈 - // var prePage = pages[pages.length - 2]; // 上级页面 - // prePage.$vm.reloadx(); this.form.socialPhotoFile.splice(event.index, 1) } else if (res.cancel) { // console.log('用户点击取消'); @@ -381,6 +444,60 @@ } }); }, + // 合同图片 + fnIsSignLaborAdd(event) { + for (let i = 0; i < event.file.length; i++) { + this.form.contractFile.push(event.file[i]) + } + }, + // 合同图片删除 + fnIsSignLaborDelete(event) { + uni.showModal({ + title: '提示', + content: '确定删除吗', + success: async (res) => { + if (res.confirm) { + if (event.file.id) { + this.prePhotoId.push(event.file.id) + } + uni.showToast({ + title: '操作成功', + duration: 2000 + }); + this.form.contractFile.splice(event.index, 1) + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }); + }, + // 合同图片 + fnPhotosOfLevelAdd(event) { + for (let i = 0; i < event.file.length; i++) { + this.form.photosOfLevel.push(event.file[i]) + } + }, + // 合同图片删除 + fnPhotosOfLevelDelete(event) { + uni.showModal({ + title: '提示', + content: '确定删除吗', + success: async (res) => { + if (res.confirm) { + if (event.file.id) { + this.prePhotoId.push(event.file.id) + } + uni.showToast({ + title: '操作成功', + duration: 2000 + }); + this.form.photosOfLevel.splice(event.index, 1) + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }); + }, async fnGetDataDictionary(DICTIONARIES_ID) { let resData = await getDataDictionary({ @@ -399,22 +516,38 @@ fnShowPersonWorkType() { this.showPersonWorkType = !this.showPersonWorkType }, - // fnPersonWorkTypeConfirm(e) { - // this.form.PERSON_WORK_TYPE = e.value[0].BIANMA - // this.form.PERSON_WORK_TYPE_NAME = e.value[0].NAME - // this.fnShowPersonWorkType() - // }, fnShowFloatingPersonnel() { this.showFloatingPersonnel = !this.showFloatingPersonnel }, - + fnShowBf(){ + this.showBf = !this.showBf + }, + fnShowIsSignLabor(){ + this.showIsSignLabor = !this.showIsSignLabor + }, + fnShowPhotosOfLevel(){ + this.showPhotosOfLevel = !this.showPhotosOfLevel + }, + fnShowPhotosOfLevelConfirm(e){ + this.form.IS_LEVEL_THREE = e.value[0].id + this.form.IS_LEVEL_THREE_NAME = e.value[0].name + this.fnShowPhotosOfLevel() + }, fnFloatingPersonnelConfirm(e) { this.form.ISFLOW = e.value[0].id this.form.ISFLOW_NAME = e.value[0].name this.fnShowFloatingPersonnel() }, - - + fnBFConfirm(e){ + this.form.IS_BF = e.value[0].id + this.form.IS_BF_NAME = e.value[0].name + this.fnShowBf() + }, + fnIsSignLaborConfirm(e){ + this.form.IS_SIGN_LABOR = e.value[0].id + this.form.IS_SIGN_LABOR_NAME = e.value[0].name + this.fnShowIsSignLabor() + }, fnShowIsSocial() { this.showIsSocial = !this.showIsSocial }, @@ -447,17 +580,11 @@ if (res.confirm) { if (event.file.id) { this.prePhotoId.push(event.file.id) - // await removeUploadAttachments({ - // IMGFILES_ID: event.file.id - // }) } uni.showToast({ title: '操作成功', duration: 2000 }); - // var pages = getCurrentPages(); // 获取当前页面栈 - // var prePage = pages[pages.length - 2]; // 上级页面 - // prePage.$vm.reloadx(); this.form.injuriesPayTiemFile.splice(event.index, 1) } else if (res.cancel) { // console.log('用户点击取消'); @@ -557,16 +684,34 @@ } else if (this.form.IS_INJURIES_PAY === '1') { this.form.IS_INJURIES_PAY_NAME = '是' } - if (this.form.SEX_NAME == '0') { + if (this.form.SEX_NAME === '0') { this.form.SEX_NAME = '男' - } else if (this.form.SEX_NAME == '1') { + } else if (this.form.SEX_NAME === '1') { this.form.SEX_NAME = '女' } - if (this.form.ISFLOW == '0') { + if (this.form.ISFLOW === '0') { this.form.ISFLOW_NAME = '否' - } else if (this.form.ISFLOW == '1') { + } else if (this.form.ISFLOW === '1') { this.form.ISFLOW_NAME = '是' } + + if (this.form.IS_LEVEL_THREE === '0'){ + this.form.IS_LEVEL_THREE_NAME = '否' + }else { + this.form.IS_LEVEL_THREE_NAME = '是' + } + + if (this.form.IS_BF === '0'){ + this.form.IS_BF_NAME = '否' + }else { + this.form.IS_BF_NAME = '是' + } + if (this.form.IS_SIGN_LABOR === '0'){ + this.form.IS_SIGN_LABOR_NAME = '否' + }else { + this.form.IS_SIGN_LABOR_NAME = '是' + } + if (resData.userPhotoFile.length > 0) { this.$set(this.form, 'userPhoto', [{ url: this.$filePath + resData.userPhotoFile[0].FILEPATH, @@ -617,12 +762,12 @@ } if (await this.fnIDCardDeduplication()) return if (await this.fnPhoneNumberDeduplication()) return - if (this.form.userCardIDPhotoFile.length != 2) { + if (this.form.userCardIDPhotoFile.length !== 2) { uni.$u.toast('身份证照片需要两张') return } if(this.form.IS_SOCIAL==='1'){ - if (this.form.socialPhotoFile.length != 2) { + if (this.form.socialPhotoFile.length !== 2) { uni.$u.toast('社保卡照片需要两张') return } @@ -635,6 +780,7 @@ IMGFILES_ID: this.prePhotoId[i] }) } + // 保存图片 for (let i = 0; i < this.form.userPhoto.length; i++) { if (!this.form.userPhoto[i].FILEPATH) { let resData = await setUploadAttachments({ @@ -660,7 +806,6 @@ } }) } - for (let i = 0; i < this.form.socialPhotoFile.length; i++) { await setUploadAttachments({ filePath: this.form.socialPhotoFile[i].url, @@ -672,7 +817,7 @@ } }) } - for (let i = 0; i < this.form.injuriesPayTiemFile.length; i++) { // 16上传工伤保险凭证 + for (let i = 0; i < this.form.injuriesPayTiemFile.length; i++) { await setUploadAttachments({ filePath: this.form.injuriesPayTiemFile[i].url, name: 'files', @@ -683,6 +828,29 @@ } }) } + for (let i = 0; i < this.form.photosOfLevel.length; i++) { + await setUploadAttachments({ + filePath: this.form.photosOfLevel[i].url, + name: 'files', + formData: { + TYPE: '19', + FOREIGN_KEY: this.userInfo.USER_ID, + CORPINFO_ID: this.CORPINFO_ID, + } + }) + } + for (let i = 0; i < this.form.contractFile.length; i++) { + await setUploadAttachments({ + filePath: this.form.contractFile[i].url, + name: 'files', + formData: { + TYPE: '10', + FOREIGN_KEY: this.userInfo.USER_ID, + CORPINFO_ID: this.CORPINFO_ID, + } + }) + } + // 保存人员信息 await setUserInfo({ ...this.form, PHOTO: fileUrl From eee02bfa5a1fb812a81033b5abdaa902494f3069 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 6 Jun 2024 17:33:07 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9app=E7=AB=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=A1=E6=81=AFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/information/update.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/mine/information/update.vue b/pages/mine/information/update.vue index 5428f40..12d6a2e 100644 --- a/pages/mine/information/update.vue +++ b/pages/mine/information/update.vue @@ -66,10 +66,10 @@ - + - + From ce7d33dc343703275ed7e3b5c2dbee0b3ddf9ac5 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 7 Jun 2024 09:29:05 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9app=E7=AB=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=A1=E6=81=AFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/information/index.vue | 68 +++++++++++++++++- pages/mine/information/update.vue | 115 +++++++++++++++++++++++++++--- 2 files changed, 173 insertions(+), 10 deletions(-) diff --git a/pages/mine/information/index.vue b/pages/mine/information/index.vue index 3a085fc..c0d5d89 100644 --- a/pages/mine/information/index.vue +++ b/pages/mine/information/index.vue @@ -52,6 +52,27 @@ + + + + + + + + + @@ -63,6 +84,17 @@ + + + + + @@ -82,6 +114,9 @@ userCardIDPhotoFile: [], socialPhotoFile: [], injuriesPayTiemFile:[], + photosOfLevel:[], + contractFile:[], + insuranceFile: [], EMPLOYMENT_APPLY_MANAGEMENT_ID:'', } }, @@ -110,6 +145,9 @@ this.userCardIDPhotoFile = [] this.socialPhotoFile = [] this.injuriesPayTiemFile = [] + this.contractFile = [] + this.photosOfLevel = [] + this.insuranceFile = [] let Employed = await getEmployedBy({ showCount: 10, currentPage: 1, @@ -132,10 +170,23 @@ for (let i = 0; i < resData.socialPhotoFile.length; i++) { this.socialPhotoFile.push(this.$filePath + resData.socialPhotoFile[i].FILEPATH) } - + for (let i = 0; i < resData.workInsurancePhotoFile.length; i++) { this.injuriesPayTiemFile.push(this.$filePath + resData.workInsurancePhotoFile[i].FILEPATH) } + + for (let i = 0; i < resData.contractFile.length; i++) { + this.contractFile.push(this.$filePath + resData.contractFile[i].FILEPATH) + } + + for (let i = 0; i < resData.photosOfLevel.length; i++) { + this.photosOfLevel.push(this.$filePath + resData.photosOfLevel[i].FILEPATH) + } + + for (let i = 0; i < resData.insuranceFile.length; i++){ + this.insuranceFile.push(this.$filePath + resData.insuranceFile[i].FILEPATH) + } + if (this.info.ISFLOW === '0') { this.info.ISFLOW_NAME = '否' } else if (this.info.ISFLOW === '1') { @@ -151,6 +202,21 @@ } else if (this.info.IS_INJURIES_PAY === '1') { this.info.IS_INJURIES_PAY_NAME = '是' } + if (this.info.IS_SIGN_LABOR === '0') { + this.info.IS_SIGN_LABOR_NAME = '否' + } else if (this.info.IS_SIGN_LABOR === '1') { + this.info.IS_SIGN_LABOR_NAME = '是' + } + if (this.info.IS_LEVEL_THREE === '0'){ + this.info.IS_LEVEL_THREE_NAME = '否' + } else if (this.info.IS_LEVEL_THREE === '1'){ + this.info.IS_LEVEL_THREE_NAME = '是' + } + if (this.info.ISPAY === '1'){ + this.info.ISPAY_NAME = '是' + }else { + this.info.ISPAY_NAME = '否' + } if (resData.userPhotoFile.length > 0) { this.$set(this.info, 'userPhoto', this.$filePath + resData.userPhotoFile[0].FILEPATH) } diff --git a/pages/mine/information/update.vue b/pages/mine/information/update.vue index 12d6a2e..9c00de0 100644 --- a/pages/mine/information/update.vue +++ b/pages/mine/information/update.vue @@ -88,6 +88,19 @@ + + + + + + + + + + @@ -140,6 +153,8 @@ @confirm="fnIsSignLaborConfirm" @cancel="fnShowIsSignLabor"> + @@ -182,6 +197,7 @@ showBf: false, showIsSignLabor: false, showPhotosOfLevel: false, + showIsPay: false, personWorkTypeColumns: [], prePhotoId: [], form: { @@ -191,6 +207,7 @@ contractFile:[], injuriesPayTiemFile: [], photosOfLevel:[], + insuranceFile: [], IS_INJURIES_PAY_TIME:'', NAME: '', USERNAME: '', @@ -215,7 +232,9 @@ IS_SIGN_LABOR_NAME: '', POST_ID: '', IS_LEVEL_THREE: '', - IS_LEVEL_THREE_NAME: '' + IS_LEVEL_THREE_NAME: '', + ISPAY: '', + ISPAY_NAME: '' }, rules: { userPhoto: { @@ -472,12 +491,39 @@ }); }, // 合同图片 + fnIsPayAdd(event) { + for (let i = 0; i < event.file.length; i++) { + this.form.insuranceFile.push(event.file[i]) + } + }, + // 合同图片删除 + fnIsPayDelete(event) { + uni.showModal({ + title: '提示', + content: '确定删除吗', + success: async (res) => { + if (res.confirm) { + if (event.file.id) { + this.prePhotoId.push(event.file.id) + } + uni.showToast({ + title: '操作成功', + duration: 2000 + }); + this.form.insuranceFile.splice(event.index, 1) + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }); + }, + // 三级教育培训新增 fnPhotosOfLevelAdd(event) { for (let i = 0; i < event.file.length; i++) { this.form.photosOfLevel.push(event.file[i]) } }, - // 合同图片删除 + // 三级教育培训删除 fnPhotosOfLevelDelete(event) { uni.showModal({ title: '提示', @@ -525,6 +571,14 @@ fnShowIsSignLabor(){ this.showIsSignLabor = !this.showIsSignLabor }, + fnShowIsPay(){ + this.showIsPay = !this.showIsPay + }, + fnShowIsPayConfirm(e){ + this.form.ISPAY = e.value[0].id + this.form.ISPAY_NAME = e.value[0].name + this.fnShowIsPay() + }, fnShowPhotosOfLevel(){ this.showPhotosOfLevel = !this.showPhotosOfLevel }, @@ -695,6 +749,12 @@ this.form.ISFLOW_NAME = '是' } + if (this.form.ISPAY === '1'){ + this.form.ISPAY_NAME = '是' + }else { + this.form.ISPAY_NAME = '否' + } + if (this.form.IS_LEVEL_THREE === '0'){ this.form.IS_LEVEL_THREE_NAME = '否' }else { @@ -745,7 +805,33 @@ this.form.injuriesPayTiemFile.push(obj) }) } - + if (resData.photosOfLevel.length > 0) { + resData.photosOfLevel.forEach(item => { + const obj = { + id: item.IMGFILES_ID, + url: this.$filePath + item.FILEPATH + } + this.form.photosOfLevel.push(obj) + }) + } + if (resData.contractFile.length > 0) { + resData.contractFile.forEach(item => { + const obj = { + id: item.IMGFILES_ID, + url: this.$filePath + item.FILEPATH + } + this.form.contractFile.push(obj) + }) + } + if (resData.insuranceFile.length > 0) { + resData.insuranceFile.forEach(item => { + const obj = { + id: item.IMGFILES_ID, + url: this.$filePath + item.FILEPATH + } + this.form.insuranceFile.push(obj) + }) + } }, fnAfterRead(event) { this.form.userPhoto.push(event.file) @@ -823,8 +909,8 @@ name: 'files', formData: { TYPE: '16', - FOREIGN_KEY: this.userInfo.USER_ID, - CORPINFO_ID: this.CORPINFO_ID, + FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID, + CORPINFO_ID: this.userInfo.CORPINFO_ID, } }) } @@ -834,8 +920,8 @@ name: 'files', formData: { TYPE: '19', - FOREIGN_KEY: this.userInfo.USER_ID, - CORPINFO_ID: this.CORPINFO_ID, + FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID, + CORPINFO_ID: this.userInfo.CORPINFO_ID, } }) } @@ -845,8 +931,19 @@ name: 'files', formData: { TYPE: '10', - FOREIGN_KEY: this.userInfo.USER_ID, - CORPINFO_ID: this.CORPINFO_ID, + FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID, + CORPINFO_ID: this.userInfo.CORPINFO_ID, + } + }) + } + for (let i = 0; i < this.form.insuranceFile.length; i++) { + await setUploadAttachments({ + filePath: this.form.insuranceFile[i].url, + name: 'files', + formData: { + TYPE: '11', + FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID, + CORPINFO_ID: this.userInfo.CORPINFO_ID, } }) } From 1094bd3d824d74865cfa6aac20bcea59b0066bca Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 13 Jun 2024 15:52:27 +0800 Subject: [PATCH 06/18] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/information/update.vue | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pages/mine/information/update.vue b/pages/mine/information/update.vue index 9c00de0..656cafd 100644 --- a/pages/mine/information/update.vue +++ b/pages/mine/information/update.vue @@ -94,10 +94,10 @@ - - + + - + @@ -107,7 +107,7 @@ - @@ -349,6 +349,12 @@ message: '请上传劳动合同', trigger: ['change'] }, + insuranceFile:{ + type: 'array', + required: true, + message: '请上传保险图片', + trigger: ['change'] + }, POST_ID:{ required: true, message: '请填写岗位', @@ -364,7 +370,12 @@ required: true, message: '请选择是否为三级人员', trigger: ['change'] - } + }, + ISPAY_NUMBER:{ + required: true, + message: '请填写商业保单号', + trigger: ['change'] + }, } } }, @@ -858,8 +869,7 @@ return } } - - let fileUrl = '' + let fileUrl = '' // 删除点击删除的图片 for (let i = 0; i < this.prePhotoId.length; i++) { await removeUploadAttachments({ From a964030d0e9ec5d74f4906222b67e28d7500eb17 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 13 Jun 2024 16:36:23 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/information/update.vue | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pages/mine/information/update.vue b/pages/mine/information/update.vue index 656cafd..ef9f116 100644 --- a/pages/mine/information/update.vue +++ b/pages/mine/information/update.vue @@ -739,25 +739,25 @@ } this.form.PHONE = this.form.USERNAME this.fnCardIdDisassembly(this.form.CARD_ID) - if (this.form.IS_SOCIAL === '0') { - this.form.IS_SOCIAL_NAME = '否' - } else if (this.form.IS_SOCIAL === '1') { + if (this.form.IS_SOCIAL === '1') { this.form.IS_SOCIAL_NAME = '是' + } else { + this.form.IS_SOCIAL_NAME = '否' } - if (this.form.IS_INJURIES_PAY === '0') { - this.form.IS_INJURIES_PAY_NAME = '否' - } else if (this.form.IS_INJURIES_PAY === '1') { + if (this.form.IS_INJURIES_PAY === '1') { this.form.IS_INJURIES_PAY_NAME = '是' + } else { + this.form.IS_INJURIES_PAY_NAME = '否' } if (this.form.SEX_NAME === '0') { this.form.SEX_NAME = '男' } else if (this.form.SEX_NAME === '1') { this.form.SEX_NAME = '女' } - if (this.form.ISFLOW === '0') { - this.form.ISFLOW_NAME = '否' - } else if (this.form.ISFLOW === '1') { + if (this.form.ISFLOW === '1') { this.form.ISFLOW_NAME = '是' + } else { + this.form.ISFLOW_NAME = '否' } if (this.form.ISPAY === '1'){ @@ -766,21 +766,21 @@ this.form.ISPAY_NAME = '否' } - if (this.form.IS_LEVEL_THREE === '0'){ - this.form.IS_LEVEL_THREE_NAME = '否' - }else { + if (this.form.IS_LEVEL_THREE === '1'){ this.form.IS_LEVEL_THREE_NAME = '是' + }else { + this.form.IS_LEVEL_THREE_NAME = '否' } - 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_SIGN_LABOR === '0'){ - this.form.IS_SIGN_LABOR_NAME = '否' }else { + this.form.IS_BF_NAME = '否' + } + if (this.form.IS_SIGN_LABOR === '1'){ this.form.IS_SIGN_LABOR_NAME = '是' + }else { + this.form.IS_SIGN_LABOR_NAME = '否' } if (resData.userPhotoFile.length > 0) { From 4d1e6a7cf0cc502e959c04c7cba931dcee40b25a Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 13 Jun 2024 18:06:18 +0800 Subject: [PATCH 08/18] =?UTF-8?q?1=E3=80=81=E7=9B=B8=E5=85=B3=E6=96=B9app?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=B7=B7=E4=B9=B1=E6=9B=B4=E6=94=B9=202?= =?UTF-8?q?=E3=80=81=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B5=81=E7=A8=8B=E5=AE=A1?= =?UTF-8?q?=E6=89=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/information/update.vue | 208 ++++++++++++++++++------------ 1 file changed, 122 insertions(+), 86 deletions(-) diff --git a/pages/mine/information/update.vue b/pages/mine/information/update.vue index ef9f116..92d0dd2 100644 --- a/pages/mine/information/update.vue +++ b/pages/mine/information/update.vue @@ -46,91 +46,127 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -263,7 +299,7 @@ socialPhotoFile: { type: 'array', required: true, - message: '请上传设保卡正反照', + message: '请上传社保卡正反照', trigger: ['change'] }, CARD_ID: [{ From 58e1c1cc748a79b9bc47e8e71799e46d44eca99f Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Mon, 1 Jul 2024 18:04:23 +0800 Subject: [PATCH 09/18] =?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 @@ - - + + diff --git a/pages/mine/feedback/feedback.vue b/pages/mine/feedback/feedback.vue index 2d5c756..c640bdb 100644 --- a/pages/mine/feedback/feedback.vue +++ b/pages/mine/feedback/feedback.vue @@ -1,188 +1,189 @@ diff --git a/pages/mine/index/index.vue b/pages/mine/index/index.vue index eb04df5..e6b32ba 100644 --- a/pages/mine/index/index.vue +++ b/pages/mine/index/index.vue @@ -1,84 +1,88 @@ diff --git a/pages/mine/information/index.vue b/pages/mine/information/index.vue index 11cbf6c..6b55625 100644 --- a/pages/mine/information/index.vue +++ b/pages/mine/information/index.vue @@ -1,64 +1,65 @@ diff --git a/pages/service_unit_management/index.vue b/pages/service_unit_management/index.vue index 662c9c3..3b4d315 100644 --- a/pages/service_unit_management/index.vue +++ b/pages/service_unit_management/index.vue @@ -16,7 +16,8 @@ - + @@ -41,29 +42,29 @@ export default { onLoad() { this.resetList() }, - methods:{ - async getData(){ + methods: { + async getData() { let resData = await getServiceUnitList({ showCount: this.pageSize, currentPage: this.currentPage, }); - this.list = [...this.list,...resData.varList]; + this.list = [...this.list, ...resData.varList]; this.totalPage = resData.page.totalPage; }, resetList() { - this.pageSize= 10 - this.currentPage= 1 + this.pageSize = 10 + this.currentPage = 1 this.list = [] this.getData() }, scrolltolower() { this.currentPage++; - if(this.totalPage >= this.currentPage) this.getData(); + if (this.totalPage >= this.currentPage) this.getData(); }, - fnView(SERVICE_COMPANY_USER_MAP_ID){ + fnView(SERVICE_COMPANY_USER_MAP_ID) { uni.$u.route({ url: '/pages/service_unit_management/view', - params:{ + params: { SERVICE_COMPANY_USER_MAP_ID } }) diff --git a/pages/service_unit_management/view.vue b/pages/service_unit_management/view.vue index 8400bde..2be0e68 100644 --- a/pages/service_unit_management/view.vue +++ b/pages/service_unit_management/view.vue @@ -20,7 +20,7 @@ export default { data() { return { SERVICE_COMPANY_USER_MAP_ID: '', - info:{} + info: {} } }, onLoad(query) { @@ -30,7 +30,7 @@ export default { methods: { async fnGetData() { let resData = await getServiceUnitView({ - SERVICE_COMPANY_USER_MAP_ID:this.SERVICE_COMPANY_USER_MAP_ID + SERVICE_COMPANY_USER_MAP_ID: this.SERVICE_COMPANY_USER_MAP_ID }) this.info = resData.pd } diff --git a/qa-prevention-xgf-app.iml b/qa-prevention-xgf-app.iml deleted file mode 100644 index 8021953..0000000 --- a/qa-prevention-xgf-app.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/qa-related-parties-gwj-app.iml b/qa-related-parties-gwj-app.iml deleted file mode 100644 index 8021953..0000000 --- a/qa-related-parties-gwj-app.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/static/icon-apps/app_icons6.png b/static/icon-apps/app_icons6.png new file mode 100644 index 0000000000000000000000000000000000000000..dcdf8960c0bc670c268f64265396dc76cd7c449b GIT binary patch literal 7990 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 Date: Wed, 23 Oct 2024 14:30:25 +0800 Subject: [PATCH 18/18] =?UTF-8?q?(hyx=5F2024-10-23=5Ftongbu)=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E4=B8=AD=E5=8F=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/index.js | 4 ++-- pages/mine/information/index.vue | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/api/index.js b/api/index.js index 678aa19..75cb12c 100644 --- a/api/index.js +++ b/api/index.js @@ -1,8 +1,8 @@ import {post, upload, uploads} from "../utils/request"; export const submitLogin = (params) => post("/app/admin/check", params) // 登录 -export const getIDCardDeduplication = (params) => post("/app/user/hasCardIdForApp", params) // 身份证去重 -export const getUserDeduplication = (params) => post("/app/user/hasUserNameForApp", params) // 用户名去重 +export const getIDCardDeduplication = (params) => post("/app/user/goCheck", params) // 身份证去重 +export const getUserDeduplication = (params) => post("/app/user/goCheck", params) // 用户名去重 export const getPhoneNumberDeduplication = (params) => post("/app/user/hasPhoneForApp", params) // 手机号去重 export const setRegister = (params) => post("/app/admin/register", params) // 注册 export const setForgotPassword = (params) => post("/app/admin/forgetPassword", params) // 忘记密码 diff --git a/pages/mine/information/index.vue b/pages/mine/information/index.vue index 6b55625..80aaf8e 100644 --- a/pages/mine/information/index.vue +++ b/pages/mine/information/index.vue @@ -16,7 +16,7 @@ - +