|
@@ -8,11 +8,10 @@
|
|
|
<div class="batch_box" @scroll.passive="getScroll($event)"
|
|
|
style=" height: calc(100vh - 154px);overflow-y: auto;">
|
|
|
<van-pull-refresh v-model="refreshLoading" @refresh="onRefresh">
|
|
|
-
|
|
|
- <div class="onther" v-for="item in waiteList" :key="item.id">
|
|
|
+ <div class="onther" v-for="(item, index) in waiteList" :key="index">
|
|
|
<div class="onther-top">
|
|
|
- <div style="font-size: 16px;">批次号:<span style="font-size: 16px;">{{ item.dispatchBatchNo
|
|
|
- }}</span>
|
|
|
+ <div style="font-size: 16px;">批次号:{{ item.dispatchBatchNo
|
|
|
+ }}
|
|
|
</div>
|
|
|
<div class="jindu">派送进度 {{ item.signed }}/{{ item.sumAnd }}</div>
|
|
|
</div>
|
|
@@ -26,14 +25,12 @@
|
|
|
<van-cell style="color: aqua;" is-link @click="showPopup(item)">展示弹出层</van-cell>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
-
|
|
|
</van-pull-refresh>
|
|
|
</div>
|
|
|
|
|
|
|
|
|
<van-popup v-model="show" style="width: 100%; height: 60%;">
|
|
|
- <div class="batch-middel" v-for="item in popupList" :key="id">
|
|
|
+ <div class="batch-middel" v-for="(item, index) in popupList" :key="index">
|
|
|
<div class="batch-middel-text">
|
|
|
<div class="batch-middel-text-style">[{{ item.expressCompany }}]运单号:{{
|
|
|
item.expressNo }}</div>
|
|
@@ -43,8 +40,10 @@
|
|
|
<div class="batch-middel-text-style">座位号:{{ item.sendSeat }}</div>
|
|
|
<div style="display: flex;" class="batch-middel-text-style">联系方式:{{ item.phone }} </div>
|
|
|
<div class="batch-middel-text-style">当前状态:
|
|
|
- <span style="color: #1989fa;">{{ item.signinStatus == 0 ? '待签收' : `${item.signinStatus == 1 ?
|
|
|
- '已签收' : '代收'}` }}</span>
|
|
|
+ <span style="color: #1989fa;">
|
|
|
+ {{ item.signinStatus == 0 ? '待签收' : `${item.signinStatus == 1 ?
|
|
|
+ '已签收' : `${item.signinStatus == 2 ? '代收' : `${item.signinStatus == 3 ? '拒收' : '延迟'}`}`}` }}
|
|
|
+ </span>
|
|
|
<span style="color: #1989fa;">查看</span>
|
|
|
</div>
|
|
|
<div class="batch-middel-text-style">签收时间:{{ item.signatureTime == undefined ? '' :
|
|
@@ -55,15 +54,11 @@
|
|
|
item.signatureTime.time.minute }}:{{ item.signatureTime == undefined ? '' :
|
|
|
item.signatureTime.time.second }}
|
|
|
</div>
|
|
|
-
|
|
|
</div>
|
|
|
<div style="display: flex; padding-top: 5px;">
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
</van-popup>
|
|
|
-
|
|
|
-
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -91,8 +86,6 @@ export default {
|
|
|
mounted() {
|
|
|
// 获取数据
|
|
|
this.getData();
|
|
|
-
|
|
|
-
|
|
|
},
|
|
|
methods: {
|
|
|
// 刷新
|
|
@@ -177,9 +170,6 @@ export default {
|
|
|
this.popupList = res.data
|
|
|
},
|
|
|
},
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
};
|
|
|
</script>
|
|
|
|
|
@@ -198,7 +188,6 @@ export default {
|
|
|
height: 100%
|
|
|
}
|
|
|
|
|
|
-
|
|
|
.batchss {
|
|
|
height: 130px;
|
|
|
// overflow: hidden;
|
|
@@ -252,7 +241,7 @@ export default {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
- padding: 10px 0 6px 0;
|
|
|
+ padding: 10px 0 10px 0;
|
|
|
|
|
|
.jindu {
|
|
|
color: #169bd5
|