From 3ac6e233e1c4659788a5bf7ca7a3a439f01cdcdf Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 15 May 2024 14:16:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=BA=BA=E8=84=B8=E6=AF=94=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/application/onlinexxks/video_study.vue | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pages/application/onlinexxks/video_study.vue b/pages/application/onlinexxks/video_study.vue index 8583392..03b4b3f 100644 --- a/pages/application/onlinexxks/video_study.vue +++ b/pages/application/onlinexxks/video_study.vue @@ -496,9 +496,21 @@ export default { CHAPTER_ID: this.videoData.CHAPTER_ID, VIDEOCOURSEWARE_ID: this.videoData.VIDEOCOURSEWARE_ID, }) - uni.navigateTo({ - url: '/pages/application/onlinexxks/face/index?params=' + params - }) + const resData = await this.post('/app/user/getUserFace', { + USERNAME: loginUser.NAME, + USER_ID: loginUser.USER_ID, + }); + if (!resData.pd.PORTRAIT) { + uni.showModal({ + title: "温馨提示", + confirmText: "确定", + content: "您当前还未进行人脸认证，请先进行认证", + }); + } else { + uni.navigateTo({ + url: '/pages/application/onlinexxks/face/index?params=' + params + }) + } }, fnNavigationExercises(VIDEOCOURSEWARE_ID) { uni.navigateTo({ From b73c4da3c51a5fb03474387506442bd288b52edb Mon Sep 17 00:00:00 2001 From: xiepeng Date: Thu, 16 May 2024 18:01:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dirving-inspections-list.vue | 39 ++++++- .../driving-item-check-list.vue | 2 +- .../basics/basic-info/components/baseInfo.vue | 27 ++++- .../basic-info/components/certificate.vue | 100 +++++++++--------- pages/basics/basic-info/user-info.vue | 4 +- 5 files changed, 113 insertions(+), 59 deletions(-) diff --git a/pages/application/driving-inspections/dirving-inspections-list.vue b/pages/application/driving-inspections/dirving-inspections-list.vue index 3447ce9..36fef94 100644 --- a/pages/application/driving-inspections/dirving-inspections-list.vue +++ b/pages/application/driving-inspections/dirving-inspections-list.vue @@ -112,7 +112,7 @@ this.loginUserId = loginUser.USER_ID; this.background = require('@/common/background.json'); await this.getFunc(); - this.getData(); + this.fnInit(); // setTimeout(function() { // that.loading = true // }, 500) @@ -140,8 +140,7 @@ _this.list1 = []; await this.getFunc(); } - this.getData() - + this.fnInit() }, methods: { @@ -159,6 +158,39 @@ this.list = []; this.list1 = []; this.getData() + }, + async fnInit() { + uni.request({ + url: basePath + '/app/offduty/isRest', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + USER_NAME: loginUser.NAME, + CORPINFO_ID: loginUser.CORPINFO_ID, + USER_ID: loginUser.USER_ID, + }, + success: (res) => { + console.log(res) + if("0" == res.data.ISREST){ + this.getData(); + }else{ + uni.showModal({ + title: "温馨提示", + confirmText: "确定", + content: + "重要提醒：您当前处于离岗状态，无法操作。", + success: (res) => { + if (res.cancel || res.confirm) { + uni.navigateBack(); + } + }, + }); + } + } + }) }, getData(){ var _this=this; @@ -170,7 +202,6 @@ title: '加载中' }) uni.request({ - url: basePath + '/app/waybillregistration/listForSecurityWaybillre', method: 'POST', dataType: 'json', diff --git a/pages/application/driving-inspections/driving-item-check-list.vue b/pages/application/driving-inspections/driving-item-check-list.vue index 90e5de4..d304e17 100644 --- a/pages/application/driving-inspections/driving-item-check-list.vue +++ b/pages/application/driving-inspections/driving-item-check-list.vue @@ -45,7 +45,7 @@ - 不是 + 否 diff --git a/pages/basics/basic-info/components/baseInfo.vue b/pages/basics/basic-info/components/baseInfo.vue index aaa2f53..a16aa5d 100644 --- a/pages/basics/basic-info/components/baseInfo.vue +++ b/pages/basics/basic-info/components/baseInfo.vue @@ -19,6 +19,21 @@ + 人员类型 + + + 文化程度 {{formData.DEGREE_OF_EDUCATION_NAME}} @@ -85,8 +100,11 @@ import { formatDate,validateIdCard,validateMobile,getLevel } from '../../../../common/tool.js'; +import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue"; + export default { name: "register_baseInfo", + components: {ZqsSelect}, props: { applyStatus: { type: String, @@ -162,12 +180,15 @@ import { this.formData[name] = e.detail.value this.$forceUpdate();//强制刷新 }, + changeSelect(e, name) { + this.$forceUpdate();//强制刷新 + }, pickerChangeData(e,name) { // 人员类型 if (name === 'PERSONNEL_TYPE') { this.dictData.PERSONNEL_TYPE.index = e.detail.value; this.formData.PERSONNEL_TYPE = this.dictData.PERSONNEL_TYPE.list[this.dictData.PERSONNEL_TYPE.index].DICTIONARIES_ID - this.formData.PERSONNEL_TYPE_NAME = this.dictData.PERSONNEL_TYPE.list[this.dictData.PERSONNEL_TYPE.index].NAME + this.formData.PERSONNEL_TYPENAME = this.dictData.PERSONNEL_TYPE.list[this.dictData.PERSONNEL_TYPE.index].NAME } // 政治面貌 if (name === 'POLITICAL_OUTLOOK') { @@ -192,7 +213,7 @@ import { }, validateData() { // 人员类型 - if (!this.formData.PERSONNEL_TYPE) { + if (this.formData.PERSONNEL_TYPE.length < 1) { uni.showToast({ icon: 'none', title: '请选择人员类型', diff --git a/pages/basics/basic-info/components/certificate.vue b/pages/basics/basic-info/components/certificate.vue index e1faf2c..18914fc 100644 --- a/pages/basics/basic-info/components/certificate.vue +++ b/pages/basics/basic-info/components/certificate.vue @@ -20,10 +20,10 @@ 人员类型 - {{formData.PERSONNEL_TYPE_NAME}} + {{formData.PERSONNEL_TYPENAME}} - {{formData.PERSONNEL_TYPE_NAME?formData.PERSONNEL_TYPE_NAME:'请选择'}} + {{formData.PERSONNEL_TYPE.join()}} @@ -737,53 +737,55 @@ export default { } // 驾驶证 - if (this.fileData.driverLicense.length < 1) { - uni.showToast({ - icon: 'none', - title: '请上传驾驶证照片', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_NO) { - uni.showToast({ - icon: 'none', - title: '请输入驾驶证号', - duration: 2000 - }); - return false; - } - if (this.formData.DRIVING_MODEL.length < 1) { - uni.showToast({ - icon: 'none', - title: '请选择准驾车型', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) { - uni.showToast({ - icon: 'none', - title: '请选择初次领证日期', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) { - uni.showToast({ - icon: 'none', - title: '请选择驾驶证有效期时间', - duration: 2000 - }); - return false; - } - if (!this.formData.DRIVER_LICENSE_ORGAN) { - uni.showToast({ - icon: 'none', - title: '请输入驾驶证的签发机关', - duration: 2000 - }); - return false; + if (this.formData.PERSONNEL_TYPE_NAME.find((item) => item === '驾驶员')) { + if (this.fileData.driverLicense.length < 1) { + uni.showToast({ + icon: 'none', + title: '请上传驾驶证照片', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_NO) { + uni.showToast({ + icon: 'none', + title: '请输入驾驶证号', + duration: 2000 + }); + return false; + } + if (this.formData.DRIVING_MODEL.length < 1) { + uni.showToast({ + icon: 'none', + title: '请选择准驾车型', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_ISSUE_DATE) { + uni.showToast({ + icon: 'none', + title: '请选择初次领证日期', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_VALIDITY_START || !this.formData.DRIVER_LICENSE_VALIDITY_END) { + uni.showToast({ + icon: 'none', + title: '请选择驾驶证有效期时间', + duration: 2000 + }); + return false; + } + if (!this.formData.DRIVER_LICENSE_ORGAN) { + uni.showToast({ + icon: 'none', + title: '请输入驾驶证的签发机关', + duration: 2000 + }); + return false; + } } // 从业资格证证 diff --git a/pages/basics/basic-info/user-info.vue b/pages/basics/basic-info/user-info.vue index 7597154..f8181bf 100644 --- a/pages/basics/basic-info/user-info.vue +++ b/pages/basics/basic-info/user-info.vue @@ -93,8 +93,8 @@ import Apply from "./components/apply.vue" SEXNAME: '', //人员类型 - PERSONNEL_TYPE: '', - PERSONNEL_TYPE_NAME: '', + PERSONNEL_TYPE: [], + PERSONNEL_TYPENAME: '', // 政治面貌 POLITICAL_OUTLOOK: '', POLITICAL_OUTLOOK_NAME: '', From c7cd69ad26ac1a08235981f8395fdb635381e7e9 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 17 May 2024 09:21:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dirving-inspections-list.vue | 37 +------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/pages/application/driving-inspections/dirving-inspections-list.vue b/pages/application/driving-inspections/dirving-inspections-list.vue index 36fef94..8338526 100644 --- a/pages/application/driving-inspections/dirving-inspections-list.vue +++ b/pages/application/driving-inspections/dirving-inspections-list.vue @@ -112,7 +112,7 @@ this.loginUserId = loginUser.USER_ID; this.background = require('@/common/background.json'); await this.getFunc(); - this.fnInit(); + this.getData(); // setTimeout(function() { // that.loading = true // }, 500) @@ -140,7 +140,7 @@ _this.list1 = []; await this.getFunc(); } - this.fnInit() + this.getData(); }, methods: { @@ -158,39 +158,6 @@ this.list = []; this.list1 = []; this.getData() - }, - async fnInit() { - uni.request({ - url: basePath + '/app/offduty/isRest', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - USER_NAME: loginUser.NAME, - CORPINFO_ID: loginUser.CORPINFO_ID, - USER_ID: loginUser.USER_ID, - }, - success: (res) => { - console.log(res) - if("0" == res.data.ISREST){ - this.getData(); - }else{ - uni.showModal({ - title: "温馨提示", - confirmText: "确定", - content: - "重要提醒：您当前处于离岗状态，无法操作。", - success: (res) => { - if (res.cancel || res.confirm) { - uni.navigateBack(); - } - }, - }); - } - } - }) }, getData(){ var _this=this; From 57a2833e51232c27ed37c819470a941ee2834ebb Mon Sep 17 00:00:00 2001 From: wangpeng Date: Fri, 17 May 2024 15:47:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E4=B8=89=E6=A3=80?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=9C=B0=E7=82=B9undefined=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driving-inspections/driving-item-check-list.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pages/application/driving-inspections/driving-item-check-list.vue b/pages/application/driving-inspections/driving-item-check-list.vue index d304e17..e82eb46 100644 --- a/pages/application/driving-inspections/driving-item-check-list.vue +++ b/pages/application/driving-inspections/driving-item-check-list.vue @@ -196,16 +196,17 @@ type: 'gcj02', geocode: true, success: function (locationRes) { - const locationAddress = `${locationRes.address.province}${locationRes.address.city}${locationRes.address.district}${locationRes.address.street}${locationRes.address.streetNum}${locationRes.address.poiName}`; - // 创建画布 + let locationAddress = `${locationRes.address.province}${locationRes.address.city}${locationRes.address.district}${locationRes.address.street}${locationRes.address.streetNum}${locationRes.address.poiName}`; + locationAddress = locationAddress.replace(/undefined/g,'') + // 创建画布 const ctx = uni.createCanvasContext('watermarkCanvas', _this); ctx.drawImage(tempFilePath, 0, 0, 300, 150); // 图片大小 ctx.setFontSize(20); // 水印字体大小 ctx.setFillStyle('red'); // 水印字体颜色 ctx.setFontSize(10); // 调整字体大小，适应位置信息 // 绘制水印 - ctx.fillText(`当前时间: ${_this.todayDate}`, 10, 120); // 根据实际情况调整位置 - ctx.fillText(`当前位置: ${locationAddress}`, 10, 130); // 根据实际情况调整位置 + ctx.fillText(`当前时间: ${_this.todayDate}`, 10, 130); // 根据实际情况调整位置 + ctx.fillText(`当前位置: ${locationAddress}`, 10, 140); // 根据实际情况调整位置 ctx.draw(false, () => { // 将画布内容保存为图片 uni.canvasToTempFilePath({