去除样品单查询

src/app/app-routing.module.ts

@@ -27,8 +27,7 @@ const routes: Routes = [
   { path: 'home', loadChildren: './home/home.module#HomePageModule' },
   { path: 'es-apply-scan', loadChildren: './es-apply-scan/es-apply-scan.module#EsApplyScanPageModule' },
   { 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-sample-code', loadChildren: './store-sample-code/store-sample-code.module#StoreSampleCodePageModule' }
+  { path: 'enter-store-detail/:code/:entergoodsid', loadChildren: './enter-store-detail/enter-store-detail.module#EnterStoreDetailPageModule' }
   // { path: 'scanning', loadChildren: './scanning/scanning.module#ScanningPageModule', canActivate: [LoginGuardGuard] }
 ];
 @NgModule({

src/app/menu/menu.ts

@@ -38,11 +38,6 @@ export const menu_list = [
             name: '仓库样品列表',
             icon: 'home',
             url: 'store-sample'
-        }, {
-            id: 13000,
-            name: '样品单查询',
-            icon: 'home',
-            url: 'store-sample-code'
         }]
     },{
         title: '仓库管理',

src/app/store-sample-code/store-sample-code.module.ts

@@ -1,26 +0,0 @@
-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 { StoreSampleCodePage } from './store-sample-code.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: StoreSampleCodePage
-  }
-];
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    RouterModule.forChild(routes)
-  ],
-  declarations: [StoreSampleCodePage]
-})
-export class StoreSampleCodePageModule {}

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

@@ -1,66 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-menu-button></ion-menu-button>
-    </ion-buttons>
-    <ion-title>样品单查询</ion-title>
-  </ion-toolbar>
-</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-item>
-    <ion-label>入库单号：</ion-label>
-    <ion-input #scanInput clear-on-edit (keyup)="getStoreSampleDetail($event)" [(ngModel)]="code"></ion-input>
-  </ion-item>
-
-
-  <ion-card *ngFor="let storeSample of storeSampleLists">
-
-    <ion-card-content class="storeSample-content">
-      <ion-item lines="none">
-        <span>产品图片:</span>
-        <img slot="end" (click)="showFullScreenImage(storeSample)" [src]="storeSample.imgsrc" class="title-image" />
-      </ion-item>
-      <ion-item>
-        <ion-icon name="briefcase"></ion-icon>
-        <ion-label>货架：</ion-label>
-        <ion-input [(ngModel)]='storeSample.shelves' readonly></ion-input>
-      </ion-item>
-      <ion-item>
-        <ion-icon name="square"></ion-icon>
-        <ion-label>货号：</ion-label>
-        <ion-input [(ngModel)]='storeSample.code' readonly></ion-input>
-      </ion-item>
-      <ion-item>
-        <ion-icon name="checkbox-outline"></ion-icon>
-        <ion-label>状态： </ion-label>
-        <ion-input [(ngModel)]="storeSample.statusName" readonly></ion-input>
-      </ion-item>
-      <ion-item>
-        <ion-icon name="hand"></ion-icon>
-        是否借出:
-        <ion-label>{{storeSample.lendName}}</ion-label>
-      </ion-item>
-      <!-- <ion-item>
-        <ion-icon name="calendar"></ion-icon>
-        <ion-label>更新时间： </ion-label>
-        <ion-datetime [(ngModel)]="storeSample.updatetime" readonly></ion-datetime>
-      </ion-item> -->
-      <ion-item>
-        <ion-icon name="apps"></ion-icon>
-        <ion-label>数量： </ion-label>
-        <ion-input [(ngModel)]='storeSample.count' readonly></ion-input>
-      </ion-item>
-    </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>

src/app/store-sample-code/store-sample-code.page.scss

@@ -1,4 +0,0 @@
-.title-image {
-    width: auto;
-    height: 60px;
-}

src/app/store-sample-code/store-sample-code.page.spec.ts

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

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

@@ -1,44 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { UserData } from '../../providers/user-data';
-import { commonService } from '../../providers/common.service'
-
-@Component({
-  selector: 'app-store-sample-code',
-  templateUrl: './store-sample-code.page.html',
-  styleUrls: ['./store-sample-code.page.scss'],
-})
-export class StoreSampleCodePage implements OnInit {
-
-  public storeSampleLists = []
-  public code:string
-  constructor(public userData: UserData,public commonService: commonService) { }
-
-  ngOnInit() {
-  }
-
-  ionViewDidEnter() {
-  }
-
-  async getStoreSampleDetail(e) {
-    e.preventDefault()
-    let keycode = window.event ? e.keyCode : e.which;
-    if (keycode == 13) {
-      e.preventDefault();
-      this.getList()
-    }
-  }
-
-  async getList() {
-    let data = await this.userData.getStoreSampleByCode(this.code)
-    this.storeSampleLists = new Array(data.data)
-  }
-
-  showFullScreenImage(data) {
-    this.commonService.fullScreenImg(data)
-  }
-
-  doRefresh() {
-    this.getList()
-  }
-
-}

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

@@ -13,6 +13,10 @@
       refreshingText="刷新...">
     </ion-refresher-content>
   </ion-refresher>
