待验货物增加查询条件

src/app/app-routing.module.ts

@@ -28,7 +28,8 @@ const routes: Routes = [
   { path: 'enter-store-list', loadChildren: './enter-store-list/enter-store-list.module#EnterStoreListPageModule' },
   { path: 'enter-store-detail/:code/:entergoodsid', loadChildren: './enter-store-detail/enter-store-detail.module#EnterStoreDetailPageModule' },
   { path: 'store-qc-search', loadChildren: './store-qc-search/store-qc-search.module#StoreQcSearchPageModule' },
-  { path: 'sample-count-zero', loadChildren: './sample-count-zero/sample-count-zero.module#SampleCountZeroPageModule' }
+  { path: 'sample-count-zero', loadChildren: './sample-count-zero/sample-count-zero.module#SampleCountZeroPageModule' },
+  { path: 'store-pending-search', loadChildren: './store-pending-search/store-pending-search.module#StorePendingSearchPageModule' }
   // { path: 'scanning', loadChildren: './scanning/scanning.module#ScanningPageModule', canActivate: [LoginGuardGuard] }
 ];
 @NgModule({

src/app/app.component.ts

@@ -173,6 +173,7 @@ export class AppComponent {
     this.events.subscribe('user:logout', () => {
       this.updateLoggedInStatus(false);
       this.menuList = []
+      this.userData.clear()
     });
     this.events.subscribe('update:refuse', () => {
       navigator['app'].exitApp();

src/app/menu/menu.ts

@@ -82,7 +82,7 @@ export const menu_list = [
             id: 11000,
             name: '待验货物',
             icon: 'checkbox',
-            url: 'store-pending'
+            url: 'store-pending-search'
         }]
     }
 

src/app/store-pending-search/store-pending-search.module.ts

@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IonicModule } from '@ionic/angular';
+
+import { StorePendingSearchPage } from './store-pending-search.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: StorePendingSearchPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes)
+  ],
+  declarations: [StorePendingSearchPage]
+})
+export class StorePendingSearchPageModule {}

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

@@ -0,0 +1,64 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-menu-button></ion-menu-button>
+    </ion-buttons>
+    <ion-title>待验货物查询</ion-title>
+    <ion-buttons slot="end">
+      <ion-button (click)="clear()">
+        清空
+      </ion-button>
+    </ion-buttons>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <ion-list>
+    <ion-item>
+      <ion-label>抽箱完成:</ion-label>
+      <ion-select interface="action-sheet" [(ngModel)]="warehoseStatus">
+        <ion-select-option value=1>未抽</ion-select-option>
+        <ion-select-option value=2>已抽</ion-select-option>
+      </ion-select>
+    </ion-item>
+    <ion-item>
+      <ion-label>QC样完成:</ion-label>
+      <ion-input></ion-input>
+      <ion-select interface="action-sheet" [(ngModel)]="sampleStatus">
+        <ion-select-option value=1>未抽</ion-select-option>
+        <ion-select-option value=2>已抽</ion-select-option>
+      </ion-select>
+    </ion-item>
+    <ion-item>
+      <ion-label>满足验货条件:</ion-label>
+      <ion-select interface="action-sheet" [(ngModel)]="isCheck">
+        <ion-select-option value='true'>满足</ion-select-option>
+        <ion-select-option value='false'>不满足</ion-select-option>
+      </ion-select>
+      <!-- <ion-input [(ngModel)]="isCheck"></ion-input> -->
+    </ion-item>
+    <ion-item>
+      <ion-label>SC合同号:</ion-label>
+      <ion-input [(ngModel)]="scCode"></ion-input>
+    </ion-item>
+    <ion-item>
+      <ion-label>我司货号:</ion-label>
+      <ion-input [(ngModel)]="scpCode"></ion-input>
+    </ion-item>
+    <ion-item>
+      <ion-label>客户货号:</ion-label>
+      <ion-input [(ngModel)]="scpCustomercode"></ion-input>
+    </ion-item>
+    <ion-item>
+      <ion-label>PO号:</ion-label>
+      <ion-input [(ngModel)]="poCode"></ion-input>
+    </ion-item>
+    <ion-item>
+      <ion-label>工厂:</ion-label>
+      <ion-input [(ngModel)]="sName"></ion-input>
+    </ion-item>
+  </ion-list>
+  <div class="ion-padding">
+    <ion-button color="primary" expand="block" (click)="search()">查 询</ion-button>
+  </div>
+</ion-content>

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

