前端

pages/erp/improvedWrehousing/improvedWrehousing.vue

@@ -40,6 +40,17 @@
 					<view class="left">{{item.updateDate}}</view>
 					<view>{{item.backOffice}}</view>
 				</view>
+				<view v-if="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.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/improvedWrehousing/improvedWrehousingDetail.vue

@@ -90,12 +90,30 @@
 					v-model="show5" mode="selector">
 				</u-picker>
 			</view>
+			<view class="row">
+				<view class="left">入库方式</view>
+				<view @click='show8=true'>{{detailData.outType?detailData.outType:'汽运'}}</view>
+				<u-picker v-model="show8" mode="selector" range-key="name" :range="multiSelector" @confirm='outtypeChange($event)'>
+				</u-picker>
+			</view>
 			<view class="row row-bottom">
 				<view class="left">车牌号</view>
 				<input v-if="!isPC" @input='' v-model='detailData.carNo' class="right-bottom"
 					placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
+			<view v-if='detailData.outType=="集装箱船"||detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">箱号</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> -->
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" 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>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
 				<input type="number" v-if="detailData.inOutType=='采购入库'" v-model='detailData.cost' class="right-bottom"
@@ -194,7 +212,13 @@
 				isEditYF: true,
 				warehouseName: '',
 				binNumber: '',
-				
+				multiSelector:[
+					{name:'汽运',value:'0'},
+					{name:'火运',value:'1'},
+					{name:'集装箱船',value:'2'},
+					{name:'散船',value:'3'},
+				],
+				show8:false,
 				typeList: [{
 						type: "干粮"
 					},
@@ -224,6 +248,7 @@
 				netWeight: 0,
 				inOutDate1: "",
 				detailData: {
+					outType:'汽运',
 					contractNo: "请选择合同编号",
 					carNo: '',
 					type: "干粮",
@@ -319,6 +344,19 @@
 			},
 		},
 		methods: {
+			toUpperCase(val){
+				this.detailData.boxNo = val.detail.value.toUpperCase()
+			},
+			toUpperCase1(val){
+				this.detailData.boxNoOther = val.detail.value.toUpperCase()
+			},
+			usestartChange(e){
+				this.usestart=this.multiSelector1[e].name
+			},
+			outtypeChange(e){
+				this.detailData.outType=this.multiSelector[e].name
+				console.log(e)
+			},
 			getContractNoList() {
 				this.imgUrl = []
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {

pages/erp/warehousing/warehousing.vue

@@ -89,12 +89,30 @@
 					v-model="show5" mode="selector">
 				</u-picker>
 			</view>
+			<view class="row">
+				<view class="left">入库方式</view>
+				<view @click='show8=true'>{{detailData.outType?detailData.outType:'汽运'}}</view>
+				<u-picker v-model="show8" mode="selector" range-key="name" :range="multiSelector" @confirm='outtypeChange($event)'>
+				</u-picker>
+			</view>
 			<view class="row row-bottom">
 				<view class="left">车牌号</view>
 				<input v-if="!isPC" @input='' v-model='detailData.carNo' class="right-bottom"
 					placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
+			<view v-if='detailData.outType=="集装箱船"||detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">箱号</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> -->
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" 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>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
 				<input type="number" v-model='detailData.cost' class="right-bottom"
@@ -195,6 +213,12 @@
 				warehouseName: '',
 				binNumber: '',
 				contractNoList: [],
+				multiSelector:[
+					{name:'汽运',value:'0'},
+					{name:'火运',value:'1'},
+					{name:'集装箱船',value:'2'},
+					{name:'散船',value:'3'},
+				],
 				typeList: [{
 						type: "干粮"
 					},
@@ -215,6 +239,7 @@
 						grade: "等外"
 					}
 				],
+				show8:false,
 				handlerList: [],
 				warehousingTypeList: [{constValue:'移库入库'},{constValue:'退库'}],
 				action: this.$uploadUrl,
@@ -338,6 +363,19 @@
 			},
 		},
 		methods: {
+			toUpperCase(val){
+				this.detailData.boxNo = val.detail.value.toUpperCase()
+			},
+			toUpperCase1(val){
+				this.detailData.boxNoOther = val.detail.value.toUpperCase()
+			},
+			usestartChange(e){
+				this.usestart=this.multiSelector1[e].name
+			},
+			outtypeChange(e){
+				this.detailData.outType=this.multiSelector[e].name
+				console.log(e)
+			},
 			selectType(){
 				if(this.isSelectType) return
 				this.show5 = true