zhongtianhaoyuan 3 vuotta sitten
vanhempi
commit
5b34c30382

+ 10 - 2
pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -103,12 +103,20 @@
 				<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="row row-bottom" v-if="detailData.outType!='火运' && detailData.outType!='散船'">
 				<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 class="row row-bottom" v-if="detailData.outType=='火运'">
+				<view class="left">车号</view>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号"></input>
+			</view>
+			<view class="row row-bottom" v-if="detailData.outType=='散船'">
+				<view class="left">船名</view>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入船名"></input>
+			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
@@ -116,7 +124,7 @@
 				<input v-model='detailData.boxNoOther' class="right-bottom"
 					placeholder="请输入箱号"></input>
 			</view>
-			<view v-if='!detailData.outType||detailData.outType=="汽运"' class="row row-bottom">
+			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo' class="right-bottom"
 					placeholder="请输入封号"></input>

+ 49 - 7
pages/erp/warehousing/warehousing.vue

@@ -109,10 +109,23 @@
 					@confirm='outtypeChange($event)'>
 				</u-picker>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.outType!='火运'&&detailData.outType!='散船'">
 				<view class="left">车牌号</view>
-				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
-				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
+				<!-- 他运合同车牌号输入 -->
+				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
+			    <!-- 自运合同车牌号需下拉 -->
+				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo}}</view>
+				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
+				</u-picker>
+			</view>
+			<view class="row row-bottom" v-if="detailData.outType=='火运'">
+				<view class="left">车号</view>
+				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号" ></input>
+			</view>
+			<view class="row row-bottom" v-if="detailData.outType=='散船'">
+				<view class="left">船名</view>
+				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入船名" ></input>
 			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
@@ -120,7 +133,7 @@
 				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
 				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
 			</view>
-			<view v-if='!detailData.outType||detailData.outType=="汽运"' class="row row-bottom">
+			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo'  class="right-bottom"
 					placeholder="请输入封号"></input>
@@ -227,6 +240,7 @@
 				show5: false,
 				show6: false,
 				isPC: true,
+				carno:false,
 				isSelectType: true,
 				inOutShow: false,
 				params: {
@@ -293,7 +307,7 @@
 				contractNoList: [],
 				detailData: {
 					contractNo: "请选择合同编号",
-					carNo: '请输入车牌号',
+					carNo: '',
 					type: "干粮",
 					goodsName: "",
 					inOutDate: '请选择入库日期',
@@ -307,7 +321,9 @@
 					netWeight: 0,
 					cost: 0,
 					warehouseInOutDetail: {}
-				}
+				},
+				carList:[],//车牌号下拉
+				showCar:false,
 			}
 		},
 		onLoad(options) {
@@ -429,6 +445,29 @@
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
 					this.detailData.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					//查询所有的合同  进行获取车牌号
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+						compId: this.compId,
+						flag: 7,
+					}).then(res => {
+						if (res.data.code == 200) {
+							for(let i = 0 ; i < res.data.data.length ; i++){
+								 // "MYCGYMHLJ2021102401"
+								if(res.data.data[i].contractNo == this.detailData.contractNo){//如果查到该合同
+								if(res.data.data[i].deliverType == 1){//判断自运1,他运2合同
+									this.showCar = true
+								}else{
+									this.showCar = false
+								}
+								if(res.data.data[i].tranCarInfoList.length > 0){
+									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
+								}
+							}
+							}
+						}
+					})
+					
+					
 					}
 					
 				})
@@ -492,7 +531,6 @@
 			},
 			outtypeChange(e) {
 				this.detailData.outType = this.multiSelector[e].name
-				console.log(e)
 			},
 			selectType() {
 				if (this.isSelectType) return
@@ -531,6 +569,10 @@
 				this.detailData.gradeKey = e[0] + 1
 				this.detailData.grade = this.pjList[e].grade
 			},
+			carPicker(e) {
+				// this.detailData.gradeKey = e[0] + 1
+				this.detailData.carNo = this.carList[e].carNo
+			},
 			handlerPicker(e) {
 				console.log(e)
 				this.detailData.agent = this.handlerList[e].staffName