新增待验货物跳转，备货完成，待验货物下拉刷新

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.starter" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>SG扫描</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>

src/app/store-pending/store-pending.page.html

@@ -8,11 +8,16 @@
 </ion-header>
 
 <ion-content>
+  <ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content pullingIcon="arrow-dropdown" pullingText="加载中..." refreshingSpinner="circles"
+      refreshingText="刷新...">
+    </ion-refresher-content>
+  </ion-refresher>
   <ion-card *ngFor="let pending of pendingList" (click)="getStoreQCDetail(pending)">
     <ion-card-content class="pending-content">
       <ion-item lines="none" *ngIf="pending.imgsrc" (click)="showFullScreenImage(pending.imgsrc)">
         <span>产品图片:</span>
-        <img slot="end" [src]="pending.imgsrc" class="title-image"/>
+        <img slot="end" [src]="pending.imgsrc" class="title-image" />
       </ion-item>
       <ion-item>
         <span>入库单号：{{pending.rkCode}}</span>
@@ -28,4 +33,4 @@
       </ion-item>
     </ion-card-content>
   </ion-card>
-</ion-content>
+</ion-content>

src/app/store-pending/store-pending.page.ts

@@ -1,8 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { UserData } from '../../providers/user-data';
 import { commonService } from '../../providers/common.service';
