小程序 更新

pages/erp/exWarehousing/exWarehousing.vue

@@ -101,9 +101,17 @@
 				</u-picker>
 			</view>
 			<view class="row row-bottom" v-if="detailData.outType!='火运' && detailData.outType!='散船'">
-				<view class="left">车牌号</view>
+				<!-- <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>
+				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
+				<view class="left">车牌号</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?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>
@@ -214,6 +222,7 @@
 				show7: false,
 				isPC: true,
 				show8: false,
+				carno:false,
 				usestart: '',
 				multiSelector: [{
 						name: '汽运',
@@ -303,6 +312,8 @@
 				netWeight: "",
 				inOutShow: false,
 				inOutNoList: [],
+				carList:[],//车牌号下拉
+				showCar:false,
 			}
 		},
 		computed: {
@@ -396,6 +407,27 @@
 					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', {
+						flag: 5,
+						compId: helper.erpWarehouse.compId,
+					}).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){
+									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
+								}
+							 }
+						  }
+						}
+					})	
 				})
 				// this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
 				// 	this.contractNoList = res.data.data
@@ -422,13 +454,9 @@
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				if (this.detailData.inOutType == '销售出库') {
-					this.detailData.tips = '买方' + this.contractNoList[i].buyer+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
+					this.detailData.tips = '买方' + this.contractNoList[i].buyer
 				} else if (this.detailData.inOutType == '移库出库') {
-					if(+this.contractNoList[i].unitContractPrice){
-						this.detailData.tips = '入货库' + this.inOutNoList[e[0]].receiveWarehouse+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
-					}else{
-						this.detailData.tips = '入货库' + this.inOutNoList[e[0]].receiveWarehouse
-					}
+					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].warehouseName
 				}
 			},
 			toUpperCase(val) {
@@ -533,6 +561,10 @@
 			binNumberpicker(e) {
 				this.detailData.binNumber = this.positionList[e[0]].binNumber
 			},
+			carPicker(e) {
+				// this.detailData.gradeKey = e[0] + 1
+				this.detailData.carNo = this.carList[e].carNo
+			},
 			onProgress(e) {},
 			onRemove() {
 				this.detailData.addressUrl = ""

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -95,11 +95,14 @@
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
-				<!-- 	<view class="left">车牌号</view>
-				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input> -->
 				<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?detailData.carNo :"请选择车牌号"}}</view>
+				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
+				</u-picker>
 			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
@@ -276,6 +279,9 @@
 				netWeight: "",
 				inOutShow: false,
 				inOutNoList: [],
+				carList:[],//车牌号下拉
+				showCar:false,
+				carno:false,
 			}
 		},
 		computed: {
@@ -352,12 +358,33 @@
 						agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
-					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
-					this.detailData.agent = this.inOutNoList[0].agent
-					this.detailData.contractNo = this.inOutNoList[0].contractNo
-					this.detailData.goodsName = this.inOutNoList[0].goodsName
-					this.detailData.grade = this.inOutNoList[0].grade
-					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					// this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
+					// this.detailData.agent = this.inOutNoList[0].agent
+					// this.detailData.contractNo = this.inOutNoList[0].contractNo
+					// 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', {
+						flag: 5,
+						compId: helper.erpWarehouse.compId,
+					}).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){
+									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
+								}
+							 }
+						  }
+						}
+					})
 				})
 			},
 			inOutChange(e) {
@@ -464,7 +491,6 @@
 				console.log('------------res-----------')
 			},
 			onError(error) {
-				alert(error)
 				console.log('------------error-----------')
 				console.log(error)
 			},

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -105,9 +105,13 @@
 			</view>
 			<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>
+				<!-- 他运合同车牌号输入 -->
+				<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? 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>
@@ -292,6 +296,9 @@
 				},
 				 inOutShow:false,
 				 inOutNoList:[],
+				 carList:[],//车牌号下拉
+				 showCar:false,
+				 carno:false,
 			}
 		},
 		computed: {
@@ -379,13 +386,33 @@
 				{flag:2,warehouseName:this.warehouseName,
 					agentKey : this.userInfo.id}).then(res => {
 					this.inOutNoList = res.data.data
-					this.inOutNoList = res.data.data
-					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
-					this.detailData.agent = this.inOutNoList[0].agent
-					this.detailData.contractNo = this.inOutNoList[0].contractNo
-					this.detailData.goodsName = this.inOutNoList[0].goodsName
-					this.detailData.grade = this.inOutNoList[0].grade
-					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					// this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
+					// this.detailData.agent = this.inOutNoList[0].agent
+					// this.detailData.contractNo = this.inOutNoList[0].contractNo
+					// 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', {
+						flag: 7,
+						compId: helper.erpWarehouse.compId,
+					}).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){
+									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
+								}
+							 }
+							}
+						}
+					})
 				})
 			},
 			inOutChange(e){

pages/erp/warehousing/warehousing.vue

@@ -115,7 +115,7 @@
 				<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>
+				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
 				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
 				</u-picker>
 			</view>
@@ -447,29 +447,26 @@
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-						compId: this.compId,
 						flag: 7,
+						compId: helper.erpWarehouse.compId,
 					}).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合同
+								if(res.data.data[i].deliverType == "1"){//判断自运1，他运2合同
 									this.showCar = true
 								}else{
 									this.showCar = false
 								}
-								if(res.data.data[i].tranCarInfoList.length > 0){
+								if(res.data.data[i].tranCarInfoList){
 									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
 								}
-							}
+							 }
 							}
 						}
 					})
-					
-					
-					}
-					
+				  }
 				})
 				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
 					this.contractNoList = res.data.data