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

config/index.js

@@ -1,7 +1,9 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
+	// baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
+	// baseUrlNew: 'https://apitest.eliangeyun.com/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/erp/exWarehousing/exWarehousing.vue

@@ -245,22 +245,20 @@
 			this.cangId = options.cangId
 		},
 		onShow() {
+			let _data = uni.getStorageSync('erpContractNo')
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
-			this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
-			if (uni.getStorageSync('erpContractNo').contractNo) {
-				this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
+			this.detailData.goodsName = _data.goodsName;
+			if (_data.contractNo) {
+				this.detailData.contractNo = _data.contractNo;
 			}
-			this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
-			if (!uni.getStorageSync('erpContractNo').tranCarInfoList)
-				uni.getStorageSync('erpContractNo').tranCarInfoList = []
+			this.detailData.goodsNameKey = _data.goodsNameKey;
+			if (!_data.tranCarInfoList) _data.tranCarInfoList = []
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
 			} else {
-				if (uni.getStorageSync('erpContractNo').tranCarInfoList) {
-					if (uni.getStorageSync('erpContractNo').tranCarInfoList.length == 0) {
-						this.isPC = false
-					}
+				if (_data.tranCarInfoList.length == 0) {
+					this.isPC = false
 				}
 			}
 			if (!this.detailData.goodsName) {
@@ -274,7 +272,7 @@
 			this.detailData.agent = helper.erpWarehouse.personCharge
 			//经办人
 			this.handler()
-			
+
 		},
 		methods: {
 			//计算纯重

pages/erp/exWarehousing/selectCarNo.vue

@@ -48,6 +48,7 @@
 		methods: {
 			confirm(item){
 				uni.setStorageSync('ContractNo', item);
+				uni.setStorageSync('ContractNoCar',item.carNo);
 				uni.navigateBack({})
 			},
 			getContractNoList() {

pages/erp/warehousing/selectCarNo.vue

@@ -50,6 +50,7 @@
 		methods: {
 			confirm(item){
 				uni.setStorageSync('erpcarNo', item);
+				uni.setStorageSync('ContractNoCar',item.carNo);
 				uni.navigateBack({})
 			},
 		}

pages/erp/warehousing/warehousing.vue

@@ -243,7 +243,7 @@
 				inOutDate1: "",
 				detailData: {
 					contractNo: "请选择合同编号",
-					carNo: '辽H12345',
+					carNo: '请输入车牌号',
 					type: "干粮",
 					goodsName: "123",
 					inOutDate: '请选择入库日期',
@@ -271,7 +271,6 @@
 		},
 		onShow() {
 			let _data = uni.getStorageSync('erpContractNo')
-			
 			this.detailData.agent = helper.erpWarehouse.personCharge
 			this.detailData.goodsName = _data.goodsName;
 			this.detailData.contractNo = _data.contractNo;
@@ -286,14 +285,24 @@
 				this.detailData.freight = 0
 			}
 			this.detailData.carNo = uni.getStorageSync('erpcarNo')
-			if (!_data.tranCarInfoList) _data.tranCarInfoList = []
+			if (!_data.tranCarInfoList){
+				_data.tranCarInfoList = []
+			} else{
+				this.isPC = true
+				if(uni.getStorageSync('ContractNoCar')){
+					this.detailData.carNo = uni.getStorageSync('ContractNoCar')
+				}else{
+					this.detailData.carNo = _data.tranCarInfoList[0].carNo
+				}
+			}
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
-			} else {
-				if (_data.tranCarInfoList.length == 0) {
-					this.isPC = false
-				}
 			}
+			//  else {
+			// 	if (_data.tranCarInfoList.length == 0) {
+			// 		this.isPC = false
+			// 	}
+			// }
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}

pages/erpbusiness/customer.vue

@@ -14,10 +14,16 @@
 		</view>
 		<view class="content">
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>近期客户</view>
-			<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' v-for='item in gridList' @click='checkcustomer(item)'>
-			{{item.customerName}}({{item.customerPhone}})
+			
+			<view v-for='item in gridList'>
+				<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' @click='checkcustomer(item)'>
+				{{item.customerName}}({{item.customerPhone}})
+				</view>
 			</view>
-			<view @click='recentcustomer(item)' class='wrap' v-else>{{item.searchContent}}</view>
+			<view   v-for='item in gridList' style='display:inline-block;'>
+				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>{{item.searchContent}}</view>
+			</view>
+			
 		</view>
 		
 		<view v-show="isContent">
@@ -125,6 +131,7 @@
 			}).then(res => {
 				if(res.data.data){
 					this.gridList=res.data.data.records
+					console.log(this.gridList)
 				}
 			})
 			this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer',{
@@ -181,6 +188,7 @@
 							}
 						})
 						uni.setStorageSync('checkcustomer',item)
+						that.show=false
 						uni.navigateBack()
 					})
 					.catch(res => {
@@ -237,6 +245,7 @@
 									})
 								}
 							})
+							that.show=false
 							uni.navigateBack()							
 							uni.hideLoading()
 						})
@@ -791,7 +800,7 @@
 		    background: #F5F6F9;
 		    margin: 5px 10px;
 		    border-radius: 20px;
-		    width: 42%;
+		    width: 92%;
 		    display: inline-block;
 		    padding: 10px;
 	}