|
|
@@ -6,21 +6,24 @@
|
|
|
<view class="left">{{item.warehouseName}}</view>
|
|
|
<view class="right">{{item.validityDate}}</view>
|
|
|
</view>
|
|
|
- <view class="hz-content">
|
|
|
- <view class="row1">
|
|
|
- <view class="hz-name">
|
|
|
- {{item.shipperName}}
|
|
|
+ <view v-for="(item1,index) in item.shippingInformationList">
|
|
|
+ <view class="hz-content">
|
|
|
+ <view class="row1">
|
|
|
+ <view class="hz-name">
|
|
|
+ {{item1.shipperName}}
|
|
|
+ </view>
|
|
|
+ <view class="car">
|
|
|
+ ({{item1.carList.length}}车)
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <view class="car">
|
|
|
- ({{item.carList.length}}车)
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="car-list">
|
|
|
- <view v-for="(item1,index) in item.carList" class="number">
|
|
|
- {{item1}}
|
|
|
+ <view class="car-list">
|
|
|
+ <view v-for="(item2,index) in item1.carList" class="number">
|
|
|
+ {{item1.carNo}}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
<view class="del-row">
|
|
|
<view class="del" @click='del(item)'>删除</view>
|
|
|
</view>
|
|
|
@@ -101,16 +104,14 @@
|
|
|
methods: {
|
|
|
getData(size, page, type) {
|
|
|
let _obj = {
|
|
|
- commonId: uni.getStorageSync("userInfo").id,
|
|
|
- pageSize: size,
|
|
|
- currentPage: page
|
|
|
+ commonId: uni.getStorageSync("userInfo").id
|
|
|
}
|
|
|
this.$api.doRequest('get', '/grainDeliveryRegistration/selectGrainDeliveryRegistration', _obj)
|
|
|
.then(res => {
|
|
|
if (res.data.code == 200) {
|
|
|
let curPageData = []
|
|
|
- for (let i = 0; i < res.data.data.records.length; i++) {
|
|
|
- let _data = res.data.data.records[i];
|
|
|
+ for (let i = 0; i < res.data.data.length; i++) {
|
|
|
+ let _data = res.data.data[i];
|
|
|
//判断是记录是否失效
|
|
|
let _isUserd = function() {
|
|
|
let _startTime = new Date((_data.validityDate + ' 00:00:00')).getTime();
|
|
|
@@ -121,12 +122,17 @@
|
|
|
_data.validityDate = _data.validityDate + ' 0时前有效'
|
|
|
}
|
|
|
}()
|
|
|
- let _carNumberList = _data.carNo.split(',')
|
|
|
+ let _carNumberList=[]
|
|
|
+ for (var q = 0; q < _data.shippingInformationList.length; q++) {
|
|
|
+ console.log(_data.shippingInformationList[q])
|
|
|
+ _data.shippingInformationList[q].carList = _data.shippingInformationList[q].carNo.split(',')
|
|
|
+ }
|
|
|
+
|
|
|
let __obj = {
|
|
|
warehouseName: _data.warehouseName,
|
|
|
id: _data.id,
|
|
|
shipperName: _data.shipperName,
|
|
|
- carList: _carNumberList,
|
|
|
+ shippingInformationList: _data.shippingInformationList,
|
|
|
validityDate: _data.validityDate
|
|
|
|
|
|
}
|
