Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

yanjinhui

6 天以前 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17

 н¨Îļþ¼Ð/PDA/pages/stash/inboundorderDetail.vue

@@ -7,8 +7,8 @@
      </u-sticky> -->
      <uni-list :border="true">
         <uni-list-item direction="column" clickable @click="groupClick(item.batch_num)" link
            :to="page+item.batch_num+'&order_qty='+item.order_qty+'&order_Inqty='+item.order_Inqty+'&goods_no='+item.goods_no"
            v-for="item in allReceivingOrders" :key="item.batch_num">
            :to="page+item.batch_num+'&order_qty='+item.order_qty+'&order_Inqty='+item.order_Inqty+'&goods_no='+item.goods_no+'&id='+item.id"
            v-for="item in allReceivingOrders" :key="item.id">
            <template v-slot:body>
               <uni-group margin-top="20">
                  <view> å•æ®ç¼–号:{{orderNo}} </view>
@@ -33,6 +33,7 @@
         return {
            page: "/pages/stash/raworderboxing?",
            loadVisible: false,
            isIn:false,
            searchValue: "",
            status: "more",
            allReceivingOrders: [],
@@ -48,6 +49,15 @@
         this.allReceivingOrders=res.detail;
         this.page = this.page + "orderNo=" + this.orderNo +"&warehouseId=" + this.warehouseId + "&batchNo=";
         this.getData();
      },
      onShow() {
         this.isIn = uni.getStorageSync('isIn');
         if (this.isIn) {
            uni.removeStorageSync('isIn');
            this.pageNo = 1;
            // ä»Žå…¶ä»–页面返回时刷新
            this.getData();
         }
      },
      onReachBottom() {
         this.pageNo += 1;
@@ -97,6 +107,26 @@
                        this.status = 'noMore';
                        //this.allReceivingOrders = [];
                        this.loadVisible = true;
                        if (this.allReceivingOrders.length < 1) {
                           // uni.showModal({
                           //    title: '提示',
                           //    content: '入库已完成，是否返回入库单？',
                           //    success: (res) => {
                           //       if (res.confirm) {
                                    uni.setStorageSync('isLoaded', true);
                           //          // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                    setTimeout(() => {
                                       uni.navigateBack({
                                          delta:1
                                       });
                                    }, 500);
                           //       } else {
                           //          // ç”¨æˆ·ç‚¹å‡»å–消，可以停留在当前页面
                           //          // æˆ–者执行其他操作
                           //       }
                           //    }
                           // });
                        }
                     }
                  }
               })