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

components/master-keyboard/master-keyboard.vue

@@ -193,6 +193,9 @@
 			},
 			open(value) {
 				this.show = value
+				if(!value&&this.keyboardtype == 'car'){
+					this.carType=0
+				}
 			},
 			//车牌tab点击事件
 			handleCarTabItemClick(index) {

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)
@@ -1111,7 +1109,7 @@
 			color: #333333;
 		}
 		.left{
-			width: 190rpx;
+			width: 220rpx;
 		}
 
 		.row {

pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -55,7 +55,6 @@
 							<input class="car-uumber" v-model='item1.carNo'
 								@click.stop="handleShowKeyboard(index,index1)" :disabled="true" placeholder="输入7位车牌号"
 								name="input"></input>
-
 							<!-- <u-input v-model="item1.carNo" placeholder="输入7位车牌号" /> -->
 							<view class="btn">
 								<view @click="addCarNumber(item.carNumberList)" style="margin-right: 20rpx;">
@@ -70,9 +69,7 @@
 								</view>
 							</view>
 						</view>
-
 					</view>
-
 				</view>
 			</view>
 			<view v-if='!status' class='add-good-people' @click='addGoodPeople'>
@@ -81,7 +78,7 @@
 					@click="reduceBtn(index)"></image>增加货主
 			</view>
 		</view>
-		<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="carNo"
+		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false" :defaultValue="carNo"
 			@keyboardClick="handleClick"></master-keyboard>
 		<u-button class='submit' @click='submit'>提交</u-button>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
@@ -90,7 +87,6 @@
 		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
-
 	</view>
 </template>
 <script>
@@ -139,12 +135,12 @@
 				goodsnameList: [],
 				selectObj: {},
 				goodsNameshow: false,
-				nameListCopy: []
+				nameListCopy: [],
+				keyShow:false,
 			}
 		},
 
 		onLoad(options) {
-console.log(options)
 			this.warehouseId = options.warehouseId
 			this.dataList.warehouseName = options.warehouseName
 			this.startDate = this.getTime()[0]
@@ -174,6 +170,9 @@ console.log(options)
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {
+			keyClose(){
+				this.keyShow = false
+			},
 			goodsnameConfirm(e) {
 				this.goodsName = this.goodsnameList[e[0]].goodsName
 				this.getCustomer()
@@ -190,11 +189,10 @@ console.log(options)
 				}
 			},
 			handleShowKeyboard(index, index1) {
-				if (this.dataList.shippingInformationList[this.index].carNumberList[this.index1].carNo == '') {
+				if (this.dataList.shippingInformationList[index].carNumberList[index1].carNo == '') {
 					this.carNo = ''
-
 				} else {
-					this.carNo = this.dataList.shippingInformationList[this.index].carNumberList[this.index1].carNo
+					this.carNo = this.dataList.shippingInformationList[index].carNumberList[index1].carNo
 				}
 				if (this.$refs.keyboard.open) {
 					this.$refs.keyboard.open(false) //true 键盘显示 false 键盘隐藏
@@ -266,7 +264,6 @@ console.log(options)
 				this.isShowAlert1 = true
 			},
 			nameConfirm(e) {
-				console.log(e)
 				this.dataList.shippingInformationList[this.selectObj["index"]].shipperName = this.nameList[e[0]]
 					.customerName
 				this.dataList.shippingInformationList[this.selectObj["index"]].supplier = this.nameList[e[0]].supplier