检验箱数，货号货架加宽

src/app/es-apply-scan/es-apply-scan.page.html

@@ -61,8 +61,7 @@
         <ion-label class="disabled-input">
           在库箱数:
         </ion-label>
-        <ion-input class="ion-input" [(ngModel)]="store.storeBoxs" name="storeBoxs" #contractBoxs="ngModel"
-                   disabled>
+        <ion-input class="ion-input" [(ngModel)]="store.storeBoxs" name="storeBoxs" #contractBoxs="ngModel" disabled>
         </ion-input>
       </ion-col>
 
@@ -74,6 +73,13 @@
           disabled>
         </ion-input>
       </ion-col>
+      <ion-col size="3" class="ion-col">
+        <ion-label class="disabled-input">
+          检验箱数:
+        </ion-label>
+        <ion-input class="ion-input" [(ngModel)]="store.checkboxcount" name="qcName" #qcName="ngModel" disabled>
+        </ion-input>
+      </ion-col>
       <ion-col size="3" class="ion-col">
         <ion-label class="disabled-input">
           qc员:
@@ -84,86 +90,86 @@
       <ion-col size="3" class="mode-input">
         <div>
           <ion-label>
-            外箱长度：
+            入库箱数:
           </ion-label>
-          <!-- <ion-item class="item-input"> -->
-            <ion-input class="es-input" [(ngModel)]="store.outboxlength" type="number"
-              (ionFocus)="hideKeyboard()" name="outboxlength" required></ion-input>
-          <!-- </ion-item> -->
+          <ion-input placeholder="请输入" class="es-input" [(ngModel)]="store.enterBoxs" type="number"
+            (ionFocus)="hideKeyboard()" name="enterBoxs" required></ion-input>
         </div>
         <ion-text class="mode-input-danger" color="danger">
-          <p style="padding-left: 0;" [hidden]="!(!store.outboxlength&&clicked)" class="ion-padding-start">
-            请输入外箱长度
+          <p style="padding-left: 0;" [hidden]="!(!store.enterBoxs&&clicked)" class="ion-padding-start">
+            请输入入库箱数
           </p>
         </ion-text>
       </ion-col>
       <ion-col size="3" class="mode-input">
         <div>
           <ion-label>
-            外箱宽度：
+            毛重:
           </ion-label>
-          <ion-input class="es-input" [(ngModel)]="store.outboxwidth" type="number" (ionFocus)="hideKeyboard()"
-            name="outboxwidth" required></ion-input>
+          <ion-input class="es-input" [(ngModel)]="store.grossweight" type="number" (ionFocus)="hideKeyboard()"
+            name="grossweight" required></ion-input>
         </div>
         <ion-text class="mode-input-danger" color="danger">
-          <p style="padding-left: 0;" [hidden]="!(!store.outboxwidth&&clicked)" class="ion-padding-start">
-            请输入外箱宽度
+          <p style="padding-left: 0;" [hidden]="!(!store.grossweight&&clicked)" class="ion-padding-start">
+            请输入毛重:
           </p>
         </ion-text>
       </ion-col>
       <ion-col size="3" class="mode-input">
         <div>
           <ion-label>
-            外箱高度：
+            仓位编号:
           </ion-label>
-          <ion-input class="es-input" [(ngModel)]="store.outboxheigt" type="number" (ionFocus)="hideKeyboard()"
-            name="outboxheigt" required></ion-input>
+          <ion-input class="es-input" [(ngModel)]="store.storelocation" (ionFocus)="hideKeyboard()" name="storelocation"
+            required></ion-input>
         </div>
         <ion-text class="mode-input-danger" color="danger">
-          <p style="padding-left: 0;" [hidden]="!(!store.outboxheigt&&clicked)" class="ion-padding-start">
-            请输入外箱高度
+          <p style="padding-left: 0;" [hidden]="!(!store.storelocation&&clicked)" class="ion-padding-start">
+            请输入仓位编号
           </p>
         </ion-text>
       </ion-col>
       <ion-col size="3" class="mode-input">
         <div>
           <ion-label>
-            入库箱数:
+            外箱长度：
           </ion-label>
