提交

src/views/WDLY/purchaseManage/alreadyPurchase/index.vue

@@ -1091,22 +1091,33 @@ const deliverData = ref([]);
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
+
+  let pageByWdlyFlag = false
+  let getPageStatistics = false
+
   proxy
     .post("/purchase/pageByWdly", sourceList.value.pagination)
     .then((message) => {
+      pageByWdlyFlag = true
+
       sourceList.value.data = message.rows.map((x) => ({
         ...x,
         ...JSON.parse(x.victoriatouristJson),
       }));
       sourceList.value.pagination.total = message.total;
-      setTimeout(() => {
+      if(pageByWdlyFlag && getPageStatistics){
         loading.value = false;
-      }, 200);
+      }
     });
+
   proxy
     .post("/purchase/getPageStatistics", sourceList.value.pagination)
     .then((res) => {
+      getPageStatistics = true
       headerData.value = res;
+      if(pageByWdlyFlag && getPageStatistics){
+        loading.value = false;
+      }
     });
 };