diff --git a/src/pages/materialsStation/index/index.vue b/src/pages/materialsStation/index/index.vue index 29fe4fd..c432d57 100644 --- a/src/pages/materialsStation/index/index.vue +++ b/src/pages/materialsStation/index/index.vue @@ -185,8 +185,9 @@ onShow(async () => { userInfo.value = memberStore.userInfo || {} // console.log('🚀 ~ onShow ~ userInfo.value:', userInfo.value) getToolsLedgerDetailsList() - await Promise.all([getUserInfoByUserName(), projectInfoList()]) - getUserInfoByIdCard() + getUserInfoByUserName() + // await Promise.all([getUserInfoByUserName(), projectInfoList()]) + // getUserInfoByIdCard() getTeamList() }) diff --git a/src/pages/materialsStation/teamWarning/teamWarning.vue b/src/pages/materialsStation/teamWarning/teamWarning.vue index 833f9d2..7c31ff2 100644 --- a/src/pages/materialsStation/teamWarning/teamWarning.vue +++ b/src/pages/materialsStation/teamWarning/teamWarning.vue @@ -97,8 +97,8 @@ const back = () => { // 获取班组 const getTeamList = async () => { try { - const idCard = uni.getStorageSync('idCard') || '' - const res = await getBmTeamList({ isAll: 0, idCard }) + const idCard = userInfo.value.userName || '' + const res = await getBmTeamList({ isAll: 0 }) if (res.data.length > 0) { teamList.value = res.data.map((item) => { return { diff --git a/src/pages/materialsStation/toolsLedger/toolsLedger.vue b/src/pages/materialsStation/toolsLedger/toolsLedger.vue index dbcabc8..d1b6745 100644 --- a/src/pages/materialsStation/toolsLedger/toolsLedger.vue +++ b/src/pages/materialsStation/toolsLedger/toolsLedger.vue @@ -131,8 +131,8 @@ onMounted(() => { // 获取班组 const getTeamList = async () => { try { - const idCard = uni.getStorageSync('idCard') || '' - const res = await getBmTeamList({ isAll: 0, idCard }) + const idCard = userInfo.value.userName || '' + const res = await getBmTeamList({ isAll: 0 }) if (res.data.length > 0) { teamList.value = res.data.map((item) => { return { diff --git a/src/services/materialsStation.js b/src/services/materialsStation.js index e0b925b..ec28dfc 100644 --- a/src/services/materialsStation.js +++ b/src/services/materialsStation.js @@ -49,7 +49,7 @@ export function getToolsLedgerDetailsListApi(data) { export const getBmTeamList = (data) => { return http({ method: 'GET', - url: '/material/bmTeam/list', + url: '/material/bmTeam/getListByIdCard', data, }) }