|
|
|
|
@ -1,5 +1,5 @@
|
|
|
|
|
<template>
|
|
|
|
|
<div style="margin-top: -16px;margin-left:-4px;margin-right:-4px;">
|
|
|
|
|
<div style="margin-top: -16px;margin-left:-4px;margin-right:-4px;" @click="pageClick">
|
|
|
|
|
<a-row :gutter="24">
|
|
|
|
|
<a-col :md="24" :sm="24" style="padding: 0 0 0 0" class="content-box">
|
|
|
|
|
<x-card class="content-nav">
|
|
|
|
|
@ -115,6 +115,7 @@
|
|
|
|
|
@cell-dblclick="handledbclick"
|
|
|
|
|
@resizable-change="resizableChange"
|
|
|
|
|
@sort-change="tableSortChange"
|
|
|
|
|
@scroll="pageClick"
|
|
|
|
|
>
|
|
|
|
|
<template #mblno="{ row }">
|
|
|
|
|
<div class="mblno">
|
|
|
|
|
@ -198,7 +199,7 @@
|
|
|
|
|
</template>
|
|
|
|
|
</div>
|
|
|
|
|
<!-- @mouseover="goodStatusHover($event, row)" @mouseleave="goodStatusLeave($event, row)" -->
|
|
|
|
|
<div class="goods-status-right" @click="goodStatusclick($event, row)" v-if="row.hasGoods > 0">
|
|
|
|
|
<div class="goods-status-right" @click.stop="goodStatusclick($event, row)" v-if="row.hasGoods > 0">
|
|
|
|
|
<i class="iconfont icon-zhankai2"></i>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
@ -295,7 +296,8 @@
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="goods-hovers-list" :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }" v-show="goodStatusShow">
|
|
|
|
|
<!-- v-show="goodStatusShow" -->
|
|
|
|
|
<div class="goods-hovers-list" :class="{'hide-goods-hover': !goodStatusShow}" :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }" >
|
|
|
|
|
<div class="title">货运动态</div>
|
|
|
|
|
<template v-for="(goodStatusItem, gindex) in goodStatusData" >
|
|
|
|
|
<template v-if="goodStatusItem.finishTime || goodStatusItem.remark">
|
|
|
|
|
@ -687,10 +689,7 @@ export default {
|
|
|
|
|
columns: JSON.parse(JSON.stringify(initData.columns)),
|
|
|
|
|
data: []
|
|
|
|
|
}
|
|
|
|
|
console.log('== 设置，清空了列表数据 ==')
|
|
|
|
|
next(vm => {
|
|
|
|
|
console.log('== 开始跳转 ==')
|
|
|
|
|
})
|
|
|
|
|
next()
|
|
|
|
|
},
|
|
|
|
|
beforeRouteEnter (to, from, next) {
|
|
|
|
|
next(vm => {
|
|
|
|
|
@ -723,15 +722,25 @@ export default {
|
|
|
|
|
if (Object.keys(this.gridOptions).length > 0) {
|
|
|
|
|
if (Object.keys(this.bookingGridOptions) === 0) { return false }
|
|
|
|
|
const newData = JSON.parse(JSON.stringify(this.bookingGridOptions))
|
|
|
|
|
// 默认取前十条或者前N条，暂时屏蔽
|
|
|
|
|
// if (this.bookingGridOptions.data && this.bookingGridOptions.data.length > 0) {
|
|
|
|
|
// const copyArr = JSON.parse(JSON.stringify(this.bookingGridOptions.data))
|
|
|
|
|
// const first = copyArr.splice(0, 10)
|
|
|
|
|
// const more = this.bookingGridOptions.data.splice(10, this.bookingGridOptions.data.length)
|
|
|
|
|
// newData.data = first
|
|
|
|
|
// this.gridOptions = { ...this.gridOptions, ...newData }
|
|
|
|
|
// setTimeout(() => {
|
|
|
|
|
// this.gridOptions.data = [...this.gridOptions.data, ...more]
|
|
|
|
|
// }, 1500)
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// 默认获取全部数据
|
|
|
|
|
if (this.bookingGridOptions.data && this.bookingGridOptions.data.length > 0) {
|
|
|
|
|
const copyArr = JSON.parse(JSON.stringify(this.bookingGridOptions.data))
|
|
|
|
|
const first = copyArr.splice(0, 10)
|
|
|
|
|
const more = this.bookingGridOptions.data.splice(10, this.bookingGridOptions.data.length)
|
|
|
|
|
newData.data = first
|
|
|
|
|
this.gridOptions = { ...this.gridOptions, ...newData }
|
|
|
|
|
newData.data = copyArr
|
|
|
|
|
setTimeout(() => {
|
|
|
|
|
this.gridOptions.data = [...this.gridOptions.data, ...more]
|
|
|
|
|
}, 1500)
|
|
|
|
|
this.gridOptions = { ...this.gridOptions, ...newData }
|
|
|
|
|
}, 200)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
@ -864,7 +873,6 @@ export default {
|
|
|
|
|
// break
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
console.log('获取到自定义数据', $data)
|
|
|
|
|
if (Object.keys($data).includes('booking_list_cond')) {
|
|
|
|
|
this.setFormData($data.booking_list_cond, false, true)
|
|
|
|
|
} else {
|
|
|
|
|
@ -1472,7 +1480,6 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
goodStatusHover(e, data) {
|
|
|
|
|
const maxWidth = window.innerWidth
|
|
|
|
|
console.log(maxWidth, e.pageX, maxWidth - e.pageX)
|
|
|
|
|
if (maxWidth - e.pageX > 230) {
|
|
|
|
|
// this.goodStatusScreenX = e.pageX + 20
|
|
|
|
|
this.goodStatusScreenX = e.pageX - 139
|
|
|
|
|
@ -1484,12 +1491,10 @@ export default {
|
|
|
|
|
this.goodStatusScreenY = e.pageY + 25
|
|
|
|
|
this.goodStatusData = data.goodsStatusList
|
|
|
|
|
this.goodStatusShow = true
|
|
|
|
|
console.log('== 鼠标滑过 ==', this.goodStatusScreenX, this.goodStatusScreenY, this.goodStatusShow, this.goodStatusData)
|
|
|
|
|
},
|
|
|
|
|
goodStatusLeave(e, data) {
|
|
|
|
|
this.goodStatusShow = false
|
|
|
|
|
this.goodStatusData = null
|
|
|
|
|
console.log('== 鼠标离开 ==')
|
|
|
|
|
},
|
|
|
|
|
openTraceModel() {
|
|
|
|
|
const select = this.$refs.xGrid.getCheckboxRecords()
|
|
|
|
|
@ -1722,6 +1727,10 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
cancelRemove () {
|
|
|
|
|
console.log('== 取消 ==')
|
|
|
|
|
},
|
|
|
|
|
pageClick () {
|
|
|
|
|
this.goodStatusShow = false
|
|
|
|
|
this.goodStatusData = null
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -2378,6 +2387,13 @@ export default {
|
|
|
|
|
white-space: normal;
|
|
|
|
|
text-align: left;
|
|
|
|
|
z-index: 999 !important;
|
|
|
|
|
transition: .5s all;
|
|
|
|
|
display: block;
|
|
|
|
|
opacity: 1;
|
|
|
|
|
&.hide-goods-hover{
|
|
|
|
|
display: none;
|
|
|
|
|
opacity: 0;
|
|
|
|
|
}
|
|
|
|
|
// overflow: auto;
|
|
|
|
|
&::before{
|
|
|
|
|
content: '';
|
|
|
|
|
|