-          <ion-input placeholder="请输入" class="es-input" [(ngModel)]="store.enterBoxs" type="number"
-            (ionFocus)="hideKeyboard()" name="enterBoxs" required></ion-input>
+          <!-- <ion-item class="item-input"> -->
+          <ion-input class="es-input" [(ngModel)]="store.outboxlength" type="number" (ionFocus)="hideKeyboard()"
+            name="outboxlength" required></ion-input>
+          <!-- </ion-item> -->
         </div>
         <ion-text class="mode-input-danger" color="danger">
-          <p style="padding-left: 0;" [hidden]="!(!store.enterBoxs&&clicked)" class="ion-padding-start">
-            请输入入库箱数
+          <p style="padding-left: 0;" [hidden]="!(!store.outboxlength&&clicked)" class="ion-padding-start">
+            请输入外箱长度
           </p>
         </ion-text>
       </ion-col>
       <ion-col size="3" class="mode-input">
         <div>
           <ion-label>
-            毛重:
+            外箱宽度：
           </ion-label>
-          <ion-input class="es-input" [(ngModel)]="store.grossweight" type="number" (ionFocus)="hideKeyboard()"
-            name="grossweight" required></ion-input>
+          <ion-input class="es-input" [(ngModel)]="store.outboxwidth" type="number" (ionFocus)="hideKeyboard()"
+            name="outboxwidth" required></ion-input>
         </div>
         <ion-text class="mode-input-danger" color="danger">
-          <p style="padding-left: 0;" [hidden]="!(!store.grossweight&&clicked)" class="ion-padding-start">
-            请输入毛重:
+          <p style="padding-left: 0;" [hidden]="!(!store.outboxwidth&&clicked)" class="ion-padding-start">
+            请输入外箱宽度
           </p>
         </ion-text>
       </ion-col>
       <ion-col size="3" class="mode-input">
         <div>
           <ion-label>
-            仓位编号:
+            外箱高度：
           </ion-label>
-          <ion-input class="es-input" [(ngModel)]="store.storelocation" (ionFocus)="hideKeyboard()"
-            name="storelocation" required></ion-input>
+          <ion-input class="es-input" [(ngModel)]="store.outboxheigt" type="number" (ionFocus)="hideKeyboard()"
+            name="outboxheigt" required></ion-input>
         </div>
         <ion-text class="mode-input-danger" color="danger">
-          <p style="padding-left: 0;" [hidden]="!(!store.storelocation&&clicked)" class="ion-padding-start">
-            请输入仓位编号
+          <p style="padding-left: 0;" [hidden]="!(!store.outboxheigt&&clicked)" class="ion-padding-start">
+            请输入外箱高度
           </p>
         </ion-text>
       </ion-col>
@@ -189,4 +195,4 @@
       <ion-icon name="trash" (click)="deleteStore(item, i)"></ion-icon>
     </ion-item>
   </ion-list> -->
-</ion-content>
+</ion-content>

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

@@ -37,13 +37,13 @@
       </ion-item>
       <ion-item>
         <ion-icon name="briefcase"></ion-icon>
-        <ion-label>货架：</ion-label>
-        <ion-input [(ngModel)]='storeSample.shelves'></ion-input>
+        <ion-label style="white-space:unset;word-break:break-all;">货架：{{storeSample.shelves}}</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'></ion-input>
+        <ion-label style="white-space:unset;word-break:break-all;">货号：{{storeSample.code}}</ion-label>
+        <!-- <ion-text [(ngModel)]='storeSample.code' readonly></ion-input> -->
       </ion-item>
       <ion-item>
         <ion-icon name="checkbox-outline"></ion-icon>
@@ -63,7 +63,7 @@
       <ion-item>
         <ion-icon name="apps"></ion-icon>
         <ion-label>数量： </ion-label>
-        <ion-input [(ngModel)]='storeSample.count'></ion-input>
+        <ion-input [(ngModel)]='storeSample.count' readonly></ion-input>
       </ion-item>
       <div class="ion-padding">
         <ion-button color="primary" type="submit" expand="block" (click)="managePending(storeSample)">