diff --git a/pages/application/home.vue b/pages/application/home.vue index b91bd88..dbe814b 100644 --- a/pages/application/home.vue +++ b/pages/application/home.vue @@ -116,7 +116,7 @@ - + diff --git a/pages/basics/basic-info/home.vue b/pages/basics/basic-info/home.vue index 3092b6d..1e30cec 100644 --- a/pages/basics/basic-info/home.vue +++ b/pages/basics/basic-info/home.vue @@ -18,9 +18,9 @@ 入职申请 - · + - + 信息确认 diff --git a/pages/basics/home.vue b/pages/basics/home.vue index bff6d20..d5c9965 100644 --- a/pages/basics/home.vue +++ b/pages/basics/home.vue @@ -72,7 +72,7 @@ 人员信息 - + @@ -81,7 +81,7 @@ - @@ -90,7 +90,7 @@ 风险分布 - + @@ -99,8 +99,8 @@ - - + + @@ -127,37 +127,6 @@ 安全承诺 - - - - - - 学习园地 - - - - - - - - - - - 安全环保检查 - - {{ safetyEnvironmentalInspection }} - - - - - - - - 设备巡检 - - @@ -176,6 +145,37 @@ 行车三检 + + + + + + 学习园地 + + + + + + + - + @@ -648,7 +648,8 @@ import { rollData: [], eight_work_count: 0, updataPd: {}, - modalName: '' + modalName: '', + loginCorpId: '' }; }, mounted() { @@ -657,11 +658,14 @@ import { let now = new Date(); var today = formatDate(now, 'yyyy-MM-dd'); + this.loginCorpId = loginUser.CORPINFO_ID + console.log("loginUser.CORPINFO_ID：" + loginUser.CORPINFO_ID) + console.log("loginCorpId：" + this.loginCorpId) if (loginUser.CORPINFO_ID) { this.getSafetyEnvironmentalInspectionCount(); this.getIsRest(); this.getData(); - this.getSurveyData(); + // this.getSurveyData(); this.getListData(); // 获取隐患播报滚动 this.getHiddenRoll(); diff --git a/pages/index/index.vue b/pages/index/index.vue index 21438d3..d33d2c9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -11,14 +11,14 @@ 首页 - + {{hidCount}} 应用 - + {{mesCount}} @@ -77,7 +77,8 @@ hidCount:0, dys:0, dzg:0, - isShowTabBar:false + isShowTabBar:false, + loginCorpId: '' } }, onBackPress() { @@ -138,6 +139,7 @@ this.getPromiseUnsigned() }, onLoad() { + this.loginCorpId = loginUser.CORPINFO_ID this.plusReady(); // this.checkPlatform(); // this.checkUpdate("android"); diff --git a/pages/login/register/account.vue b/pages/login/register/account.vue index d47b264..183a782 100644 --- a/pages/login/register/account.vue +++ b/pages/login/register/account.vue @@ -51,41 +51,43 @@ import { }, methods: { //跳转事件 - confirmAccount(e) { + async confirmAccount(e) { if (this.validateData()) { - this.checkIdCardData() - // const org_birthday = this.formData.USER_ID_CARD.substring(6, 14); - // const org_gender = this.formData.USER_ID_CARD.substring(16, 17); - // const birthday = - // org_birthday.substring(0, 4) + - // "-" + - // org_birthday.substring(4, 6) + - // "-" + - // org_birthday.substring(6, 8); - // const birthdays = new Date(birthday.replace(/-/g, "/")); - // const Month = birthdays.getMonth() + 1; - // let MonthDate; - // const DayDate = birthdays.getDate(); - // let Day; - // if (Month < 10) MonthDate = "0" + Month; - // else MonthDate = Month; - // if (DayDate < 10) Day = "0" + DayDate; - // else Day = DayDate; - // this.formData.SEX = org_gender % 2 === 1 ? "1" : "0"; - // this.formData.DATE_OF_BIRTH = birthdays.getFullYear() + "-" + MonthDate + "-" + Day; - // this.formData.DRIVER_LICENSE_NO = this.formData.USER_ID_CARD - // this.formData.QUALIFICATION_CERTIFICATE_NO = this.formData.USER_ID_CARD - // // uni.navigateTo({ - // // url: '/pages/login/register/baseInfo?' - // // +'NAME='+encodeURIComponent(JSON.stringify(this.formData.NAME.replace('%','%25'))) - // // +'&USER_ID_CARD='+ encodeURIComponent(JSON.stringify(this.formData.USER_ID_CARD)) - // // +'&PHONE='+ encodeURIComponent(JSON.stringify(this.formData.PHONE)) - // // +'&DATE_OF_BIRTH='+ encodeURIComponent(JSON.stringify(this.formData.DATE_OF_BIRTH)) - // // +'&SEX='+ encodeURIComponent(JSON.stringify(this.formData.SEX)) - // // }); - // this.$emit("confirm", ''); + const flag = await this.checkIdCardData() + if (flag) { + const org_birthday = this.formData.USER_ID_CARD.substring(6, 14); + const org_gender = this.formData.USER_ID_CARD.substring(16, 17); + const birthday = + org_birthday.substring(0, 4) + + "-" + + org_birthday.substring(4, 6) + + "-" + + org_birthday.substring(6, 8); + const birthdays = new Date(birthday.replace(/-/g, "/")); + const Month = birthdays.getMonth() + 1; + let MonthDate; + const DayDate = birthdays.getDate(); + let Day; + if (Month < 10) MonthDate = "0" + Month; + else MonthDate = Month; + if (DayDate < 10) Day = "0" + DayDate; + else Day = DayDate; + this.formData.SEX = org_gender % 2 === 1 ? "1" : "0"; + this.formData.DATE_OF_BIRTH = birthdays.getFullYear() + "-" + MonthDate + "-" + Day; + this.formData.DRIVER_LICENSE_NO = this.formData.USER_ID_CARD + this.formData.QUALIFICATION_CERTIFICATE_NO = this.formData.USER_ID_CARD + // uni.navigateTo({ + // url: '/pages/login/register/baseInfo?' + // +'NAME='+encodeURIComponent(JSON.stringify(this.formData.NAME.replace('%','%25'))) + // +'&USER_ID_CARD='+ encodeURIComponent(JSON.stringify(this.formData.USER_ID_CARD)) + // +'&PHONE='+ encodeURIComponent(JSON.stringify(this.formData.PHONE)) + // +'&DATE_OF_BIRTH='+ encodeURIComponent(JSON.stringify(this.formData.DATE_OF_BIRTH)) + // +'&SEX='+ encodeURIComponent(JSON.stringify(this.formData.SEX)) + // }); + this.$emit("confirm", ''); + } } - }, + }, goback(){ var pages = getCurrentPages(); // 获取当前页面栈 var prePage = pages[pages.length - 2]; // 上二级页面 diff --git a/pages/login/register/index.vue b/pages/login/register/index.vue index e32e6bd..b3e1117 100644 --- a/pages/login/register/index.vue +++ b/pages/login/register/index.vue @@ -77,11 +77,11 @@ form: { USER_ID: '', // 姓名 - NAME: '王', + NAME: '', // 身份证号 - USER_ID_CARD: '130324198402060224', + USER_ID_CARD: '', // 手机号码 - PHONE: '13091370001', + PHONE: '', // 生日 DATE_OF_BIRTH: '', // 性别 @@ -103,12 +103,12 @@ ID_CARD_FRONT: '', ID_CARD_BACK: '', // 身份证有效期 - ID_CARD_VALIDITY_START: '2019-03-13', - ID_CARD_VALIDITY_END: '2039-03-13', + ID_CARD_VALIDITY_START: '', + ID_CARD_VALIDITY_END: '', // 身份证住址 - ID_CARD_ADDRESS: '住址', + ID_CARD_ADDRESS: '', // 身份证签发机关 - ID_CARD_ORGAN: '身份证签发机关', + ID_CARD_ORGAN: '', // 民族 NATION: '', NATIONNAME: '', @@ -120,15 +120,15 @@ // 准驾车型 DRIVING_MODEL: [], // 国籍 - DRIVING_NATIONALITY: '中国', + DRIVING_NATIONALITY: '', // 初次领证日期 - DRIVER_LICENSE_ISSUE_DATE: '2010-03-13', + DRIVER_LICENSE_ISSUE_DATE: '', // 驾驶证有效期（起始） - DRIVER_LICENSE_VALIDITY_START: '2015-03-13', + DRIVER_LICENSE_VALIDITY_START: '', // 驾驶证有效期（截止） - DRIVER_LICENSE_VALIDITY_END: '2025-03-13', + DRIVER_LICENSE_VALIDITY_END: '', // 驾驶证签发机关 - DRIVER_LICENSE_ORGAN: '驾驶证签发机关', + DRIVER_LICENSE_ORGAN: '', // 道路运输从业人员从业资格证照片 QUALIFICATION_CERTIFICATE: '', @@ -137,15 +137,15 @@ // 从业资格类别 QUALIFICATION_CERTIFICATE_CATEGORY: [], // 道路运输从业人员从业资格证号 - QUALIFICATION_CERTIFICATE_NATIONALITY: '中国', + QUALIFICATION_CERTIFICATE_NATIONALITY: '', // 初次领证日期 - QUALIFICATION_CERTIFICATE_ISSUE_DATE: '2011-03-13', + QUALIFICATION_CERTIFICATE_ISSUE_DATE: '', // 从业资格证有效期（起始） - QUALIFICATION_CERTIFICATE_VALIDITY_START: '2023-03-13', + QUALIFICATION_CERTIFICATE_VALIDITY_START: '', // 从业资格证有效期（截止） - QUALIFICATION_CERTIFICATE_VALIDITY_END: '2029-03-13', + QUALIFICATION_CERTIFICATE_VALIDITY_END: '', // 道路运输从业人员从业资格证签发机关 - QUALIFICATION_CERTIFICATE_ORGAN: '从业资格证签发机关', + QUALIFICATION_CERTIFICATE_ORGAN: '', //申请入职企业 APPLY_CORP: '', diff --git a/pages/my/home.vue b/pages/my/home.vue index 8422e2a..2fc4692 100644 --- a/pages/my/home.vue +++ b/pages/my/home.vue @@ -14,8 +14,8 @@ - - + + 离岗 @@ -69,16 +69,19 @@ export default { data() { return { + loginCorpId: '', loginUser :'', userPhoto :'/static/avatar.png', isRest :'' }; }, mounted() { - this.getData(); this.loginUser = loginUser; + this.loginCorpId = loginUser.CORPINFO_ID + console.log('loginCorpId =>' + this.loginCorpId) this.isRest = isRest; - if(this.loginUser.USERNAME){ + if(this.loginCorpId && this.loginUser.USERNAME){ + this.getData(); this.getUserInfo(); }