-import { Keyboard } from '@ionic-native/keyboard/ngx';
-import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
+import { Router } from '@angular/router';
+import { Storage } from '@ionic/storage'
+
 @Component({
   selector: 'app-store-pending',
   templateUrl: './store-pending.page.html',
@@ -16,8 +17,10 @@ export class StorePendingPage implements OnInit {
   storeQCDetailList = []
 
   constructor(public userData: UserData,
-              public commonService: commonService,
-            ) { }
+    private storage: Storage,
+    private router: Router,
+    public commonService: commonService,
+  ) { }
 
   ngOnInit() {
   }
@@ -33,40 +36,45 @@ export class StorePendingPage implements OnInit {
   async getList() {
     let data = await this.userData.getStorePendingList(this.current, this.size)
     this.pendingList = data
-    for(let i of this.pendingList) {
-      if(i["pictures"] && i["pictures"].length!==0) {
+    for (let i of this.pendingList) {
+      if (i["pictures"] && i["pictures"].length !== 0) {
         i["imgsrc"] = i["pictures"][0].smallPicture
       }
     }
   }
 
+  doRefresh(event) {
+    this.getList()
+    event.target.complete();    //告诉ion-refresher  更新数据
+  }
+
   // 获取扫描详情
   async getStoreQCDetail(pending) {
+    this.storage.set('store-pending', pending).then(() => {
+      this.router.navigateByUrl('/store-qc-scanning')
+    })
+    // let data = await this.userData.getQCDetail(pending.sscId, pending.pId)
 
-          let data = await this.userData.getQCDetail(pending.sscId, pending.pId)
+    // this.storeQCDetailList = new Array(data)
 
-          this.storeQCDetailList = new Array(data)
-
-        for (let i of this.storeQCDetailList) {
-          // 获取QA日志
-          let qalogdata = await this.userData.getQAlog(i.sscId, i.pid)
-          if (JSON.parse(qalogdata).data.length !== 0) {
-            i.qalog = JSON.parse(qalogdata).data[0].mark
-            i.qaimgUrl = JSON.parse(qalogdata).data[0].picture.split(",")[0]
-          }
-          let qclogdata = await this.userData.getQClog(i.sscId, i.pid)
-          if (JSON.parse(qclogdata).data.length !== 0) {
-            i.qclog = JSON.parse(qclogdata).data[0].mark
-            i.qcimgUrl = JSON.parse(qclogdata).data[0].picture.split(",")[0]
-          }
-          // 处理意见转换boolean
-          if (i.dealpropose == 1) {
-            i.deal = true
-          } else {
-            i.deal = false
-          }
-        }
-      }
-    }
+    // for (let i of this.storeQCDetailList) {
+    //   // 获取QA日志
+    //   let qalogdata = await this.userData.getQAlog(i.sscId, i.pid)
+    //   if (JSON.parse(qalogdata).data.length !== 0) {
+    //     i.qalog = JSON.parse(qalogdata).data[0].mark
+    //     i.qaimgUrl = JSON.parse(qalogdata).data[0].picture.split(",")[0]
+    //   }
+    //   let qclogdata = await this.userData.getQClog(i.sscId, i.pid)
+    //   if (JSON.parse(qclogdata).data.length !== 0) {
+    //     i.qclog = JSON.parse(qclogdata).data[0].mark
+    //     i.qcimgUrl = JSON.parse(qclogdata).data[0].picture.split(",")[0]
+    //   }
+    //   // 处理意见转换boolean
+    //   if (i.dealpropose == 1) {
+    //     i.deal = true
+    //   } else {
+    //     i.deal = false
+    //   }
+    // }
   }
 }

src/app/store-qc-scanning/store-qc-scanning.page.ts

@@ -36,8 +36,14 @@ export class StoreQCScanningPage implements OnInit {
     this.storeQCDetailList = []
     this.scanCode = ''
     this.scanInput.setFocus();
+    this.storage.get('store-pending').then(async (val) => {
+      if(val) {
+        this.scanCode = val.sscId + '_' +val.pid
+      }
+      this.storage.remove('store-pending')
+    })
   }
-
+  
   showFullScreenImage(url) {
     this.commonService.fullScreenImg(url)
   }

src/app/store-sample-pending/store-sample-pending.page.html

@@ -4,6 +4,11 @@
       <ion-menu-button></ion-menu-button>
     </ion-buttons>
     <ion-title>待备样</ion-title>
+    <ion-buttons slot="end" *ngIf="scanCode">
+      <ion-button (click)="managePending()">
+        备货完成
+      </ion-button>
+    </ion-buttons>
   </ion-toolbar>
 </ion-header>
 
@@ -28,7 +33,8 @@
     <ion-card-content class="storeSample-content">
       <ion-item lines="none">
         <span>产品图片:</span>
-        <img slot="end" (click)="showFullScreenImage(storeSample.imgsrc)" [src]="storeSample.imgsrc" class="title-image" />
+        <img slot="end" (click)="showFullScreenImage(storeSample.imgsrc)" [src]="storeSample.imgsrc"
+          class="title-image" />
       </ion-item>
       <ion-item>
         <ion-icon name="briefcase"></ion-icon>
@@ -61,10 +67,10 @@
         <ion-input [(ngModel)]='storeSample.count'></ion-input>
       </ion-item>
 
-      <div class="ion-padding">
-        <ion-button color="primary" type="submit" expand="block" (click)="lendSample(storeSample.code)">
+      <!-- <div class="ion-padding" *ngIf="scanCode">
+        <ion-button color="primary" type="submit" expand="block" (click)="managePending(storeSample)">
           备货完成</ion-button>
-      </div>
+      </div> -->
     </ion-card-content>
   </ion-card>
-</ion-content>
+</ion-content>

src/app/store-sample-pending/store-sample-pending.page.ts

@@ -27,7 +27,7 @@ export class StoreSamplePendingPage implements OnInit {
   }
 
   async doRefresh(event) {
-    await this.getList()
+    this.getList()
     event.target.complete();    //告诉ion-refresher  更新数据
   }
 
@@ -56,13 +56,9 @@ export class StoreSamplePendingPage implements OnInit {
       this.getList();
   }
 
-  // 通过code借出样品
-  async lendSample(scanCode) {
-    this.keyboard.hide()
-    let data = await this.userData.getStoreSampleDetail(scanCode)
-    let code = JSON.parse(data).data.code
-    await this.userData.changeShelfLend(code)
-    this.getList()
+  // 备货完成
+  async managePending() {
+    await this.userData.prepareGoods(this.scanCode.split('_')[0],this.scanCode.split('_')[1])
   }
 }
 

src/providers/user-data.ts

@@ -779,6 +779,7 @@ export class UserData {
     });
   }
 
+  // 备货完成
   async prepareGoods(sscId: any, pId: any) {
     const token = await this.getToken();
     const loading = await this.loadingCtrl.create();