|
@@ -332,6 +332,11 @@
|
|
|
min-width="100"
|
|
|
show-overflow-tooltip
|
|
|
></el-table-column>
|
|
|
+ <el-table-column fixed="right" label="操作" width="100" v-if="flag">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button @click="handLogistics(scope.row)" type="text" size="small">物流信息</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -346,6 +351,28 @@
|
|
|
</el-popconfirm>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <el-dialog title="物流信息" :visible.sync="visible" width="60%" @close="onClose" :close-on-click-modal="false">
|
|
|
+ <el-timeline class="logistics" :reverse="false" v-if="logisticsDetail.length">
|
|
|
+ <el-timeline-item
|
|
|
+ placement="top"
|
|
|
+ type="success"
|
|
|
+ v-for="(item, index) in logisticsDetail"
|
|
|
+ :key="index"
|
|
|
+ :timestamp="item.time"
|
|
|
+ >
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col class="logistics-title"> {{ item.status }} </el-col>
|
|
|
+ <el-col>
|
|
|
+ <div class="flex">
|
|
|
+ <div>{{ item.context }}</div>
|
|
|
+ <!-- <div>{{ item.createTime }}</div> -->
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-timeline-item>
|
|
|
+ </el-timeline>
|
|
|
+ <div v-else class="tip">暂无物流信息</div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -359,7 +386,8 @@ import {
|
|
|
addPickupBook,
|
|
|
editPickupBook,
|
|
|
getDetail,
|
|
|
- checkStock
|
|
|
+ checkStock,
|
|
|
+ getListOrderTrack
|
|
|
} from '@/api/supply/pickup'
|
|
|
import { getDictList } from '@/api/common'
|
|
|
|
|
@@ -374,7 +402,7 @@ export default {
|
|
|
mainForm: {
|
|
|
// 筛选表单数据
|
|
|
warehouse: '',
|
|
|
- date:'',
|
|
|
+ date: '',
|
|
|
timeSlot: '',
|
|
|
pickupWay: '',
|
|
|
pickupMan: '',
|
|
@@ -421,9 +449,12 @@ export default {
|
|
|
],
|
|
|
setDisabled: {
|
|
|
disabledDate: time => {
|
|
|
- return time.getTime()< new Date() - 24 * 3600 * 1000
|
|
|
+ return time.getTime() < new Date() - 24 * 3600 * 1000
|
|
|
}
|
|
|
- }
|
|
|
+ },
|
|
|
+ visible: false,
|
|
|
+ orderId: '',
|
|
|
+ logisticsDetail: []
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -876,9 +907,27 @@ export default {
|
|
|
this.mainForm.pickupWay = '1'
|
|
|
}
|
|
|
this.deliverList = []
|
|
|
+ },
|
|
|
+ handLogistics(row) {
|
|
|
+ getListOrderTrack({ orderId: row.invoiceId }).then(res => {
|
|
|
+ this.logisticsDetail = res.data
|
|
|
+ })
|
|
|
+ this.orderId = row.id
|
|
|
+ this.visible = true
|
|
|
+ },
|
|
|
+ onClose() {
|
|
|
+ this.logisticsDetail = []
|
|
|
+ this.orderId = ''
|
|
|
+ this.visible = false
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
-<style lang="scss" scoped></style>
|
|
|
+<style lang="scss" scoped>
|
|
|
+.tip {
|
|
|
+ height: 200px;
|
|
|
+ text-align: center;
|
|
|
+ line-height: 200px;
|
|
|
+}
|
|
|
+</style>
|