Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/erp/exWarehousing/exWarehousing.vue

@@ -126,9 +126,13 @@
 				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
 					placeholder="请输入车厢号"></input>
 			</view>
-			<view v-if='detailData.outType=="散船"' class="row row-bottom">
-				<view class="left">仓位号</view>
-				<input v-model='detailData.binNo' class="right-bottom" placeholder="请输入仓位号"></input>
+			<view v-if='detailData.outType=="散船"||detailData.outType=="集装箱船"' class="row row-bottom">
+				<view class="left">航次</view>
+				<input v-model='detailData.shipNumber' class="right-bottom" placeholder="请输入航次"></input>
+			</view>
+			<view v-if='detailData.outType=="散船"||detailData.outType=="集装箱船"' class="row row-bottom">
+				<view class="left">船名</view>
+				<input v-model='detailData.shipName' class="right-bottom" placeholder="请输入船名"></input>
 			</view>
 		</view>
 		<view class="content2">

pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -35,6 +35,14 @@
 				<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 v-if='item.outType=="散船"||item.outType=="集装箱船"' class="row row-bottom">
+					<view class="left">航次</view>
+					<view>{{item.shipNumber}}</view>
+				</view>
+				<view v-if='item.outType=="散船"||item.outType=="集装箱船"' class="row row-bottom">
+					<view class="left">船名</view>
+					<view>{{item.shipName}}</view>
+				</view>
 			</view>
 		</view>
 	</view>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -126,6 +126,14 @@
 				<view class="left">仓位号</view>
 				<input v-model='detailData.binNo' class="right-bottom" placeholder="请输入仓位号"></input>
 			</view>
+			<view v-if='detailData.outType=="散船"||detailData.outType=="集装箱船"' class="row row-bottom">
+				<view class="left">航次</view>
+				<input v-model='detailData.shipNumber' class="right-bottom" placeholder="请输入航次"></input>
+			</view>
+			<view v-if='detailData.outType=="散船"||detailData.outType=="集装箱船"' class="row row-bottom">
+				<view class="left">船名</view>
+				<input v-model='detailData.shipName' class="right-bottom" placeholder="请输入船名"></input>
+			</view>
 		</view>
 		<view class="content2">
 			<view class="left">上传磅单</view>