н¨Îļþ¼Ð/PDA/pages/stash/CheckoutorderDetail.vue
@@ -11,10 +11,22 @@
            v-for="item in allReceivingOrders" :key="item.locationCode">
            <template v-slot:body>
               <uni-group margin-top="20">
                  <view> å•据编号:{{orderNo}} </view>
                  <!-- <view> å•据编号:{{orderNo}} </view>
                  <view> æ‰¹å·:{{item.batchNo}} </view>
                  <view> ç‰©æ–™ç¼–号:{{item.materielCode}} </view>
                  <view> ç‰©æ–™ç¼–号:{{item.materielCode}} </view> -->
                  <!-- <view> ç‰©æ–™åç§°:{{item.materielName}} </view> -->
                  <!-- <view> è´§ä½ç¼–号:{{item.locationCode}} </view>
                  <view> è´¦é¢æ•°é‡:{{item.stockQuantity}} </view> -->
                     <view> ç‰©æ–™åç§°:{{item.materielName}} </view>
                  <view> å“å/通用名:{{item.item || ''}} </view>
                  <view> ç‰©æ–™ç¼–号:{{item.materielCode}} </view>
                  <view> ç‰©æ–™è§„æ ¼:{{item.materielSpec}} </view>
                  <view> ç”Ÿäº§åނ家:{{item.factory || ''}} </view>
                  <view> åŸºæœ¬å•位:{{item.materielUnit}} </view>
                  <view> æ•ˆæœŸ:{{item.modifier || ''}} </view>
                  <view> æ‰¹å·:{{item.batchNo}} </view>
                  <view> å•据编号:{{orderNo}} </view>
                  <view> è´§ä½ç¼–号:{{item.locationCode}} </view>
                  <view> è´¦é¢æ•°é‡:{{item.stockQuantity}} </view>
               </uni-group>
@@ -40,24 +52,63 @@
            orderNo: "",
            pageNo: 1,
            scrollTop: 0,
            warehouseId: ""
            checkTask: false,
            warehouseId: "",
            hasDataLoaded: false, // æ•°æ®æ˜¯å¦å·²åŠ è½½è¿‡
               shouldRefreshFromC: false,  // ä»ŽC页面返回时需要刷新的标志
         }
      },
        // æ·»åŠ è¿™ä¸ªç”Ÿå‘½å‘¨æœŸ
  onHide() {
    // é¡µé¢éšè—æ—¶ä¸åšä»»ä½•操作
  },
      onLoad(res) {
         this.warehouseId = res.warehouseId;
         this.orderNo = res.orderNo;
         this.allReceivingOrders=res.detail;
         this.page = this.page + "orderNo=" + this.orderNo +"&warehouseId=" + this.warehouseId + "&locationCode=";
         this.getData();
         if(res.detail&&res.detail.length>0){
            this.allReceivingOrders = res.detail;
         }
         this.page = this.page + "orderNo=" + this.orderNo + "&warehouseId=" + this.warehouseId + "&locationCode=";
         // this.getData();
      },
      onReachBottom() {
         this.pageNo += 1;
         // åªæœ‰åœ¨è¿˜æœ‰æ›´å¤šæ•°æ®æ—¶æ‰åŠ è½½ä¸‹ä¸€é¡µ
  if (this.status === 'more') {
    this.pageNo += 1;
    this.getData();
  }
      },
      onShow() {
      // æ£€æŸ¥æ˜¯å¦éœ€è¦åˆ·æ–°
      const needRefresh = uni.getStorageSync('needRefreshCheck');
      if (needRefresh) {
         uni.removeStorageSync('needRefreshCheck');
         this.pageNo = 1;
         this.allReceivingOrders = [];
         this.getData();
         return;
      }
      // å¦‚果还没有加载过数据,加载数据
      if (!this.hasDataLoaded) {
         this.pageNo = 1;
         this.allReceivingOrders = [];
         this.getData();
         this.hasDataLoaded = true;
      }
      },
      onPageScroll(e) {
         this.scrollTop = e.scrollTop;
      },
      methods: {
         // // æ·»åŠ åˆ·æ–°æ–¹æ³•ä¾›å…¶ä»–é¡µé¢è°ƒç”¨
         // refreshData() {
         //    console.log('收到盘点刷新请求');
         //    this.pageNo = 1;
         //    this.allReceivingOrders = [];
         //    this.getData();
         // },
         search(res) {
            this.pageNo = 1;
            this.getData();
@@ -65,45 +116,64 @@
         groupClick() {
         },
         getData() {
            var postData = {
               MainData: {
                  warehouseId: this.warehouseId,
                  locationCode: this.searchValue,
                  orderNo: this.orderNo,
                  pageNo: this.pageNo,
                  isCheck:true,
               },
      getData() {
      var postData = {
         MainData: {
         warehouseId: this.warehouseId,
         locationCode: this.searchValue,
         orderNo: this.orderNo,
         pageNo: this.pageNo,
         isCheck: true,
         },
      }
      // å¦‚果是第一页或搜索,清空数据
      if (this.pageNo === 1 || this.searchValue !== '') {
         this.allReceivingOrders = [];
         this.status = "more";
      }
      this.$u.post('/api/DeliveryOrder/CheckOutTasks', postData).then((res) => {
         if (res.status) {
         if (res.data && res.data.length > 0) {
            // è¿½åŠ æ•°æ®è€Œä¸æ˜¯æ›¿æ¢
            this.allReceivingOrders = [...this.allReceivingOrders, ...res.data];
            // å¦‚果返回的数据少于5条,说明没有更多数据了
            if (res.data.length < 5) {
            this.status = 'noMore';
            } else {
            this.status = 'more';
            }
            if (this.pageNo == 1) this.allReceivingOrders = [];
            this.$u.post('/api/DeliveryOrder/GetCheckOutTasks',postData).then((
               res) => {
                  if (res.status) {
                     if (res.data.length > 0) {
                        if (this.searchValue == '') {
                           this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
                           // this.allReceivingOrders = res.data;
                           if (this.allReceivingOrders.length > 3) {
                              this.loadVisible = true;
                           } else {
                              this.loadVisible = false;
                           }
                        } else {
                           this.allReceivingOrders = res.data;
                           if (this.allReceivingOrders.length > 3) {
                              this.loadVisible = true;
                           } else {
                              this.loadVisible = false;
                           }
                        }
                     } else {
                        this.status = 'noMore';
                        //this.allReceivingOrders = [];
                        this.loadVisible = true;
                     }
                  }
               })
            // æŽ§åˆ¶åŠ è½½æç¤ºæ˜¾ç¤º
            this.loadVisible = this.allReceivingOrders.length > 0;
         } else {
            // æ²¡æœ‰æ•°æ®
            this.status = 'noMore';
            this.loadVisible = this.allReceivingOrders.length > 0;
            // å¦‚果是第一页且没有数据,显示空状态
            if (this.pageNo === 1) {
            this.allReceivingOrders = [];
            }
            // ç›´æŽ¥è¿”回A页面,不需要提示
            if (this.allReceivingOrders.length === 0 && this.pageNo === 1) {
            setTimeout(() => {
               uni.navigateBack({
               delta: 1  // è¿”回A页面
               });
            }, 300);
            }
         }
         }
      }).catch(err => {
         console.error('请求失败:', err);
         this.status = 'noMore';
      })
      }
      }
   }
</script>