代码错误

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

@@ -8,7 +8,7 @@
 </ion-header>
 
 <ion-content>
-  <ion-card *ngFor="let pending of pendingList">
+  <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>
@@ -28,4 +28,4 @@
       </ion-item>
     </ion-card-content>
   </ion-card>
-</ion-content>
+</ion-content>

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

@@ -1,7 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { UserData } from '../../providers/user-data';
-import { commonService } from '../../providers/common.service'
-
+import { commonService } from '../../providers/common.service';
+import { Keyboard } from '@ionic-native/keyboard/ngx';
+import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
 @Component({
   selector: 'app-store-pending',
   templateUrl: './store-pending.page.html',
@@ -12,17 +13,21 @@ export class StorePendingPage implements OnInit {
   pendingList = [1]
   current: number = 1
   size: number = 10
-  constructor(public userData: UserData,public commonService: commonService,) { }
+  storeQCDetailList = []
+
+  constructor(public userData: UserData,
+              public commonService: commonService,
+            ) { }
 
   ngOnInit() {
   }
 
   ionViewDidEnter() {
-    this.getList()
+    this.getList();
   }
 
   showFullScreenImage(url) {
-    this.commonService.fullScreenImg(url)
+    this.commonService.fullScreenImg(url);
   }
 
   async getList() {
@@ -34,4 +39,34 @@ export class StorePendingPage implements OnInit {
       }
     }
   }
+
+  // 获取扫描详情
+  async getStoreQCDetail(pending) {
+
+          let data = await this.userData.getQCDetail(pending.sscId, pending.pId)
+
+          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
+          }
+        }
+      }
+    }
+  }
 }

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

@@ -4,7 +4,7 @@ import { Storage } from '@ionic/storage'
 import { Keyboard } from '@ionic-native/keyboard/ngx';
 import { UserData } from '../../providers/user-data';
 import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
-import { commonService } from '../../providers/common.service'
+import { commonService } from '../../providers/common.service';
 
 
 @Component({
@@ -104,7 +104,7 @@ export class StoreQCScanningPage implements OnInit {
     // 有则更新
     if (filterData.length !== 0) {
       filterData = this.storeQCDetailList
-      // 无则加上  
+      // 无则加上
     } else {
       this.storeQCList = this.storeQCList.concat(this.storeQCDetailList)
     }

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

@@ -60,6 +60,11 @@
         <ion-label>数量： </ion-label>
         <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)">
+          备货完成</ion-button>
+      </div>
     </ion-card-content>
   </ion-card>
-</ion-content>
+</ion-content>

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

@@ -30,7 +30,7 @@ export class StoreSamplePendingPage implements OnInit {
     await this.getList()
     event.target.complete();    //告诉ion-refresher  更新数据
   }
-  
+
   async getList() {
     let data = await this.userData.getStoreSamplePendingList(this.current, this.size)
     this.storeSampleLists = data
@@ -53,8 +53,16 @@ export class StoreSamplePendingPage implements OnInit {
       let data = await this.userData.getStoreSampleDetail(this.scanCode)
       let code = JSON.parse(data).data.code
       await this.userData.changeShelfLend(code)
-      this.getList()
+      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()
+  }
 }
 

src/app/warehouse-manage-pending/warehouse-manage-pending.page.ts

@@ -51,7 +51,7 @@ export class WarehouseManagePendingPage implements OnInit {
 
   async prepareGoods(sscId, pid) {
     await this.userData.prepareGoods(sscId, pid);
-    this.getList()
+    this.getList();
   }
 }