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

pages/erp/exWarehousing/exWarehousing.vue

@@ -432,6 +432,7 @@
 				this.detailData.carNo = e.value //键盘输入值
 			},
 			inOutNo() {
+				var that=this
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: 1,
 					warehouseName: this.warehouseName,
@@ -482,13 +483,12 @@
 										this.detailData.tips = '入货库' + this.inOutNoList[0].receiveWarehouse
 									}
 									//如果查到该合同
-									res.data.data[i].deliverType  = !res.data.data[i].deliverType?'1':res.data.data[i].deliverType  
+									// res.data.data[i].deliverType  = !res.data.data[i].deliverType?'1':res.data.data[i].deliverType  
 									if (res.data.data[i].deliverType == '1') { //判断自运1，他运2合同
-										this.showCar = true
+										that.showCar = true
 									} else {
-										this.showCar = false
+										that.showCar = false
 									}
-									
 									if (res.data.data[i].tranCarInfoList) {
 										for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
 										   res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'

pages/erp/warehousing/warehousing.vue

@@ -124,7 +124,7 @@
 				</u-picker>
 			</view>
 		     <!-- 移库入库显示入库重量（） -->
-			<view class="row row-bottom" v-if="detailData.moveTaskNo">
+			<view class="row row-bottom">
 				<view class="left">入库重量（吨）</view>
 				<input type="digit" name="grossWeight" v-model='detailData.loadNetWeight'
 					class="right-bottom" placeholder="请输入入库重量"></input>
@@ -490,16 +490,30 @@
 								 // "MYCGYMHLJ2021102401"
 									if (res.data.data[i].contractNo == this.detailData
 										.contractNo) { //如果查到该合同
-										console.log(res.data.data[i].deliverType)
+										if (res.data.data[i].inOutType == '采购入库') {
+											if (res.data.data[i].unitContractPrice) {
+												this.detailData.tips = '卖方' + res.data.data[i].seller +
+													'（ ' +
+													res.data.data[i].unitContractPrice +
+													'元/吨）'
+											} else {
+												this.detailData.tips = '卖方' + res.data.data[i].seller
+											}
+																		
+										} else if (res.data.data[i].inOutType == '移库入库') {
+											this.detailData.tips = '出货库' + this.inOutNoList[0].sendWarehouse
+										} else if (res.data.data[i].inOutType == '退库') {
+											this.detailData.tips = '出货库' + this.inOutNoList[0].sendWarehouse
+										}
 										if (res.data.data[i].deliverType == "1") { //判断自运1，他运2合同
 											this.showCar = true
 										} else {
 											this.showCar = false
 										}
 										if (res.data.data[i].tranCarInfoList) {
-											// for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
-											//    res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
-											// }
+											for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
+											   res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+											}
 											this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
 										}
 									}
@@ -509,28 +523,6 @@
 						})
 					}
 				})
-				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
-					this.contractNoList = res.data.data
-					for (var i = 0; i < this.contractNoList.length; i++) {
-						if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
-							if (this.detailData.inOutType == '采购入库') {
-								if (this.contractNoList[i].unitContractPrice) {
-									this.detailData.tips = '卖方' + this.contractNoList[i].seller +
-										'（ ' +
-										this.contractNoList[i].unitContractPrice +
-										'元/吨）'
-								} else {
-									this.detailData.tips = '卖方' + this.contractNoList[i].seller
-								}
-
-							} else if (this.detailData.inOutType == '移库入库') {
-								this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
-							} else if (this.detailData.inOutType == '退库') {
-								this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
-							}
-						}
-					}
-				})
 			},
 			inOutChange(e) {
 				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
@@ -630,6 +622,12 @@
 				// this.detailData.carNo = this.carList[e].carNo
 				// this.detailData.tranCarNo = this.carList[e].tranCarNo
 				this.detailData.carId = this.carList[e[0]].id
+			  if(this.detailData.inOutType=='移库入库'){
+				if(!this.detailData.cost){
+				  this.detailData.cost=this.carList[e[0]].cost
+				}
+				this.detailData.loadNetWeight=this.carList[e[0]].loadNetWeight
+			  }
 			},
 			handlerPicker(e) {
 				console.log(e)
@@ -901,7 +899,9 @@
 					this.$api.msg('请上传磅单')
 					return
 				}
-				this.detailData.cost=0
+				if(!this.detailData.cost){
+					this.detailData.cost=0
+				}
 				// if (!this.detailData.cost && num == 2) {
 				// 	this.$api.msg('未获取到成本，请编辑后提交')
 				// 	return
@@ -1109,7 +1109,7 @@
 			color: #333333;
 		}
 		.left{
-			width: 190rpx;
+			width: 220rpx;
 		}
 
 		.row {