From 9f6833b83b406766a9a9d91de62f6974d227bb28 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Mon, 30 Dec 2024 09:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.js | 17 +- pages.json | 7 + pages/realName/index/index.vue | 49 +--- .../electronicContractSign/contractPdf.vue | 10 +- .../electronicContractSign/index.vue | 8 +- .../workbench/personEnter/addPeople.vue | 10 +- .../workbench/personEnter/editPeople.vue | 18 +- .../workbench/personEnter/facePeople.vue | 20 +- .../workbench/safeguarding/detail.vue | 8 +- .../realName/workbench/safeguarding/index.vue | 218 ++++-------------- 10 files changed, 110 insertions(+), 255 deletions(-) diff --git a/config.js b/config.js index 78c03af..4ccaa01 100644 --- a/config.js +++ b/config.js @@ -59,13 +59,22 @@ module.exports = { // tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/', - + //兰坪实名制 + lpBaseUrl: 'http://192.168.2.135:1910/', //兰坪实名制移动端--移动 - lpAppUrl: 'http://192.168.0.50:1913/app', + lpAppUrl: 'http://192.168.2.135:1913/app', //兰坪实名制移动端--登录 - lpLoginUrl: 'http://192.168.0.50:9200/', + lpLoginUrl: 'http://192.168.2.135:9200/', //兰坪实名制移动端--后台 - lpBmwUrl: 'http://192.168.0.50:1912', + lpBmwUrl: 'http://192.168.2.135:1912', + // 兰坪实名制移动端-文件 + lpFileUrl: 'http://192.168.2.135:1909/file/', + // 兰坪实名制移动端-安培 + lpExamUrl: 'http://192.168.2.135:1910/system', + + // //实名制移动端 -- 新 + realNewYnUrl: 'http://192.168.0.14:1918', + realIdCardUrl: 'http://192.168.0.14:26699', diff --git a/pages.json b/pages.json index cc78a3f..3bc0656 100644 --- a/pages.json +++ b/pages.json @@ -463,6 +463,13 @@ "navigationStyle": "custom" } }, + { + //欠薪维权申诉-填写 + "path": "pages/realName/workbench/safeguarding/add", + "style": { + "navigationStyle": "custom" + } + }, { //准入信息查询 "path": "pages/realName/workbench/dayPlan/index", diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue index b751882..43b7791 100644 --- a/pages/realName/index/index.vue +++ b/pages/realName/index/index.vue @@ -312,20 +312,11 @@ {{index + 1}}、{{rule}} - - - - - - - - - @@ -368,9 +359,7 @@ showPopup: false, showPopupBan: false, - showPopupRights: false, countdown: 10, - countdownRights: 10, timer: null, safetyRules: [ '严禁未经安全教育培训合格人员进入施工现场', @@ -554,21 +543,6 @@ }, 1000); }, - showRulesRights() { - this.showPopupRights = true; - this.countdownRights = 10; - this.startCountdownRights(); - }, - - startCountdownRights() { - this.timer = setInterval(() => { - if (this.countdownRights > 0) { - this.countdownRights--; - } else { - clearInterval(this.timer); - } - }, 1000); - }, attemptClose() { if (this.countdown === 0) { @@ -581,26 +555,9 @@ } }, - rightsClose() { - if (this.countdownRights === 0) { - this.closePopupBanRights(); - } else { - uni.showToast({ - title: `请等待${this.countdownRights}秒`, - icon: 'none' - }); - } - }, - closePopupBan() { this.showPopupBan = false; clearInterval(this.timer); - this.showRulesRights() - }, - - closePopupRights() { - this.showPopupRights = false; - clearInterval(this.timer); }, //监督端获取工程列表 diff --git a/pages/realName/workbench/electronicContractSign/contractPdf.vue b/pages/realName/workbench/electronicContractSign/contractPdf.vue index 7a38ffe..53b602f 100644 --- a/pages/realName/workbench/electronicContractSign/contractPdf.vue +++ b/pages/realName/workbench/electronicContractSign/contractPdf.vue @@ -79,7 +79,7 @@ export default { proId:-1 } uni.request({ - url: config.realAppUrl + '/offLine/getSubcontractor', + url: config.lpAppUrl + '/offLine/getSubcontractor', method: 'post', data: param, header: { @@ -92,8 +92,8 @@ export default { console.log(res) if(res.data.length>0){ this.signData = res.data[0] - this.sealPath = config.realFileUrl+res.data[0].sealPath; - this.signPath = config.realFileUrl+res.data[0].signPath; + this.sealPath = config.lpFileUrl+res.data[0].sealPath; + this.signPath = config.lpFileUrl+res.data[0].signPath; // this.sealPath = config.realFileUrl+`ynRealName/face/2024/01/19/b0f9278cadbe4bdda05833b1300ad93520240117165256.jpg`; // this.signPath = config.realFileUrl+`ynRealName/face/2024/01/19/b0f9278cadbe4bdda05833b1300ad93520240117165256.jpg`; console.log(this.sealPath) @@ -127,7 +127,7 @@ export default { console.log(param) this.showPopup=false; uni.request({ - url: config.realAppUrl+'/contract/updateSign', + url: config.lpAppUrl+'/contract/updateSign', method: 'post', data: param, header: { @@ -162,7 +162,7 @@ export default { }, //短信 getText(){ - let pathUrl = config.realFileUrl+this.contractData.personPdfUrl + let pathUrl = config.lpFileUrl+this.contractData.personPdfUrl let arr = pathUrl.split(".pdf") let path = arr[0]+"_sign.pdf" let shortText = "【作业管控智慧平台】" + this.contractData.partB + "，你的电子合同已签署成功，地址为：" + path; diff --git a/pages/realName/workbench/electronicContractSign/index.vue b/pages/realName/workbench/electronicContractSign/index.vue index b249fe7..dd47594 100644 --- a/pages/realName/workbench/electronicContractSign/index.vue +++ b/pages/realName/workbench/electronicContractSign/index.vue @@ -302,12 +302,12 @@ export default { }, goDetail(item){ console.log(item) - let videoUrl=config.realFileUrl+ item.videoUrl; + let videoUrl=config.lpFileUrl+ item.videoUrl; let url=""; if(item.isSign=='1'){ - url=config.realFileUrl+ item.subPdfUrl; + url=config.lpFileUrl+ item.subPdfUrl; }else{ - url=config.realFileUrl+ item.personPdfUrl; + url=config.lpFileUrl+ item.personPdfUrl; } console.log(url) uni.navigateTo({ @@ -414,7 +414,7 @@ export default { }, //短信 getText(item){ - let pathUrl = config.realFileUrl+item.personPdfUrl + let pathUrl = config.lpFileUrl+item.personPdfUrl let arr = pathUrl.split(".pdf") let path = arr[0]+"_sign.pdf" let shortText = "【作业管控智慧平台】" + item.partB + "，你的电子合同已签署成功，地址为：" + path; diff --git a/pages/realName/workbench/personEnter/addPeople.vue b/pages/realName/workbench/personEnter/addPeople.vue index 27be392..81eb6b6 100644 --- a/pages/realName/workbench/personEnter/addPeople.vue +++ b/pages/realName/workbench/personEnter/addPeople.vue @@ -961,7 +961,7 @@ export default { proId:this.entryCruxBean.proId } uni.request({ - url: config.realExamUrl+'/select/getSubByProId', + url: config.lpExamUrl+'/select/getSubByProId', method: 'get', data: param, header: { @@ -1016,7 +1016,7 @@ export default { subId:this.entrySubTeamBean.subId } uni.request({ - url: config.realExamUrl+'/select/getTeamBySubId', + url: config.lpExamUrl+'/select/getTeamBySubId', method: 'get', data: param, header: { @@ -1154,7 +1154,7 @@ export default { success: res => { console.log('?? ~ res-拍照:', res) uni.uploadFile({ - url: config.realFileUrl+`file/upload`, //服务器地址 + url: config.lpFileUrl+`file/upload`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 name: "imgFile", @@ -1192,7 +1192,7 @@ export default { success: res => { console.log('?? ~ res-拍照:', res) uni.uploadFile({ - url: config.realFileUrl+`file/upload`, //服务器地址 + url: config.lpFileUrl+`file/upload`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 name: "imgFile", @@ -1235,7 +1235,7 @@ export default { console.log('?? ~ res-拍照:', res) this.imgToBase64(res.tempFilePaths[0]).then(base64 => { uni.uploadFile({ - url: config.realFileUrl+`file/uploadFaceRecognition`, //服务器地址 + url: config.lpFileUrl+`file/uploadFaceRecognition`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 formData: { diff --git a/pages/realName/workbench/personEnter/editPeople.vue b/pages/realName/workbench/personEnter/editPeople.vue index 410e898..fce4864 100644 --- a/pages/realName/workbench/personEnter/editPeople.vue +++ b/pages/realName/workbench/personEnter/editPeople.vue @@ -965,7 +965,7 @@ export default { proId:this.entryCruxBean.proId } uni.request({ - url: config.realExamUrl+'/select/getSubByProId', + url: config.lpExamUrl+'/select/getSubByProId', method: 'get', data: param, header: { @@ -1002,7 +1002,7 @@ export default { subId:this.entrySubTeamBean.subId } uni.request({ - url: config.realExamUrl+'/select/getTeamBySubId', + url: config.lpExamUrl+'/select/getTeamBySubId', method: 'get', data: param, header: { @@ -1053,8 +1053,8 @@ export default { if(res.data.entryCruxBean){ this.entryCruxBean=res.data.entryCruxBean; - this.faceImgUrl=config.realBaseUrl+this.entryCruxBean.facePath; - this.signImgUrl=config.realBaseUrl+this.entryCruxBean.autoPath; + this.faceImgUrl=config.lpBaseUrl+this.entryCruxBean.facePath; + this.signImgUrl=config.lpBaseUrl+this.entryCruxBean.autoPath; } if(res.data.entryTrainBean){ this.entryTrainBean=res.data.entryTrainBean;} if(res.data.entrySubTeamBean){ @@ -1064,11 +1064,11 @@ export default { } if(res.data.entryContractBean){ this.entryContractBean=res.data.entryContractBean; - this.contractImgUrl=config.realBaseUrl+this.entryContractBean.contractPath; + this.contractImgUrl=config.lpBaseUrl+this.entryContractBean.contractPath; } if(res.data.entryBankBean){ this.entryBankBean=res.data.entryBankBean; - this.bankImgUrl=config.realBaseUrl+this.entryBankBean.bankPhoto; + this.bankImgUrl=config.lpBaseUrl+this.entryBankBean.bankPhoto; } if(res.data.entryOtherBean){ this.entryOtherBean=res.data.entryOtherBean;} } @@ -1176,7 +1176,7 @@ export default { success: res => { console.log('?? ~ res-拍照:', res) uni.uploadFile({ - url: config.realFileUrl+`file/upload`, //服务器地址 + url: config.lpFileUrl+`file/upload`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 name: "imgFile", @@ -1214,7 +1214,7 @@ export default { success: res => { console.log('?? ~ res-拍照:', res) uni.uploadFile({ - url: config.realFileUrl+`file/upload`, //服务器地址 + url: config.lpFileUrl+`file/upload`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 name: "imgFile", @@ -1257,7 +1257,7 @@ export default { console.log('?? ~ res-拍照:', res) this.imgToBase64(res.tempFilePaths[0]).then(base64 => { uni.uploadFile({ - url: config.realFileUrl+`file/uploadFaceRecognition`, //服务器地址 + url: config.lpFileUrl+`file/uploadFaceRecognition`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 formData: { diff --git a/pages/realName/workbench/personEnter/facePeople.vue b/pages/realName/workbench/personEnter/facePeople.vue index e5d57d3..1a50050 100644 --- a/pages/realName/workbench/personEnter/facePeople.vue +++ b/pages/realName/workbench/personEnter/facePeople.vue @@ -862,7 +862,7 @@ export default { this.imgToBase64(res.tempFilePaths[0]).then(base64 => { // console.log(base64) uni.uploadFile({ - url: config.realFileUrl+`file/getFaceRecognition`, //服务器地址 + url: config.lpFileUrl+`file/getFaceRecognition`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 formData: { @@ -1023,7 +1023,7 @@ export default { proId:this.entryCruxBean.proId } uni.request({ - url: config.realExamUrl+'/select/getSubByProId', + url: config.lpExamUrl+'/select/getSubByProId', method: 'get', data: param, header: { @@ -1060,7 +1060,7 @@ export default { subId:this.entrySubTeamBean.subId } uni.request({ - url: config.realExamUrl+'/select/getTeamBySubId', + url: config.lpExamUrl+'/select/getTeamBySubId', method: 'get', data: param, header: { @@ -1110,8 +1110,8 @@ export default { if(res.data.entryIdNumberBean){ this.entryIdNumberBean=res.data.entryIdNumberBean;} if(res.data.entryCruxBean){ this.entryCruxBean=res.data.entryCruxBean; - this.faceImgUrl=config.realBaseUrl+this.entryCruxBean.facePath; - this.signImgUrl=config.realBaseUrl+this.entryCruxBean.autoPath; + this.faceImgUrl=config.lpBaseUrl+this.entryCruxBean.facePath; + this.signImgUrl=config.lpBaseUrl+this.entryCruxBean.autoPath; } if(res.data.entryTrainBean){ this.entryTrainBean=res.data.entryTrainBean;} if(res.data.entrySubTeamBean){ @@ -1121,11 +1121,11 @@ export default { } if(res.data.entryContractBean){ this.entryContractBean=res.data.entryContractBean; - this.contractImgUrl=config.realBaseUrl+this.entryContractBean.contractPath; + this.contractImgUrl=config.lpBaseUrl+this.entryContractBean.contractPath; } if(res.data.entryBankBean){ this.entryBankBean=res.data.entryBankBean; - this.bankImgUrl=config.realBaseUrl+this.entryBankBean.bankPhoto; + this.bankImgUrl=config.lpBaseUrl+this.entryBankBean.bankPhoto; } if(res.data.entryOtherBean){ this.entryOtherBean=res.data.entryOtherBean;} } @@ -1233,7 +1233,7 @@ export default { success: res => { console.log('?? ~ res-拍照:', res) uni.uploadFile({ - url: config.realFileUrl+`file/upload`, //服务器地址 + url: config.lpFileUrl+`file/upload`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 name: "imgFile", @@ -1271,7 +1271,7 @@ export default { success: res => { console.log('?? ~ res-拍照:', res) uni.uploadFile({ - url: config.realFileUrl+`file/upload`, //服务器地址 + url: config.lpFileUrl+`file/upload`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 name: "imgFile", @@ -1314,7 +1314,7 @@ export default { console.log('?? ~ res-拍照:', res) this.imgToBase64(res.tempFilePaths[0]).then(base64 => { uni.uploadFile({ - url: config.realFileUrl+`file/uploadFaceRecognition`, //服务器地址 + url: config.lpFileUrl+`file/uploadFaceRecognition`, //服务器地址 fileType:"image",//ZFB必填,不然报错 filePath: res.tempFilePaths[0],//这个就是我们上面拍照返回或者先中照片返回的数组 formData: { diff --git a/pages/realName/workbench/safeguarding/detail.vue b/pages/realName/workbench/safeguarding/detail.vue index 7e6f6e8..262bdd6 100644 --- a/pages/realName/workbench/safeguarding/detail.vue +++ b/pages/realName/workbench/safeguarding/detail.vue @@ -163,16 +163,16 @@ export default { var imgList=res.data; imgList.forEach(item=>{ if(item.type==1){ - this.contractImgUrl=config.realBaseUrl+item.path; + this.contractImgUrl=config.lpBaseUrl+item.path; } if(item.type==2){ - this.attendanceImgUrl=config.realBaseUrl+item.path; + this.attendanceImgUrl=config.lpBaseUrl+item.path; } if(item.type==3){ - this.wageImgUrl=config.realBaseUrl+item.path; + this.wageImgUrl=config.lpBaseUrl+item.path; } if(item.type==4){ - this.otherImgUrl=config.realBaseUrl+item.path; + this.otherImgUrl=config.lpBaseUrl+item.path; } }) }else{ diff --git a/pages/realName/workbench/safeguarding/index.vue b/pages/realName/workbench/safeguarding/index.vue index 48b2a7b..91fcda3 100644 --- a/pages/realName/workbench/safeguarding/index.vue +++ b/pages/realName/workbench/safeguarding/index.vue @@ -2,151 +2,9 @@ - - + @rightClick="goAdd" :rightIconStyle="{ color: '#FFF', fontSize: '32rpx' }" /> - - - 基本信息 - - - - - 欠薪单位 * - - - - - - - - 欠薪项目 * - - - - - - - - 欠薪金额 * - - - - - - - - 单位地址 * - - - - - - - - 申请人姓名 * - - - - - - - - 身份证号码 * - - - - - - - - 电话号码 * - - - - - - - - - 欠薪时间 * - - - - - - - 有效依据 - - - 合同照片 * - - - - - - - - - - - 考勤记录 * - - - - - - - - - - - 工资信息 * - - - - - - - - - - - 其他依据 - - - - - - - - - - - - 确 定 - - - - - + @@ -157,18 +15,35 @@ - - 姓名： - {{item.applayUser}} - - - 身份证号： - {{item.idCard}} - 申诉上传时间： {{item.representationTime}} + + + 欠薪单位： + {{item.oweCompany}} + + + + 欠薪项目： + {{item.oweProject}} + + + + 欠薪金额（元）： + {{item.oweMoney}} + + +
+ + + + 回复状态： + 已回复 + 未回复 + + 申诉回复结果： {{item.replyContent}} @@ -192,7 +67,6 @@ export default { data() { return { - currentTabIndex: 1, formData: { "id": "", //uuid "oweCompany": "", //欠薪单位 @@ -272,17 +146,13 @@ onLoad() { this.formData.id = this.uuid() this.safeguardingId = this.formData.id + this.getSafeguardingInfoList() }, + onShow() {}, - watch: { - currentTabIndex: function(newVal, oldVal) { - if (newVal == 1) { - this.getSafeguardingInfoList() - } else { - - } - } - }, + + + methods: { getSafeguardingInfoList() { let param = { @@ -313,12 +183,20 @@ } }) }, + goDetail(item) { console.log(item) uni.navigateTo({ url: `/pages/realName/workbench/safeguarding/detail?id=${item.id}` }) }, + + goAdd(){ + uni.navigateTo({ + url: `/pages/realName/workbench/safeguarding/add` + }) + }, + //提交 sumbit() { this.$refs.cForm.validate().then(res => { @@ -390,6 +268,7 @@ if (this.otherPath != '') { this.uploadPhoto(this.otherPath, 4) } + } else { uni.showToast({ title: res.msg, @@ -407,6 +286,7 @@ uni.$u.toast('填写数据存在问题') }) }, + // 拍照录入 openPhotograph(type) { uni.chooseImage({ @@ -439,10 +319,11 @@ } }) }, + //上传图片 uploadPhoto(path, type) { uni.uploadFile({ - url: config.realFileUrl + `file/upload`, //服务器地址 + url: config.lpFileUrl + `file/upload`, //服务器地址 fileType: "image", //ZFB必填,不然报错 filePath: path, //这个就是我们上面拍照返回或者先中照片返回的数组 name: "imgFile", @@ -464,6 +345,7 @@ } }); }, + //更新图片 uploadSafeguardingPhoto(path, type) { let obj = { @@ -533,6 +415,7 @@ }) }) }, + //身份证校验 verifyidNumber(idNumber) { // 校验长度 @@ -558,6 +441,7 @@ return true; }, + timeFormat(dateTime = null, formatStr = 'yyyy-mm-dd') { let date // 若传入时间为假值，则取当前时间 @@ -602,6 +486,7 @@ } return formatStr }, + uuid() { var s = []; var hexDigits = "0123456789abcdef"; @@ -614,6 +499,7 @@ var uuid = s.join(""); return uuid; }, + // 返回 leftClick() { console.log('返回') @@ -621,11 +507,7 @@ delta: 1 // 返回 }); }, - onRightClick() { - // 新增的右侧图标点击事件处理逻辑 - console.log('Right icon clicked'); - // 在这里添加你想执行的操作，比如导航到新增页面等 - } + }, }