|
@@ -31,16 +31,16 @@
|
|
|
<view class="content content1">
|
|
|
<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" v-for="(item1,index) in item.carList" @click="registeredCustomerClick(item,item1)">
|
|
|
- <view class="left">{{item1}}</view>
|
|
|
+ <!-- <view v-for='item in registeredCustomer'> -->
|
|
|
+ <view class="dj-customer" v-for="(item,index) in registeredCustomer" @click="registeredCustomerClick(item,item1)">
|
|
|
+ <view class="left">{{item.carNo}}</view>
|
|
|
<view class="right">
|
|
|
<view class="span1">{{item.shipperName}}(货)</view>
|
|
|
<view class="">{{item.supplier}}(商)</view>
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ <!-- </view> -->
|
|
|
</view>
|
|
|
|
|
|
<view v-show="isContent">
|
|
@@ -142,23 +142,28 @@
|
|
|
this.recentCustomers = []
|
|
|
}
|
|
|
|
|
|
- this.$api.doRequest('get', '/grainDeliveryRegistration/grainDeliveryRegistrationCustomer', {
|
|
|
- warehouseName: this.warehouseName
|
|
|
+ this.$api.doRequest('get', '/shippingInformation/selectShippingInformation', {
|
|
|
+ warehouseName: this.warehouseName,
|
|
|
+ compId: uni.getStorageSync('pcUserInfo').compId,
|
|
|
}).then(res => {
|
|
|
if (res.data.data) {
|
|
|
let _endTime = Date.parse(new Date());
|
|
|
let _startTime = ""
|
|
|
for (let i = 0; i < res.data.data.length; i++) {
|
|
|
- let _carList = res.data.data[i].shippingInformationList
|
|
|
- for (let k = 0; k < _carList.length; k++) {
|
|
|
- //判断是记录是否失效
|
|
|
_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
|
|
|
- if (_endTime - _startTime <= 0) {
|
|
|
- let _ecarList = _carList[k].carNo.split(',')
|
|
|
- _carList[k].carList = _ecarList
|
|
|
- this.registeredCustomer.push(_carList[k])
|
|
|
- }
|
|
|
- }
|
|
|
+ if (_endTime - _startTime <= 0) {
|
|
|
+ this.registeredCustomer.push(res.data.data[i])
|
|
|
+ }
|
|
|
+ // let _carList = res.data.data[i].shippingInformationList
|
|
|
+ // for (let k = 0; k < _carList.length; k++) {
|
|
|
+ // //判断是记录是否失效
|
|
|
+ // _startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
|
|
|
+ // if (_endTime - _startTime <= 0) {
|
|
|
+ // let _ecarList = _carList[k].carNo.split(',')
|
|
|
+ // _carList[k].carList = _ecarList
|
|
|
+ // this.registeredCustomer.push(_carList[k])
|
|
|
+ // }
|
|
|
+ // }
|
|
|
}
|
|
|
console.log(this.registeredCustomer)
|
|
|
}
|