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

pages/erp/index.vue

@@ -393,6 +393,7 @@
 						}
 
 					} else {
+						uni.hideLoading()
 						this.warehouseList = []
 						this.warehouseCWList = []
 						this.warehouseName = '暂无仓库'

pages/erp/warehousing/warehousing.vue

@@ -490,6 +490,7 @@
 								 // "MYCGYMHLJ2021102401"
 									if (res.data.data[i].contractNo == this.detailData
 										.contractNo) { //如果查到该合同
+										console.log(res.data.data[i].deliverType)
 										if (res.data.data[i].deliverType == "1") { //判断自运1，他运2合同
 											this.showCar = true
 										} else {
@@ -624,9 +625,11 @@
 			},
 			carPicker(e) {
 				// this.detailData.gradeKey = e[0] + 1
-				this.detailData.carNo = this.carList[e].carNo
-				this.detailData.tranCarNo = this.carList[e].tranCarNo
-				this.detailData.carId = this.carList[e].id
+				this.detailData.carNo = this.carList[e[0]].carNo
+				this.detailData.tranCarNo = this.carList[e[0]].tranCarNo
+				// this.detailData.carNo = this.carList[e].carNo
+				// this.detailData.tranCarNo = this.carList[e].tranCarNo
+				this.detailData.carId = this.carList[e[0]].id
 			},
 			handlerPicker(e) {
 				console.log(e)
@@ -898,10 +901,11 @@
 					this.$api.msg('请上传磅单')
 					return
 				}
-				if (!this.detailData.cost && num == 2) {
-					this.$api.msg('未获取到成本，请编辑后提交')
-					return
-				}
+				this.detailData.cost=0
+				// if (!this.detailData.cost && num == 2) {
+				// 	this.$api.msg('未获取到成本，请编辑后提交')
+				// 	return
+				// }
 				if (String(this.detailData.cost).indexOf('.') != -1 && String(this.detailData
 						.cost).length - (String(
 						this.detailData.cost).indexOf('.') + 1) > 2) {

pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -242,6 +242,9 @@ console.log(options)
 								this.$api.msg('当前客户的' + this.goodsName + '送粮量达到上限')
 							}
 						}
+						else if(res.data.code == 11019){
+							this.$api.msg('未认证粮商身份')
+						}
 					})
 			},
 			getTime() {