diff --git a/pages/addjigou/card.vue b/pages/addjigou/card.vue index 844e60a..6722316 100644 --- a/pages/addjigou/card.vue +++ b/pages/addjigou/card.vue @@ -57,7 +57,7 @@ 下一步 - + diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index a0570d4..f60c153 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -85,7 +85,7 @@ 下一步 - + diff --git a/pages/addoldman/IDcard.vue b/pages/addoldman/IDcard.vue index 9ad8364..56b7e43 100644 --- a/pages/addoldman/IDcard.vue +++ b/pages/addoldman/IDcard.vue @@ -78,7 +78,7 @@ 提交 - + diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue index ff2744c..6d27b11 100644 --- a/pages/addoldman/oldIDcard.vue +++ b/pages/addoldman/oldIDcard.vue @@ -147,7 +147,7 @@ 提交 - + diff --git a/pages/addstaff/IDcard.vue b/pages/addstaff/IDcard.vue index c5583e4..b41fc2c 100644 --- a/pages/addstaff/IDcard.vue +++ b/pages/addstaff/IDcard.vue @@ -79,7 +79,7 @@ 下一步 - + diff --git a/pages/addstaff/api/addjigou.js b/pages/addstaff/api/addjigou.js index a95540b..27d4ebe 100644 --- a/pages/addstaff/api/addjigou.js +++ b/pages/addstaff/api/addjigou.js @@ -18,6 +18,12 @@ export function getMessageList(orgCode){ method: 'get', }) } +export function queryEmployeeInfoById(id){ + return request({ + url: `/api/employeesAdvisiory/queryEmployeeInfoById?id=${id}`, + method: 'get', + }) +} //向机构申请 export function Apply(data){ diff --git a/pages/addstaff/bankcard.vue b/pages/addstaff/bankcard.vue index 307e21e..effa65b 100644 --- a/pages/addstaff/bankcard.vue +++ b/pages/addstaff/bankcard.vue @@ -76,7 +76,7 @@ 下一步 - + @@ -367,20 +367,20 @@ if (!uping.value) { return } - if (!textArray[0]) { - uni.showToast({ - title: '请输入开户行', - icon: 'none' - }) - return - } - if (!textArray[1]) { - uni.showToast({ - title: '请输入银行卡号', - icon: 'none' - }) - return - } + // if (!textArray[0]) { + // uni.showToast({ + // title: '请输入开户行', + // icon: 'none' + // }) + // return + // } + // if (!textArray[1]) { + // uni.showToast({ + // title: '请输入银行卡号', + // icon: 'none' + // }) + // return + // } // if (allNonEmpty) { let data = uni.getStorageSync('backhuancun') data.openingBank = textArray[0] diff --git a/pages/addstaff/healthcertificate.vue b/pages/addstaff/healthcertificate.vue index 8ca31f5..3cab68f 100644 --- a/pages/addstaff/healthcertificate.vue +++ b/pages/addstaff/healthcertificate.vue @@ -108,7 +108,7 @@ 提交 - + diff --git a/pages/addsupplier/information.vue b/pages/addsupplier/information.vue index 7212a67..552d611 100644 --- a/pages/addsupplier/information.vue +++ b/pages/addsupplier/information.vue @@ -114,7 +114,7 @@ - + diff --git a/pages/index/index.vue b/pages/index/index.vue index effc409..ddcbd0a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -25,18 +25,19 @@ :src="`https://www.focusnu.com/media/directive/index/${statusarray[Number(item.status) - 1]}.png`" lazy-load="false" /> - 您提交的 + - "{{item.comName}}" + 您提交的"{{item.comName}}"加盟申请 + + 正在审核中 + - 加盟申请 - - 正在审核中 - + + 查看 @@ -211,7 +212,7 @@ - + 机构加盟 @@ -221,7 +222,7 @@ src="https://www.focusnu.com/media/directive/index/addjiji/addjigou.png" lazy-load="false" /> - 添加机构 + 机构加盟 @@ -56,6 +55,11 @@ {{ item.content }} + + + {{ item.createTime }} + + @@ -467,10 +471,10 @@ .card-right { position: absolute; - right: 10rpx; + right: 30rpx; top: 50%; transform: translateY(-50%); - width: 140rpx; + width: 40rpx; display: flex; color: #999999; } diff --git a/pages/yuangongindex/workjoin.vue b/pages/yuangongindex/workjoin.vue index 6135464..0b24341 100644 --- a/pages/yuangongindex/workjoin.vue +++ b/pages/yuangongindex/workjoin.vue @@ -111,7 +111,7 @@ getEmployeesOrgRela, } from './api.js' import { - getMessageList + queryEmployeeInfoById } from '@/pages/addstaff/api/addjigou.js' import model from "@/compontent/public/model.vue" @@ -182,12 +182,10 @@ const jumpToAll = (element) => { - getMessageList(element.orgCode).then(res => { - if (res.success) { + queryEmployeeInfoById(element.id).then(res => { uni.navigateTo({ - url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&applyStatus=${element.applyStatus}&code=1` + url: `/pages/addstaff/all?element=${JSON.stringify(res.result)}&applyStatus=${element.applyStatus}&code=1` }); - } }) }