bug fix

src/app/enter-store-detail/enter-store-detail.page.html

@@ -20,6 +20,10 @@
         </ion-label>
       </ion-item-divider>
     </ion-item-group>
+    <ion-item lines="none">
+      <span>产品图片:</span>
+      <img slot="end" *ngIf="es.imgsrc" (click)="showFullScreenImage(es)" [src]="es.imgsrc" class="title-image" />
+    </ion-item>
     <ion-item>
       <ion-label>
         我司货号:

src/app/enter-store-detail/enter-store-detail.page.scss

@@ -1,3 +1,8 @@
 .es-detail ion-item {
   font-size: 14px;
 }
+
+.title-image {
+  width: auto;
+  height: 60px;
+}

src/app/enter-store-detail/enter-store-detail.page.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router'
 import { UserData } from '../../providers/user-data';
+import { commonService } from '../../providers/common.service'
 
 @Component({
   selector: 'app-enter-store-detail',
@@ -13,6 +14,7 @@ export class EnterStoreDetailPage implements OnInit {
   public code:string
 
   constructor(private activeRoute: ActivatedRoute,
+    public commonService: commonService,
     public userData: UserData) { }
 
   ngOnInit() {
@@ -21,10 +23,13 @@ export class EnterStoreDetailPage implements OnInit {
   ionViewDidEnter() {
     this.activeRoute.paramMap.subscribe(async params => {
       this.code = params['params']['code']
-      console.log(params['params'].entergoodsid)
       let data = await this.userData.geteEnterStoreDetail(params['params'].entergoodsid)
       this.esDetailList = data.data
-      console.log(data)
     })
   }
+
+  showFullScreenImage(data) {
+    this.commonService.fullScreenImg(data)
+  }
+
 }

src/app/enter-store-list/enter-store-list.page.html

@@ -39,12 +39,12 @@
     </div>
     <div>
       <ion-icon name="folder"></ion-icon>
-      <ion-label>操作人:{{es.contact}} </ion-label>
+      <ion-label>操作人:{{es.operator}} </ion-label>
     </div>
-    <div>
+    <!-- <div>
       <ion-icon name="keypad"></ion-icon>
       <ion-label>产品类型:{{es.producttypeName}} </ion-label>
-    </div>
+    </div> -->
     <div>
       <ion-icon name="document"></ion-icon>
       <ion-label>备注:{{es.remark}} </ion-label>

src/app/enter-store-list/enter-store-list.page.ts

@@ -33,12 +33,15 @@ export class EnterStoreListPage implements OnInit {
   }
 
   async getList() {
-    let data = await this.userData.geteEnterStoreList(this.code, this.size)
-    this.enterStoreList = data.data
-    this.total = data.totalElements
-    for (let i of this.enterStoreList) {
-      i.producttypeName = i.producttype == 200 ? '合同产品' : i.producttype == 201 ? '样品产品' : i.producttype == 202 ? '退货' : i.producttype == 203 ? '储运部特殊入库' : ''
+    if(!this.code) {
+      this.code = ''
     }
+    let data = await this.userData.geteEnterStoreList(this.code, this.size)
+    this.enterStoreList = data.data.records
+    this.total = data.data.total
+    // for (let i of this.enterStoreList) {
+    //   i.producttypeName = i.producttype == 200 ? '合同产品' : i.producttype == 201 ? '样品产品' : i.producttype == 202 ? '退货' : i.producttype == 203 ? '储运部特殊入库' : ''
+    // }
   }
 
   async loadData(event) {

src/providers/user-data.ts

@@ -589,14 +589,14 @@ export class UserData {
   }
 
   // 获取入库单列表
-  async geteEnterStoreList(code:string,size: number): Promise<any> {
+  async geteEnterStoreList(code:string,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/enterStore/mobile`, {code:code,size:size},
+      from(this.nativeHttp.get(`${environment.APP_SERVE_URL}/inventory/enterStore/mobile?code=${code}&size=${size}`, {},
         headers)).pipe(
           finalize(() => loading.dismiss())
         ).subscribe(async data => {