@@ -0,0 +1,27 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StorePendingSearchPage } from './store-pending-search.page';
+
+describe('StorePendingSearchPage', () => {
+  let component: StorePendingSearchPage;
+  let fixture: ComponentFixture<StorePendingSearchPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ StorePendingSearchPage ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StorePendingSearchPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,52 @@
+import { Component, OnInit } from '@angular/core';
+import { Storage } from '@ionic/storage'
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-store-pending-search',
+  templateUrl: './store-pending-search.page.html',
+  styleUrls: ['./store-pending-search.page.scss'],
+})
+export class StorePendingSearchPage implements OnInit {
+
+  public warehoseStatus: number
+  public sampleStatus: number
+  public isCheck: boolean
+  public scCode: string
+  public scpCode: string
+  public scpCustomercode: string
+  public poCode: string
+  public sName: string
+  
+  constructor(private router: Router,private storage: Storage) { }
+
+  ngOnInit() {
+  }
+
+  search() {
+    let form = {
+      warehoseStatus: this.warehoseStatus,
+      sampleStatus: this.sampleStatus,
+      isCheck: this.isCheck,
+      scCode: this.scCode,
+      scpCode: this.scpCode,
+      scpCustomercode: this.scpCustomercode,
+      poCode: this.poCode,
+      sName: this.sName
+    }
+    this.storage.set('storePendingForm', form)
+    this.router.navigateByUrl(`/store-pending`)
+  }
+
+  clear() {
+    this.warehoseStatus = undefined
+    this.sampleStatus = undefined
+    this.isCheck = undefined
+    this.scCode = undefined
+    this.scpCode = undefined
+    this.scpCustomercode = undefined
+    this.poCode = undefined
+    this.sName = undefined
+  }
+
+}

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

@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-menu-button></ion-menu-button>
+      <ion-back-button defaultHref="store-pending-search"></ion-back-button>
     </ion-buttons>
     <ion-title>待验货物</ion-title>
   </ion-toolbar>

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

@@ -14,6 +14,7 @@ export class StorePendingPage implements OnInit {
   pendingList = [1]
   current: number = 1
   size: number = 10
+  form = {}
   storeQCDetailList = []
 
   constructor(public userData: UserData,
@@ -23,6 +24,13 @@ export class StorePendingPage implements OnInit {
   ) { }
 
   ngOnInit() {
+    // this.getList()
+    this.storage.get('storePendingForm').then(async (val) => {
+      if(val) {
+        Object.assign(this.form,val)
+      }      
+      this.getList()
+    })
   }
 
   ionViewDidEnter() {
@@ -34,7 +42,9 @@ export class StorePendingPage implements OnInit {
   }
 
   async getList() {
-    let data = await this.userData.getStorePendingList(this.current, this.size)
+    this.form['current'] = this.current
+    this.form['size'] = this.size
+    let data = await this.userData.getStorePendingList(this.form)
     this.pendingList = data
     for (let i of this.pendingList) {
       if (i["pictures"] && i["pictures"].length !== 0) {

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

@@ -65,6 +65,11 @@
         <ion-label>数量： </ion-label>
         <ion-input [(ngModel)]='storeSample.count' readonly></ion-input>
       </ion-item>
+      <ion-item>
+        <ion-icon name="apps"></ion-icon>
+        <ion-label>QC员： </ion-label>
+        <ion-input [(ngModel)]='storeSample.qcName' readonly></ion-input>
+      </ion-item>
       <div class="ion-padding">
         <ion-button color="primary" type="submit" expand="block" (click)="managePending(storeSample)">
           备样完成</ion-button>

src/providers/user-data.ts

@@ -327,9 +327,9 @@ export class UserData {
   }
 
   // 获取待验货物列表
-  async getStorePendingList(current: number, size: number): Promise<any> {
+  async getStorePendingList(form): Promise<any> {
     return new Promise((resolve, reject) => {
-      this.api.request('get',`${environment.APP_SERVE_URL}/inventory/qc/mobile/Pending?current=${current}&size=${size}`,{},{}).then((data)=>{
+      this.api.request('get',`${environment.APP_SERVE_URL}/inventory/qc/mobile/Pending`,form,{}).then((data)=>{
         resolve(data['data'].records)
       }).catch(e => {console.log(e)})
     });
@@ -375,7 +375,7 @@ export class UserData {
   // 获取QC验货初检报告列表
   async getQCList(form): Promise<any> {
     return new Promise((resolve, reject) => {
-      this.api.request('get',`${environment.APP_SERVE_URL}/inventory/qc/mobile?current=${form.current}&size=${form.size}&scpCode=${form.scpCode}&sscCode=${form.sscCode}&scpCustomercode=${form.scpCustomercode}&poCode=${form.poCode}`,{},{}).then((data)=>{
+      this.api.request('get',`${environment.APP_SERVE_URL}/inventory/qc/mobile`,form,{}).then((data)=>{
         resolve(data)
       }).catch(e => {console.log(e)})
     });