优化

src/pages/index/index.vue

@@ -42,7 +42,7 @@
 
 <script setup>
 import { ref, reactive, getCurrentInstance, onMounted } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 import {
   getProjectInfoApi,
   getUserInfoByUserNameApi,
@@ -50,6 +50,9 @@ import {
   updateTeamProjectApi,
   getToolsLedgerDetailsListApi,
 } from '@/services/index'
+import { useMemberStore } from '@/stores'
+const memberStore = useMemberStore()
+const userInfo = ref(memberStore.userInfo || {})
 
 const todayDatas = reactive({
   normalNum: '', // 正常
@@ -113,7 +116,7 @@ const getUserInfoByIdCard = async () => {
 
 const getUserInfoByUserName = async () => {
   try {
-    const userName = uni.getStorageSync('username')
+    const userName = userInfo.value.userName
     console.log('🚀 ~ getUserInfoByUserName ~ userName:', userName)
     const res = await getUserInfoByUserNameApi({ userName })
     idCard.value = res.data.idCard
@@ -149,7 +152,7 @@ const getToolsLedgerDetailsList = async () => {
 }
 
 // 页面显示时获取数据
-onLoad(async () => {
+onShow(async () => {
   getToolsLedgerDetailsList()
   await Promise.all([getUserInfoByUserName(), projectInfoList()])
   getUserInfoByIdCard()

src/pages/teamBackRecord/teamBackRecord.vue

@@ -70,6 +70,9 @@
 import { onLoad, onShow } from '@dcloudio/uni-app'
 import { ref, reactive, computed } from 'vue'
 import { getBackListAPI } from '@/services/picking/outbound.js'
+import { useMemberStore } from '@/stores'
+const memberStore = useMemberStore()
+const userInfo = ref(memberStore.userInfo || {})
 
 const queryParams = reactive({
   pageNum: 1,
@@ -98,6 +101,7 @@ const getList = async () => {
     endTime: queryParams.range && queryParams.range[1],
     keyWord: queryParams.keyWord,
     appTaskStatus: 1,
+    idCard: userInfo.value.userName || '',
   }
   console.log('🚀 ~ getList ~ params:', params)
   try {

src/pages/teamLeaseRecord/teamLeaseRecord.vue

@@ -70,6 +70,9 @@
 import { onLoad, onShow } from '@dcloudio/uni-app'
 import { ref, reactive, computed } from 'vue'
 import { getPickingOutboundListAPI } from '@/services/picking/outbound.js'
+import { useMemberStore } from '@/stores'
+const memberStore = useMemberStore()
+const userInfo = ref(memberStore.userInfo || {})
 
 const queryParams = reactive({
   pageNum: 1,
@@ -98,6 +101,7 @@ const getList = async () => {
     endTime: queryParams.range && queryParams.range[1],
     keyWord: queryParams.keyWord,
     statusList: [4],
+    idCard: userInfo.value.userName || '',
   }
   console.log('🚀 ~ getList ~ params:', params)
   try {

src/pages/teamWarning/teamWarning.vue

@@ -57,6 +57,9 @@ import { onLoad } from '@dcloudio/uni-app'
 import { ref, reactive, computed } from 'vue'
 import { getBmTeamList } from '@/services/back.js'
 import { getTeamWarnDetailsListApi } from '@/services/index.js'
+import { useMemberStore } from '@/stores'
+const memberStore = useMemberStore()
+const userInfo = ref(memberStore.userInfo || {})
 
 const queryParams = reactive({
   teamId: '',
@@ -104,7 +107,12 @@ const getTeamList = async () => {
           text: item.teamName,
         }
       })
-      queryParams.teamId = res.data[0].id
+      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
+      }
     }
     getList()
   } catch (error) {

src/pages/toolsBack/toolsAddBack.vue

@@ -345,6 +345,7 @@ const changeTeamd = (e) => {
   formData.projectId = null
   formData.teamName = team ? team.teamName : ''
   formData.backPerson  = team ? team.relName : ''
+  formData.phone = team ? team.relPhone : ''
   formData.teamId = e
   getProjectListApi()
 }

src/pages/toolsLease/toolsLeaseAdd.vue

@@ -262,16 +262,16 @@ const getTeamList = async () => {
       // 如果 teamRange.value 列表中的 idCard 有与userInfo.userName  一致的，则设置 teamId
       console.log('🚀 ~ getTeamList ~ userInfo.value.userName:', userInfo.value.userName)
       if (teamRange.value.some((item) => item.teamLeaderIdCard == userInfo.value.userName)) {
-        const team = res.data.find((item) => item.teamLeaderIdCard === userInfo.value.userName)
+        const team = res.data.find((item) => item.teamLeaderIdCard == userInfo.value.userName)
         formData.teamId = team.id
         formData.teamName = team.teamName
         formData.leasePerson = team.relName
-        formData.phone = team.phone || ''
+        formData.phone = team.relPhone || ''
       } else {
         formData.teamId = res.data[0].id
         formData.teamName = res.data[0].teamName
         formData.leasePerson = res.data[0].relName
-        formData.phone = res.data[0].phone || ''
+        formData.phone = res.data[0].relPhone || ''
       }
       getProjectListApi()
     }
@@ -393,6 +393,7 @@ const changeTeamd = (e) => {
   formData.projectId = null
   formData.teamName = team ? team.teamName : ''
   formData.leasePerson = team ? team.relName : ''
+  formData.phone = team ? team.relPhone : ''
 
   equipmentList.value = []
   getProjectListApi()

src/pages/toolsLedger/toolsLedger.vue

@@ -81,6 +81,9 @@ import { onLoad } from '@dcloudio/uni-app';
 import { onMounted, ref, reactive, computed } from 'vue'
 import { getToolsLedgerList, getTeamUseNumList } from "../../services/ledger";
 import { getBmTeamList } from '@/services/back.js'
+import { useMemberStore } from '@/stores'
+const memberStore = useMemberStore()
+const userInfo = ref(memberStore.userInfo || {})
 
 const searchText = ref('')
 const isTeam = ref(false)
@@ -124,8 +127,12 @@ const getTeamList = async () => {
           text: item.teamName,
         }
       })
-      queryParams.teamId = res.data[0].id
+      if (res.data.some((item) => item.teamLeaderIdCard == userInfo.value.userName)) {
-      // queryParams.teamName = res.data[0].teamName
+        const team = res.data.find((item) => item.teamLeaderIdCard == userInfo.value.userName)
+        queryParams.teamId = team.id
+      } else {
+        queryParams.teamId = res.data[0].id
+      }
     }
     getList()
   } catch (error) {