前端

pages/erp/exWarehousing/exWarehousing.vue

@@ -93,9 +93,9 @@
 			</view>
 			<view v-if='detailData.outType=="集装箱船"||detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">箱号</view>
-				<view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
+				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
 				<u-picker v-model="show9" mode="selector" range-key="name" :range="multiSelector1" @confirm='usestartChange($event)'>
-				</u-picker>
+				</u-picker> -->
 				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
 				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
 			</view>
@@ -641,6 +641,8 @@
 						return
 					}
 				}
+				this.detailData.boxNo=this.detailData.boxNo.toUpperCase()
+				this.detailData.boxNoOther=this.detailData.boxNoOther.toUpperCase()
 				this.detailData.baseId = helper.erpWarehouse.warehouseId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
 				this.detailData.positionId = helper.erpWarehouse.positionId

pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -24,6 +24,13 @@
 					<view class="left">{{item.updateDate}}</view>
 					<view>{{item.backOffice}}</view>
 				</view>
+				<view v-if="item.outType=='火运'||item.outType=='集装箱船'" style='color:#878C9C;font-size:14px;' class="row">
+					<view v-if='item.boxNo' class="left">箱号：{{item.boxNo}}</view>
+					<view v-if='item.boxNoOther'>箱号2：{{item.boxNoOther}}</view>
+				</view>
+				<view v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
+					<view v-if='item.binNo' class="left">仓位号：{{item.binNo}}</view>
+				</view>
 			</view>
 		</view>
 	</view>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -614,6 +614,13 @@
 						return
 					}
 				}
+				if(this.detailData.boxNo){
+					this.detailData.boxNo=this.detailData.boxNo.toUpperCase()
+				}
+				if(this.detailData.boxNoOther){
+					this.detailData.boxNoOther=this.detailData.boxNoOther.toUpperCase()
+				}
+				
 				this.detailData.baseId = helper.erpWarehouse.warehouseId
 				this.detailData.positionId = helper.erpWarehouse.positionId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
@@ -719,7 +726,7 @@
 
 			// border: 0;
 			.right-bottom {
-				width: 300rpx;
+				width: 280rpx;
 				text-align: right;
 			}
 		}