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

pages/erpbusiness/add_quality_testing.vue

@@ -305,6 +305,7 @@
 					//点击登记客户
 					this.gridList.customerName = _customerInfo.shipperName
 					this.gridList.customerPhone = _customerInfo.shipperPhone
+					this.gridList.carNumber=uni.getStorageSync('carNo')
 				} else {
 					//点击搜索客户
 					this.gridList.customerName = _customerInfo.customerName
@@ -601,6 +602,7 @@
 					this.gridList.type = '潮粮'
 					this.edit = true
 				} else {
+					this.gridList.type = '干粮'
 					this.edit = false
 				}
 				this.gridList.goodsName = this.goodsList[e[0]].goodsName

pages/erpbusiness/customer.vue

@@ -32,7 +32,7 @@
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>登记客户</view>
 
 			<view v-for='item in registeredCustomer'>
-				<view class="dj-customer" @click="registeredCustomerClick(item)" v-for="(item1,index) in item.carList">
+				<view class="dj-customer" v-for="(item1,index) in item.carList" @click="registeredCustomerClick(item,item1)">
 					<view class="left">{{item1}}</view>
 					<view class="right">
 						<view class="span1">{{item.shipperName}}（货）</view>
@@ -191,8 +191,8 @@
 				}
 
 			},
-			registeredCustomerClick(item){
-			
+			registeredCustomerClick(item,item1){
+			uni.setStorageSync('carNo', item1)
 			uni.setStorageSync('checkcustomer', item)
 				if (this.recentCustomers.length == 0) {
 					this.recentCustomers.push(item)

pages/user/depotAcquisition/depotAcquisition.vue

@@ -35,7 +35,7 @@
 				</view>
 			</view>
 			<view class="row4">
-				<view class="time">{{item.createDate}}</view>
+				<view class="time">{{item.updateDate}}</view>
 				<view class="btn"
 					@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?itemValue="+JSON.stringify(item))'>
 					我要送粮