+  <ion-item>
+    <ion-label>我司货号：</ion-label>
+    <ion-input clear-on-edit (keyup)="search($event)" [(ngModel)]="code"></ion-input>
+  </ion-item>
   <ion-card *ngFor="let storeSample of storeSampleList">
     <ion-item-sliding>
       <ion-item>

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

@@ -23,12 +23,12 @@ export class StoreSamplePage implements OnInit {
     statusName: '',
     lendName: ''
   }]
-  current: number = 1
+  public code = ''
   size: number = 10
   constructor(public userData: UserData, public commonService: commonService, private router: Router, private storage: Storage) { }
 
   ngOnInit() {
-    
+
   }
 
   ionViewDidEnter() {
@@ -39,22 +39,54 @@ export class StoreSamplePage implements OnInit {
     this.commonService.fullScreenImg(form)
   }
 
-  doRefresh(event) {
-    this.getList()
+  async doRefresh(event) {
+    if (this.code) {
+      let data = await this.userData.getStoreSampleByCode(this.code)
+      this.storeSampleList = new Array(data.data)
+      this.getCnName(this.storeSampleList)
+    } else {
+      this.getList()
+    }
+
     event.target.complete();    //告诉ion-refresher  更新数据
   }
 
+  async search(e) {
+    e.preventDefault()
+    let keycode = window.event ? e.keyCode : e.which;
+    if (keycode == 13) {
+      e.preventDefault
+      if (this.code) {
+        let data = await this.userData.getStoreSampleByCode(this.code)
+        this.storeSampleList = new Array(data.data)
+        this.getCnName(this.storeSampleList)
+      } else {
+        this.getList()
+      }
+
+    }
+  }
+
   async loadData(event) {
-    this.size += 10
-    await this.getList()
-    event.target.complete();
-    if (this.storeSampleList.length < this.size) {
+    if (this.code) {
       event.target.disabled = true;
+    } else {
+      this.size += 10
+      await this.getList()
+      event.target.complete();
+      if (this.storeSampleList.length < this.size) {
+        event.target.disabled = true;
+      }
     }
   }
 
   async getList() {
-    let data = await this.userData.getStoreSampleList(this.current, this.size)
+    let data = await this.userData.getStoreSampleList(this.size)
+    this.getCnName(data)
+    this.storeSampleList = data
+  }
+
+  getCnName(data) {
     for (let i of data) {
       i.statusName = i.active ? '正常' : '已销毁'
       i.lendName = i.lend ? '已借出' : '未借出'
@@ -62,8 +94,8 @@ export class StoreSamplePage implements OnInit {
         i["imgsrc"] = i["pictures"][0].smallPicture
       }
     }
-    this.storeSampleList = data
   }
+
   async lend(storeSample) {
     storeSample.lend = true
     await this.userData.changeShelf(storeSample)

src/providers/user-data.ts

@@ -804,14 +804,14 @@ export class UserData {
   }
 
   // 获取货架列表
-  async getStoreSampleList(current: number, size: number): Promise<any> {
+  async getStoreSampleList(size: number): Promise<any> {
     const token = await this.getToken();
     const loading = await this.loadingCtrl.create();
     await loading.present();
     this.nativeHttp.setDataSerializer('json');
     const headers = { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json;charset=UTF-8' };
     return new Promise((resolve, reject) => {
-      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/shelf/mobile?${current}&${size}`, {},
+      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/shelf/mobile?size=${size}`, {},
         headers)).pipe(
           finalize(() => loading.dismiss())
         ).subscribe(async data => {
@@ -996,7 +996,7 @@ export class UserData {
     this.nativeHttp.setDataSerializer('json');
     const headers = { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json;charset=UTF-8' };
     return new Promise((resolve, reject) => {
-      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/qc/mobile/Pending?${current}&${size}`, {},
+      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/qc/mobile/Pending?current=${current}&size=${size}`, {},
         headers)).pipe(
           finalize(() => loading.dismiss())
         ).subscribe(async data => {
@@ -1030,7 +1030,7 @@ export class UserData {
     this.nativeHttp.setDataSerializer('json');
     const headers = { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json;charset=UTF-8' };
     return new Promise((resolve, reject) => {
-      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/shelf/mobile/pending?${current}&${size}`, {},
+      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/shelf/mobile/pending?current=${current}&size=${size}`, {},
         headers)).pipe(
           finalize(() => loading.dismiss())
         ).subscribe(async data => {
@@ -1098,7 +1098,7 @@ export class UserData {
     this.nativeHttp.setDataSerializer('json');
     const headers = { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json;charset=UTF-8' };
     return new Promise((resolve, reject) => {
-      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/warehouse/mobile/pending?${current}&${size}`, {},
+      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/warehouse/mobile/pending?current=${current}&size=${size}`, {},
         headers)).pipe(
           finalize(() => loading.dismiss())
         ).subscribe(async data => {
@@ -1178,7 +1178,7 @@ export class UserData {
     this.nativeHttp.setDataSerializer('json');
     const headers = { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json;charset=UTF-8' };
     return new Promise((resolve, reject) => {
-      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/qc/mobile?${current}&${size}`, {},
+      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/qc/mobile?current=${current}&size=${size}`, {},
         headers)).pipe(
           finalize(() => loading.dismiss())
         ).subscribe(async data => {