diff --git a/src/pages/materialsStation/teamWarning/teamWarning.vue b/src/pages/materialsStation/teamWarning/teamWarning.vue index 7594c02..833f9d2 100644 --- a/src/pages/materialsStation/teamWarning/teamWarning.vue +++ b/src/pages/materialsStation/teamWarning/teamWarning.vue @@ -107,11 +107,15 @@ const getTeamList = async () => { text: item.teamName, } }) + teamList.value.unshift({ + value: '', + text: '全部', + }) if (res.data.some((item) => item.teamLeaderIdCard == userInfo.value.userName)) { const team = res.data.find((item) => item.teamLeaderIdCard == userInfo.value.userName) queryParams.teamId = team.id } else { - queryParams.teamId = res.data[0].id + // queryParams.teamId = res.data[0].id } } getList() diff --git a/src/pages/materialsStation/toolsLedger/toolsLedger.vue b/src/pages/materialsStation/toolsLedger/toolsLedger.vue index 3dea6d2..dbcabc8 100644 --- a/src/pages/materialsStation/toolsLedger/toolsLedger.vue +++ b/src/pages/materialsStation/toolsLedger/toolsLedger.vue @@ -251,7 +251,7 @@ const showDetail = (categoryName, spec) => { if (spec.manageType === '编码' && !isNaN(qty) && qty > 0) { uni.navigateTo({ - url: '/pages/toolsLedger/toolsLedgerDetails?typeId=' + spec.typeId, + url: '/pages/materialsStation/toolsLedger/toolsLedgerDetails?typeId=' + spec.typeId, }) } else { uni.showModal({ diff --git a/src/pages/materialsStation/toolsLedger/toolsLedgerDetails.vue b/src/pages/materialsStation/toolsLedger/toolsLedgerDetails.vue index 9f8b4ac..798177a 100644 --- a/src/pages/materialsStation/toolsLedger/toolsLedgerDetails.vue +++ b/src/pages/materialsStation/toolsLedger/toolsLedgerDetails.vue @@ -61,7 +61,7 @@