|
|
@@ -51,7 +51,7 @@
|
|
|
v-model="selectedOrders"
|
|
|
@change="onSelect"
|
|
|
>
|
|
|
- <view class="order-item" v-for="item in data" :key="item.orderId">
|
|
|
+ <view class="order-item" v-for="item in data" :key="item.hostOrderId">
|
|
|
<view class="order-header">
|
|
|
<view class="location-box">
|
|
|
<view class="location-info">
|
|
|
@@ -66,12 +66,15 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="location-address">
|
|
|
- <view class="atext">{{ item.address }}</view>
|
|
|
- <view class="btext">{{ item.region }}</view>
|
|
|
+ <view>
|
|
|
+ <view class="atext">{{ item.address }}</view>
|
|
|
+ <view class="btext">{{ item.region }}</view>
|
|
|
+ </view>
|
|
|
+ <view style="font-size: 24rpx;">{{ item.createTime }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="order-actions" v-if="isManaging">
|
|
|
- <u-checkbox :name="item.orderId" shape="circle" v-model="item.checked"></u-checkbox>
|
|
|
+ <u-checkbox :name="item.hostOrderId" shape="circle" v-model="item.checked"></u-checkbox>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -201,14 +204,30 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
onSelect(e) {
|
|
|
- this.selectedOrders = e;
|
|
|
- // 控制全选
|
|
|
- this.isAllSelected = e.length === this.$refs.listScroll.dataList.length;
|
|
|
+ let allOrders = this.$refs.listScroll.dataList;
|
|
|
+ const result = allOrders.filter(item => e.includes(item.hostOrderId))
|
|
|
+ let arr = []
|
|
|
+ if(result && result.length > 0){
|
|
|
+ result.forEach(item => {
|
|
|
+ item.merchantPackageOrderDTOS.forEach(sub => {
|
|
|
+ arr.push(sub.merchantOrderId)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.selectedOrders = arr;
|
|
|
+ // 控制全选
|
|
|
+ this.isAllSelected = result.length === this.$refs.listScroll.dataList.length;
|
|
|
+ }
|
|
|
},
|
|
|
onSelectAll(e) {
|
|
|
let allOrders = this.$refs.listScroll.dataList;
|
|
|
if (e.value) {
|
|
|
- this.selectedOrders = allOrders.map(order => order.orderId);
|
|
|
+ let arr = []
|
|
|
+ allOrders.forEach(item => {
|
|
|
+ item.merchantPackageOrderDTOS.forEach(sub => {
|
|
|
+ arr.push(sub.merchantOrderId)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.selectedOrders = arr;
|
|
|
} else {
|
|
|
this.selectedOrders = [];
|
|
|
}
|
|
|
@@ -342,6 +361,9 @@ export default {
|
|
|
}
|
|
|
.location-address {
|
|
|
margin-top: 10rpx;
|
|
|
+ display: flex;
|
|
|
+ align-items: flex-end;
|
|
|
+ justify-content: space-between;
|
|
|
.atext {
|
|
|
font-weight: 500;
|
|
|
font-size: 26rpx;
|