Explorar el Código

去除检验数量箱数,待验货物下拉

panxingxin hace 5 años
padre
commit
34ea0bf9b9

+ 4 - 0
src/app/store-pending/store-pending.page.html

@@ -58,4 +58,8 @@
       </div>
     </ion-card-content>
   </ion-card>
+  <ion-infinite-scroll #IonInfiniteScroll threshold="100px" (ionInfinite)="loadData($event)">
+    <ion-infinite-scroll-content loadingSpinner="bubbles" loadingText="加载...">
+    </ion-infinite-scroll-content>
+  </ion-infinite-scroll>
 </ion-content>

+ 15 - 5
src/app/store-pending/store-pending.page.ts

@@ -13,8 +13,9 @@ export class StorePendingPage implements OnInit {
 
   pendingList = [1]
   current: number = 1
-  size: number = 10
+  size: number = 2
   form = {}
+  total: number = 0
   storeQCDetailList = []
 
   constructor(public userData: UserData,
@@ -33,9 +34,9 @@ export class StorePendingPage implements OnInit {
     })
   }
 
-  ionViewDidEnter() {
-    this.getList();
-  }
+  // ionViewDidEnter() {
+  //   this.getList();
+  // }
 
   showFullScreenImage(data) {
     this.commonService.fullScreenImg(data);
@@ -45,7 +46,8 @@ export class StorePendingPage implements OnInit {
     this.form['current'] = this.current
     this.form['size'] = this.size
     let data = await this.userData.getStorePendingList(this.form)
-    this.pendingList = data
+    this.pendingList = data.records
+    this.total = data.total
     for (let i of this.pendingList) {
       if (i["pictures"] && i["pictures"].length !== 0) {
         i["imgsrc"] = i["pictures"][0].smallPicture
@@ -70,4 +72,12 @@ export class StorePendingPage implements OnInit {
     await this.userData.rejectWarehouse(pending.sscId,pending.pid)
     this.getList()
   }
+  async loadData(event) {
+    this.size += 10
+    this.getList()
+    event.target.complete();
+    if (this.total < this.size) {
+      event.target.disabled = true;
+    }
+  }
 }

+ 2 - 2
src/app/warehouse-manage-pending/warehouse-manage-pending.page.html

@@ -39,7 +39,7 @@
         <ion-label>PO号:</ion-label>
         <ion-input [(ngModel)]='warehouseManage.scpPoCode' readonly></ion-input>
       </ion-item>
-      <ion-item>
+      <!-- <ion-item>
         <ion-icon name="square"></ion-icon>
         <ion-label>检验数量: </ion-label>
         <ion-input [(ngModel)]="warehouseManage.checkcount" readonly></ion-input>
@@ -48,7 +48,7 @@
         <ion-icon name="cube"></ion-icon>
         <ion-label>检验箱数: </ion-label>
         <ion-input [(ngModel)]="warehouseManage.checkboxcount" readonly></ion-input>
-      </ion-item>
+      </ion-item> -->
 
       <ion-item>
         <ion-icon name="pin"></ion-icon>

+ 1 - 1
src/providers/user-data.ts

@@ -345,7 +345,7 @@ export class UserData {
       }
       back_url = back_url.substring(1, back_url.length)
       this.api.request('get', `${environment.APP_SERVE_URL}/inventory/qc/mobile/Pending?${back_url}`, {}, {}).then((data) => {
-        resolve(data['data'].records)
+        resolve(data['data'])
       }).catch(e => { console.log(e) })
     });
   }