|
@@ -1,7 +1,8 @@
|
|
import { Component, OnInit } from '@angular/core';
|
|
import { Component, OnInit } from '@angular/core';
|
|
import { UserData } from '../../providers/user-data';
|
|
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({
|
|
@Component({
|
|
selector: 'app-store-pending',
|
|
selector: 'app-store-pending',
|
|
templateUrl: './store-pending.page.html',
|
|
templateUrl: './store-pending.page.html',
|
|
@@ -12,17 +13,21 @@ export class StorePendingPage implements OnInit {
|
|
pendingList = [1]
|
|
pendingList = [1]
|
|
current: number = 1
|
|
current: number = 1
|
|
size: number = 10
|
|
size: number = 10
|
|
- constructor(public userData: UserData,public commonService: commonService,) { }
|
|
|
|
|
|
+ storeQCDetailList = []
|
|
|
|
+
|
|
|
|
+ constructor(public userData: UserData,
|
|
|
|
+ public commonService: commonService,
|
|
|
|
+ ) { }
|
|
|
|
|
|
ngOnInit() {
|
|
ngOnInit() {
|
|
}
|
|
}
|
|
|
|
|
|
ionViewDidEnter() {
|
|
ionViewDidEnter() {
|
|
- this.getList()
|
|
|
|
|
|
+ this.getList();
|
|
}
|
|
}
|
|
|
|
|
|
showFullScreenImage(url) {
|
|
showFullScreenImage(url) {
|
|
- this.commonService.fullScreenImg(url)
|
|
|
|
|
|
+ this.commonService.fullScreenImg(url);
|
|
}
|
|
}
|
|
|
|
|
|
async getList() {
|
|
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
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|