增加loading

src/pages.json

@@ -821,7 +821,12 @@
             }
         },
         // 项目部授权书
-        
+        {
+            "path": "pages/materialsStation/authorizeSignature/authorizeSignature",
+            "style": {
+                "navigationStyle": "custom"
+            }
+        },
         // 材料员确认
         {
             "path": "pages/materialsStation/materialClerkConfirms/materialClerkConfirms",

src/pages/back/index.vue

@@ -289,18 +289,25 @@ const onClick=(e,item,itemIndex)=> {
 
 //获取列表
 const getTableList = async (isTap = false) => {
-  console.log('queryParams.value查询参数', queryParams.value)
+  try {
-  const res  = await getBackList(queryParams.value)
+    uni.showLoading({ title: '加载中',mask: true })
-  console.log('res列表数据', res)
+    console.log('queryParams.value查询参数', queryParams.value)
-  total.value = res.data.total
+    const res  = await getBackList(queryParams.value)
-  if (isTap) {
+    console.log('res列表数据', res)
-    tableList.value = res.data.rows
+    total.value = res.data.total
-  } else {
+    if (isTap) {
-    if (res.data.rows.length == 0) {
+      tableList.value = res.data.rows
-      tableList.value = []
     } else {
-      tableList.value.push(...res.data.rows)
+      if (res.data.rows.length == 0) {
+        tableList.value = []
+      } else {
+        tableList.value.push(...res.data.rows)
+      }
     }
+  } catch (error) {
+    console.log('🚀 ~ getTableList ~ error:', error)
+  } finally {
+    uni.hideLoading()
   }
 }
 

src/pages/integratedQuery/derateRecord/index.vue

@@ -99,6 +99,7 @@ onMounted(() => {
 // 获取列表数据
 const getList = async () => {
     try {
+        uni.showLoading({ title: '加载中', mask: true })
         const params = {
             startDate: queryForm.dateRange[0],
             endDate: queryForm.dateRange[1],
@@ -111,6 +112,8 @@ const getList = async () => {
         listData.value = res.data
     } catch (error) {
         console.log('🚀 ~ getList ~ error', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/integratedQuery/directRotationRecord/index.vue

@@ -96,6 +96,7 @@ onMounted(() => {
 // 获取列表数据
 const getList = async () => {
     try {
+        uni.showLoading({ title: '加载中', mask: true })
         const params = {
             startTime: queryForm.dateRange[0],
             endTime: queryForm.dateRange[1],
@@ -108,6 +109,8 @@ const getList = async () => {
         listData.value = res.data
     } catch (error) {
         console.log('🚀 ~ getList ~ error', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/integratedQuery/inUseRecord/index.vue

@@ -123,6 +123,7 @@ const getTableList = () => {
         console.log('🚀 ~ formRef.value.validate ~ valid:', valid)
         if (!valid) {
             try {
+                uni.showLoading({ title: '加载中', mask: true })
                 const params = {
                     unitId: queryForm.unitId,
                     projectId: queryForm.proId,
@@ -137,6 +138,8 @@ const getTableList = () => {
             } catch (error) {
                 console.log(error)
                 tableList.value = []
+            } finally {
+                uni.hideLoading()
             }
         }
     })

src/pages/integratedQuery/receiveRecord/index.vue

@@ -95,6 +95,7 @@ onMounted(() => {
 // 获取列表数据
 const getList = async () => {
     try {
+        uni.showLoading({ title: '加载中', mask: true })
         const params = {
             startTime: queryForm.dateRange[0],
             endTime: queryForm.dateRange[1],
@@ -107,6 +108,8 @@ const getList = async () => {
         listData.value = res.data
     } catch (error) {
         console.log('🚀 ~ getList ~ error', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/integratedQuery/settleAccountsRecord/index.vue

@@ -78,6 +78,7 @@ onMounted(() => {
 // 获取列表数据
 const getList = async () => {
     try {
+        uni.showLoading({ title: '加载中', mask: true })
         const params = {
             startDate: queryForm.dateRange[0],
             endDate: queryForm.dateRange[1],
@@ -89,6 +90,8 @@ const getList = async () => {
         listData.value = res.data
     } catch (error) {
         console.log('🚀 ~ getList ~ error', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/materialsStation/authorizeSignature/authorizeSignature.vue

@@ -114,6 +114,7 @@ const getList = async () => {
   }
   console.log('🚀 ~ getList ~ params:', params)
   try {
+    uni.showLoading({ title: '加载中', mask: true })
     const res = await getAuthorListApi(params)
     console.log('🚀 ~ getList ~ res:', res)
     tableList.value = res.data.rows
@@ -122,6 +123,8 @@ const getList = async () => {
     console.log('🚀 ~ getList ~ error:', error)
     tableList.value = []
     total.value = 0
+  } finally {
+    uni.hideLoading()
   }
 }
 

src/pages/materialsStation/materialClerkConfirms/materialClerkConfirms.vue

@@ -103,11 +103,14 @@ const getList = async () => {
   queryParams.startTime = queryParams.range && queryParams.range[0]
   queryParams.endTime = queryParams.range && queryParams.range[1]
   try {
+    uni.showLoading({ title: '加载中', mask: true })
     const res = await getCompleteOutTaskListApi(queryParams)
     tableList.value = res.data.rows
     total.value = res.data.total
   } catch (error) {
     console.log('🚀 ~ getList ~ error:', error)
+  } finally {
+    uni.hideLoading()
   }
 }
 const handleDetails = (item) => {

src/pages/materialsStation/teamBackRecord/teamBackRecord.vue

@@ -105,6 +105,7 @@ const getList = async () => {
   }
   console.log('🚀 ~ getList ~ params:', params)
   try {
+    uni.showLoading({ title: '加载中', mask: true })
     const res = await getBackListAPI(params)
     console.log('🚀 ~ getList ~ res:', res)
     if (res.code == 200) {
@@ -115,6 +116,8 @@ const getList = async () => {
     console.log('🚀 ~ getList ~ error:', error)
     tableList.value = []
     total.value = 0
+  } finally {
+    uni.hideLoading()
   }
 }
 

src/pages/materialsStation/teamLeaseRecord/teamLeaseRecord.vue

@@ -105,6 +105,7 @@ const getList = async () => {
   }
   console.log('🚀 ~ getList ~ params:', params)
   try {
+    uni.showLoading({ title: '加载中', mask: true })
     const res = await getPickingOutboundListAPI(params)
     console.log('🚀 ~ getList ~ res:', res)
     if (res.code == 200) {
@@ -115,6 +116,8 @@ const getList = async () => {
     console.log('🚀 ~ getList ~ error:', error)
     tableList.value = []
     total.value = 0
+  } finally {
+    uni.hideLoading()
   }
 }
 

src/pages/materialsStation/teamWarning/teamWarning.vue

@@ -130,11 +130,14 @@ const getList = async () => {
     status: queryParams.status,
   }
   try {
+    uni.showLoading({ title: '加载中', mask: true })
     const res = await getTeamWarnDetailsListApi(params)
     console.log('🚀 ~ getList ~ res:', res)
     tableList.value = res.data
   } catch (error) {
     console.log('🚀 ~ getList ~ error:', error)
+  } finally {
+    uni.hideLoading()
   }
 }
 </script>

src/pages/materialsStation/toolsBack/toolsBack.vue

@@ -141,6 +141,7 @@ const getList = async () => {
   }
   console.log('🚀 ~ getList ~ params:', params)
   try {
+    uni.showLoading({ title: '加载中', mask: true })
     const res = await getBackListAPI(params)
     console.log('🚀 ~ getList ~ res:', res)
     if (res.code == 200) {
@@ -162,6 +163,8 @@ const getList = async () => {
     console.log('🚀 ~ getList ~ error:', error)
     tableList.value = []
     total.value = 0
+  } finally {
+    uni.hideLoading()
   }
 }
 

src/pages/materialsStation/toolsLease/toolsLease.vue

@@ -147,6 +147,7 @@ const getList = async () => {
   }
   console.log('🚀 ~ getList ~ params:', params)
   try {
+    uni.showLoading({ title: '加载中', mask: true })
     const res = await getPickingOutboundListAPI(params)
     console.log('🚀 ~ getList ~ res:', res)
     if (res.code == 200) {
@@ -177,6 +178,8 @@ const getList = async () => {
     console.log('🚀 ~ getList ~ error:', error)
     tableList.value = []
     total.value = 0
+  } finally {
+    uni.hideLoading()
   }
 }
 

src/pages/materialsStation/toolsLedger/toolsLedger.vue

@@ -201,6 +201,7 @@ const getList = async () => {
   }
   console.log('🚀 ~ getList ~ params:', params)
   try {
+    uni.showLoading({ title: '加载中', mask: true })
     let res = null
     if (isTeam.value) {
       res = await getTeamUseNumList(params)
@@ -241,6 +242,8 @@ const getList = async () => {
   } catch (error) {
     console.error('获取设备列表失败:', error)
     equipmentCategories.value = []
+  } finally {
+    uni.hideLoading()
   }
 }
 

src/pages/new-purchase/accept/index.vue

@@ -142,6 +142,10 @@ const queryParams = ref({
 // }
 const getTableList = async (isTap = false) => {
     try {
+        uni.showLoading({
+            title: '加载中...',
+            mask: true
+        })
         const { data: res } = await getPurchaseList(queryParams.value)
         total.value = res.total
 
@@ -158,6 +162,8 @@ const getTableList = async (isTap = false) => {
         console.error('获取列表数据失败:', error)
         if (isTap) tableList.value = []
         throw error // 抛出错误，让外层捕获
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/new-purchase/bind/index.vue

@@ -115,18 +115,28 @@ const onChangeDate = (val) => {
 
 // 获取列表数据
 const getTableList = async (isTap = false) => {
-    console.log('queryParams.value查询参数', queryParams.value)
+    try {
-    const { data: res } = await getPurchaseBindListAPI(queryParams.value)
+        uni.showLoading({
-    console.log('res列表数据', res)
+            title: '加载中...',
-    total.value = res.total
+            mask: true
-    if (isTap) {
+        })
-        tableList.value = res.rows
+        console.log('queryParams.value查询参数', queryParams.value)
-    } else {
+        const { data: res } = await getPurchaseBindListAPI(queryParams.value)
-        if (res.rows.length == 0) {
+        console.log('res列表数据', res)
-            tableList.value = []
+        total.value = res.total
+        if (isTap) {
+            tableList.value = res.rows
         } else {
-            tableList.value.push(...res.rows)
+            if (res.rows.length == 0) {
+                tableList.value = []
+            } else {
+                tableList.value.push(...res.rows)
+            }
         }
+    } catch (error) {
+        
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/new-purchase/entry/index.vue

@@ -261,6 +261,10 @@ const swipeOptions =  ref([
 // 获取列表数据
 const getTableList = async (isTap = false) => {
     try {
+        uni.showLoading({
+            title: '加载中...',
+            mask: true
+        })
 		console.log('queryParams.value查询参数', queryParams.value)
         const { data: res } = await getPurchaseList(queryParams.value)
         console.log('res列表数据', res)
@@ -287,6 +291,8 @@ const getTableList = async (isTap = false) => {
         if (isTap) {
             tableList.value = []
         }
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/picking/outbound/index.vue

@@ -176,24 +176,34 @@ const onChangeDate = (val) => {
 
 // 获取列表数据
 const getTableList = async (isTap = false, isSearch = false) => {
-    if (isSearch) {
+    try {
-        // 当进行搜索时，重置页码和列表数据
+        uni.showLoading({
-        queryParams.value.pageNum = 1
+            title: '加载中...',
-        tableList.value = []
+            mask: true,
-    }
+        })
-    console.log('queryParams.value查询参数', queryParams.value)
+        if (isSearch) {
-    const res = await getPickingOutboundListAPI(queryParams.value)
+            // 当进行搜索时，重置页码和列表数据
-    console.log('res列表数据', res)
+            queryParams.value.pageNum = 1
-    total.value = res.data.total
-    if (isTap) {
-        tableList.value = res.data.rows
-    } else {
-        if (res.data.rows.length == 0) {
             tableList.value = []
-        } else {
-            //  tableList.value = res.data.rows
-            tableList.value = [...tableList.value, ...res.data.rows]
         }
+        console.log('queryParams.value查询参数', queryParams.value)
+        const res = await getPickingOutboundListAPI(queryParams.value)
+        console.log('res列表数据', res)
+        total.value = res.data.total
+        if (isTap) {
+            tableList.value = res.data.rows
+        } else {
+            if (res.data.rows.length == 0) {
+                tableList.value = []
+            } else {
+                //  tableList.value = res.data.rows
+                tableList.value = [...tableList.value, ...res.data.rows]
+            }
+        }
+    } catch (error) {
+        console.log('🚀 ~ getTableList ~ error:', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/picking/outbound/sign.vue

@@ -234,29 +234,39 @@ const onChangeDate = (val) => {
 
 // 获取列表数据
 const getTableList = async (isTap = false, isSearch = false) => {
-    if (isSearch) {
+    try {
-        // 当进行搜索时，重置页码和列表数据
+        uni.showLoading({
-        queryParams.value.pageNum = 1
+            title: '加载中...',
-        tableList.value = []
+            mask: true
-    }
+        })
-    console.log('queryParams.value查询参数', queryParams.value)
+        if (isSearch) {
-    let res = null
+            // 当进行搜索时，重置页码和列表数据
-    if (opts.value) {
+            queryParams.value.pageNum = 1
-        res = await getNoSignListAPI(queryParams.value)
-    } else {
-        res = await getPickingOutboundListAPI(queryParams.value)
-    }
-    console.log('res列表数据', res)
-    total.value = res.data.total
-    if (isTap) {
-        tableList.value = res.data.rows
-    } else {
-        if (res.data.rows.length == 0) {
             tableList.value = []
-        } else {
-            //  tableList.value = res.data.rows
-            tableList.value = [...tableList.value, ...res.data.rows]
         }
+        console.log('queryParams.value查询参数', queryParams.value)
+        let res = null
+        if (opts.value) {
+            res = await getNoSignListAPI(queryParams.value)
+        } else {
+            res = await getPickingOutboundListAPI(queryParams.value)
+        }
+        console.log('res列表数据', res)
+        total.value = res.data.total
+        if (isTap) {
+            tableList.value = res.data.rows
+        } else {
+            if (res.data.rows.length == 0) {
+                tableList.value = []
+            } else {
+                //  tableList.value = res.data.rows
+                tableList.value = [...tableList.value, ...res.data.rows]
+            }
+        }
+    } catch (error) {
+        console.log('🚀 ~ getTableList ~ error:', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/picking/review/index.vue

@@ -224,24 +224,34 @@ const onChangeDate = (val) => {
 
 // 获取列表数据
 const getTableList = async (isTap = false,isSearch = false) => {
-    if (isSearch) {
+    try {
-        // 当进行搜索时，重置页码和列表数据
+        uni.showLoading({
-        queryParams.value.pageNum = 1;
+            title: '加载中...',
-        tableList.value = [];
+            mask: true
-    }
+        })
-    console.log('queryParams.value查询参数', queryParams.value)
+        if (isSearch) {
-    const res = await getPickingReviewListAPI(queryParams.value)
+            // 当进行搜索时，重置页码和列表数据
-    console.log('res列表数据', res)
+            queryParams.value.pageNum = 1;
-    total.value = res.data.total
+            tableList.value = [];
-    if (isTap) {
-        tableList.value = res.data.rows
-    } else {
-        if (res.data.rows.length == 0) {
-            tableList.value = []
-        } else {
-            //  tableList.value = res.data.rows
-            tableList.value = [...tableList.value, ...res.data.rows]
         }
+        console.log('queryParams.value查询参数', queryParams.value)
+        const res = await getPickingReviewListAPI(queryParams.value)
+        console.log('res列表数据', res)
+        total.value = res.data.total
+        if (isTap) {
+            tableList.value = res.data.rows
+        } else {
+            if (res.data.rows.length == 0) {
+                tableList.value = []
+            } else {
+                //  tableList.value = res.data.rows
+                tableList.value = [...tableList.value, ...res.data.rows]
+            }
+        }
+    } catch (error) {
+        console.log('🚀 ~ getTableList ~ error:', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/repair/equipAssessment/index.vue

@@ -194,17 +194,27 @@ const onSearchBtn = () => {
 
 // 获取列表数据
 const getTableList = async (isTap = false) => {
-    console.log('queryParams.value查询参数', queryParams.value)
+    try {
-    const res = await getLossAssessmentListAPI(queryParams.value)
+        uni.showLoading({
-    total.value = res.data.total
+            title: '加载中',
-    if (isTap) {
+            mask: true
-        tableList.value = res.data.rows
+        })
-    } else {
+        console.log('queryParams.value查询参数', queryParams.value)
-        if (res.data.rows.length == 0) {
+        const res = await getLossAssessmentListAPI(queryParams.value)
-            tableList.value = []
+        total.value = res.data.total
+        if (isTap) {
+            tableList.value = res.data.rows
         } else {
-            tableList.value.push(...res.data.rows)
+            if (res.data.rows.length == 0) {
+                tableList.value = []
+            } else {
+                tableList.value.push(...res.data.rows)
+            }
         }
+    } catch (error) {
+        console.log('🚀 ~ getTableList ~ error:', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/repair/fieldMaintenance/index.vue

@@ -208,12 +208,22 @@
 	}
 
 	const getTableList = async (isTap = false) => {
-		const res = await getList(queryParams.value)
+		try {
-		total.value = res.data.total
+			uni.showLoading({
-		if (isTap) {
+				title: '加载中...',
-			tableList.value = res.data.rows
+				mask: true
-		} else {
+			})
-			tableList.value.push(...res.data.rows)
+			const res = await getList(queryParams.value)
+			total.value = res.data.total
+			if (isTap) {
+				tableList.value = res.data.rows
+			} else {
+				tableList.value.push(...res.data.rows)
+			}
+		} catch (error) {
+			console.log('🚀 ~ getTableList ~ error:', error)
+		} finally {
+			uni.hideLoading()
 		}
 	}
 

src/pages/repair/repairManage/index.vue

@@ -192,17 +192,27 @@ const onSearchBtn = () => {
 
 // 获取列表数据
 const getTableList = async (isTap = false) => {
-    console.log('queryParams.value查询参数', queryParams.value)
+    try {
-    const res = await getRepairListAPI(queryParams.value)
+        uni.showLoading({
-    total.value = res.data.total
+            title: '加载中',
-    if (isTap) {
+            mask: true
-        tableList.value = res.data.rows
+        })
-    } else {
+        console.log('queryParams.value查询参数', queryParams.value)
-        if (res.data.rows.length == 0) {
+        const res = await getRepairListAPI(queryParams.value)
-            tableList.value = []
+        total.value = res.data.total
-        } else {
+        if (isTap) {
             tableList.value = res.data.rows
+        } else {
+            if (res.data.rows.length == 0) {
+                tableList.value = []
+            } else {
+                tableList.value = res.data.rows
+            }
         }
+    } catch (error) {
+        console.log('🚀 ~ getTableList ~ error:', error)   
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/repair/testExamine/index.vue

@@ -335,6 +335,10 @@ const getTableList = async (isTap = false) => {
         ? tableList.value.filter(item => item && item.checked).map(item => item.taskId)
         : []
     try {
+        uni.showLoading({
+            title: '加载中...',
+            mask: true
+        })
         const res = await getListTestExamineApply(queryParams.value)
         total.value = res?.data?.total || 0
         tableList.value = Array.isArray(res?.data?.rows) ? res.data.rows : []
@@ -348,6 +352,8 @@ const getTableList = async (isTap = false) => {
         console.error('获取列表数据失败:', error)
         total.value = 0
         tableList.value = []
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/repair/testedInBound/index.vue

@@ -217,16 +217,26 @@ const onSearchBtn = () => {
 // 获取列表数据
 const getTableList = async (isTap = false) => {
     // console.log('queryParams.value查询参数', queryParams.value)
-    const res = await getRepairedList(queryParams.value)
+    try {
-    total.value = res.data.total
+        uni.showLoading({
-    if (isTap) {
+            title: '加载中...',
-        tableList.value = res.data.rows
+            mask: true
-    } else {
+        })
-        if (res.data.rows.length == 0) {
+        const res = await getRepairedList(queryParams.value)
-            tableList.value = []
+        total.value = res.data.total
+        if (isTap) {
+            tableList.value = res.data.rows
         } else {
-            tableList.value.push(...res.data.rows)
+            if (res.data.rows.length == 0) {
+                tableList.value = []
+            } else {
+                tableList.value.push(...res.data.rows)
+            }
         }
+    } catch (error) {
+        console.log('🚀 ~ getTableList ~ error:', error)
+    } finally {
+        uni.hideLoading()
     }
 }
 

src/pages/stquery/deviceStatusRecord/index.vue

@@ -191,19 +191,26 @@ const onScrollTolower = debounce(() => {
 }, 500)
 // 获取列表数据
 const getTableList = async (isTap = false) => {
-  const res = await getRetainedEquipmentListApi(queryParams.value);
+    try {
-  const newRows = res?.data?.rows || [];
+        uni.showLoading({ title: '加载中', mask: true })
-  total.value = res?.data?.total || 0;
+        const res = await getRetainedEquipmentListApi(queryParams.value);
-
+        const newRows = res?.data?.rows || [];
-  if (isTap || queryParams.pageNum === 1) {
+        total.value = res?.data?.total || 0;
-    // 刷新或tab切换，直接替换
+      
-    tableList.value = newRows;
+        if (isTap || queryParams.pageNum === 1) {
-  } else {
+          // 刷新或tab切换，直接替换
-    // 加载更多，按 typeId 去重后合并
+          tableList.value = newRows;
-    const existingIds = new Set(tableList.value.map(item => item.typeId));
+        } else {
-    const filteredRows = newRows.filter(item => !existingIds.has(item.typeId));
+          // 加载更多，按 typeId 去重后合并
-    tableList.value.push(...filteredRows);
+          const existingIds = new Set(tableList.value.map(item => item.typeId));
-  }
+          const filteredRows = newRows.filter(item => !existingIds.has(item.typeId));
+          tableList.value.push(...filteredRows);
+        }
+    } catch (error) {
+        console.log('🚀 ~ getTableList ~ error:', error)
+    } finally {
+        uni.hideLoading()
+    }
 };
 
 const getRetainedEquipmentList = async () => {