|
|
@@ -132,9 +132,28 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="saleOrderStatus"
|
|
|
+ label="销售订单状态"
|
|
|
+ width="100px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="consigneeName"
|
|
|
- label="下单客户"
|
|
|
+ label="客户"
|
|
|
+ width="160px"
|
|
|
+ align="center"
|
|
|
+ column-key="consigneeName"
|
|
|
+ :filters="filterConsigneeList"
|
|
|
+ :filter-method="filterConsignee"
|
|
|
+ sortable
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="areaName"
|
|
|
+ label="销售片区"
|
|
|
width="160px"
|
|
|
align="center"
|
|
|
show-overflow-tooltip
|
|
|
@@ -144,8 +163,11 @@
|
|
|
prop="carrierName"
|
|
|
label="承运商"
|
|
|
align="center"
|
|
|
- width="60px"
|
|
|
+ width="80px"
|
|
|
+ sortable
|
|
|
show-overflow-tooltip
|
|
|
+ :filters="filterCarrierList"
|
|
|
+ :filter-method="filterCarrier"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -156,6 +178,8 @@
|
|
|
width="90px"
|
|
|
sortable
|
|
|
show-overflow-tooltip
|
|
|
+ :filters="filterCapacityList"
|
|
|
+ :filter-method="filterCapacity"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -163,7 +187,10 @@
|
|
|
label="物资名称"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
+ sortable
|
|
|
show-overflow-tooltip
|
|
|
+ :filters="filtermaterialNameList"
|
|
|
+ :filter-method="filtermaterialName"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -186,6 +213,7 @@
|
|
|
prop="addressPlace"
|
|
|
label="收货地址"
|
|
|
width="250px"
|
|
|
+ sortable
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
@@ -260,6 +288,13 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="receiptTime"
|
|
|
+ label="抵达时间"
|
|
|
+ width="280px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="receiptAddress"
|
|
|
label="签收地址"
|
|
|
@@ -267,6 +302,13 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="arrivalTime"
|
|
|
+ label="签收时间"
|
|
|
+ width="280px"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="orderNo"
|
|
|
label="运输订单号"
|
|
|
@@ -316,13 +358,6 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="saleOrderStatus"
|
|
|
- label="销售订单状态"
|
|
|
- width="100px"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="closeEntryId"
|
|
|
label="金蝶分录ID"
|
|
|
@@ -385,7 +420,7 @@
|
|
|
<span>{{ steelMap.saler }}</span>
|
|
|
</div>
|
|
|
<div class="steelMapClass12">
|
|
|
- <span>下单客户:</span>
|
|
|
+ <span>客户:</span>
|
|
|
<span>{{ steelMap.consigneeName }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -736,6 +771,7 @@ import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
|
|
|
import { getCookie } from '@/utils/util.js'
|
|
|
import PathView from './mapTest.vue'
|
|
|
import currentLocation from './currentLocation.vue'
|
|
|
+import newNoticeVue from '../../../sale/components/dilNotice/newNotice.vue'
|
|
|
export default {
|
|
|
components: {
|
|
|
PathView,
|
|
|
@@ -758,8 +794,8 @@ export default {
|
|
|
screen1: '',
|
|
|
options: [
|
|
|
{
|
|
|
- value: '下单客户',
|
|
|
- lable: '下单客户'
|
|
|
+ value: '客户',
|
|
|
+ lable: '客户'
|
|
|
},
|
|
|
{
|
|
|
value: '承运商',
|
|
|
@@ -776,8 +812,8 @@ export default {
|
|
|
],
|
|
|
options1: [
|
|
|
{
|
|
|
- value: '下单客户',
|
|
|
- lable: '下单客户'
|
|
|
+ value: '客户',
|
|
|
+ lable: '客户'
|
|
|
},
|
|
|
{
|
|
|
value: '承运商',
|
|
|
@@ -798,6 +834,8 @@ export default {
|
|
|
capacityList: [],
|
|
|
carrierList: [],
|
|
|
tableData: [],
|
|
|
+ //筛选条件1（客户）
|
|
|
+ filters1: [],
|
|
|
spanArr: [],
|
|
|
pos: 0,
|
|
|
//需要合并列的名称
|
|
|
@@ -816,7 +854,7 @@ export default {
|
|
|
'运单状态',
|
|
|
'车牌号',
|
|
|
'承运商',
|
|
|
- '下单客户',
|
|
|
+ '客户',
|
|
|
'收货地址',
|
|
|
'业务员',
|
|
|
'送货单打印',
|
|
|
@@ -892,7 +930,11 @@ export default {
|
|
|
'xiaoshouyewuyuan',
|
|
|
'zidonghuabu'
|
|
|
],
|
|
|
- isShowOperate: false
|
|
|
+ isShowOperate: false,
|
|
|
+ filterConsigneeList: [],
|
|
|
+ filterCarrierList: [],
|
|
|
+ filterCapacityList: [],
|
|
|
+ filtermaterialNameList: []
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -901,6 +943,16 @@ export default {
|
|
|
}
|
|
|
this.getSteelReport()
|
|
|
},
|
|
|
+ watch: {
|
|
|
+ tableData: {
|
|
|
+ handler(oldVal, newVal) {
|
|
|
+ this.filterListChange()
|
|
|
+ },
|
|
|
+ deep: true,
|
|
|
+ immediate: true
|
|
|
+ }
|
|
|
+ },
|
|
|
+ computed: {},
|
|
|
mounted() {
|
|
|
this.$nextTick(() => {
|
|
|
window.onresize = () => {
|
|
|
@@ -915,6 +967,67 @@ export default {
|
|
|
},
|
|
|
computed: {},
|
|
|
methods: {
|
|
|
+ //控制筛选数组变化
|
|
|
+ filterListChange() {
|
|
|
+ let consigneeNameList = this.tableData.map(e => {
|
|
|
+ return e.consigneeName
|
|
|
+ })
|
|
|
+ let carrierNameList = this.tableData
|
|
|
+ .map(e => {
|
|
|
+ return e.carrierName
|
|
|
+ })
|
|
|
+ .filter(e => {
|
|
|
+ return e != null
|
|
|
+ })
|
|
|
+ let capacityList = this.tableData
|
|
|
+ .map(e => {
|
|
|
+ return e.capacityNo
|
|
|
+ })
|
|
|
+ .filter(e => {
|
|
|
+ return e != null
|
|
|
+ })
|
|
|
+ let materialNameList = this.tableData
|
|
|
+ .map(e => {
|
|
|
+ return e.materialName
|
|
|
+ })
|
|
|
+ .filter(e => {
|
|
|
+ return e != null
|
|
|
+ })
|
|
|
+
|
|
|
+ Array.from(new Set(consigneeNameList)).forEach(e => {
|
|
|
+ let map = {}
|
|
|
+ map.text = e
|
|
|
+ map.value = e
|
|
|
+ this.filterConsigneeList.push(map)
|
|
|
+ })
|
|
|
+ Array.from(new Set(carrierNameList)).forEach(e => {
|
|
|
+ let map = {}
|
|
|
+ map.text = e
|
|
|
+ map.value = e
|
|
|
+ this.filterCarrierList.push(map)
|
|
|
+ })
|
|
|
+ Array.from(new Set(capacityList)).forEach(e => {
|
|
|
+ let map = {}
|
|
|
+ map.text = e
|
|
|
+ map.value = e
|
|
|
+ this.filterCapacityList.push(map)
|
|
|
+ })
|
|
|
+ Array.from(new Set(materialNameList)).forEach(e => {
|
|
|
+ let map = {}
|
|
|
+ map.text = e
|
|
|
+ map.value = e
|
|
|
+ this.filtermaterialNameList.push(map)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ filterConsignee(value, row) {
|
|
|
+ return row.consigneeName === value
|
|
|
+ },
|
|
|
+ filterCarrier(value, row) {
|
|
|
+ return row.carrierName === value
|
|
|
+ },
|
|
|
+ filterCapacity(value, row) {
|
|
|
+ return row.capacityNo === value
|
|
|
+ },
|
|
|
cellStyle({ row, column, rowIndex, columnIndex }) {
|
|
|
if (
|
|
|
column.property == 'arrivalAddress' ||
|
|
|
@@ -1801,7 +1914,7 @@ export default {
|
|
|
if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
|
|
|
saler = getCookie('loginName')
|
|
|
}
|
|
|
- if (this.screen == '下单客户') {
|
|
|
+ if (this.screen == '客户') {
|
|
|
consigneeName = this.input
|
|
|
} else if (this.screen == '承运商') {
|
|
|
carrierName = this.input
|
|
|
@@ -1812,7 +1925,7 @@ export default {
|
|
|
} else {
|
|
|
remark = this.input
|
|
|
}
|
|
|
- if (this.screen1 == '下单客户') {
|
|
|
+ if (this.screen1 == '客户') {
|
|
|
consigneeName = this.input1
|
|
|
} else if (this.screen1 == '承运商') {
|
|
|
carrierName = this.input1
|
|
|
@@ -1846,6 +1959,9 @@ export default {
|
|
|
)
|
|
|
.then(res => {
|
|
|
this.tableData = res.data.data
|
|
|
+ this.filters1 = res.data.data.consigneeName
|
|
|
+ console.log('客户数据')
|
|
|
+ console.log(res.data.data.consigneeName)
|
|
|
this.getSpanArr(res.data.data)
|
|
|
loading.close()
|
|
|
})
|
|
|
@@ -1875,7 +1991,7 @@ export default {
|
|
|
if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
|
|
|
saler = getCookie('loginName')
|
|
|
}
|
|
|
- if (this.screen == '下单客户') {
|
|
|
+ if (this.screen == '客户') {
|
|
|
consigneeName = this.input
|
|
|
} else if (this.screen == '承运商') {
|
|
|
carrierName = this.input
|
luobang