|
|
@@ -98,7 +98,7 @@
|
|
|
><i class="el-icon-map-location"></i>实时路径</el-button
|
|
|
>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item v-if="isShowOperate">
|
|
|
<el-button type="primary" @click="openReceive()">
|
|
|
<i class="el-icon-document"></i>签收抵达</el-button
|
|
|
>
|
|
|
@@ -244,6 +244,23 @@
|
|
|
:filters="filterorderStatus"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="saleRemark"
|
|
|
+ column-key="saleRemark"
|
|
|
+ label="摘要"
|
|
|
+ width="150px"
|
|
|
+ align="center"
|
|
|
+ :filters="filterSaleRemark"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="capacityTel"
|
|
|
+ label="司机电话"
|
|
|
+ width="120px"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="queueStartTime"
|
|
|
label="排队开始时间"
|
|
|
@@ -348,13 +365,7 @@
|
|
|
align="center"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="capacityTel"
|
|
|
- label="司机电话"
|
|
|
- width="120px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
+
|
|
|
<el-table-column prop="saler" label="业务员" align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -373,13 +384,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="isSelfMention" label="是否自提" align="center">
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="saleRemark"
|
|
|
- label="摘要"
|
|
|
- width="100px"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="saleOrderNo"
|
|
|
label="销售订单号"
|
|
|
@@ -1260,7 +1265,6 @@ export default {
|
|
|
'wuliuyunshubu',
|
|
|
'dagangadmin',
|
|
|
'shichangxinxibu',
|
|
|
- 'xiaoshouyewuyuan',
|
|
|
'zidonghuabu',
|
|
|
'chengyunshang'
|
|
|
],
|
|
|
@@ -1273,6 +1277,7 @@ export default {
|
|
|
filterorderStatus: [],
|
|
|
filteraddressPlace: [],
|
|
|
filtermaterialSpe: [],
|
|
|
+ filterSaleRemark: [],
|
|
|
filterSaleOrderStatus: [],
|
|
|
filterMap: {},
|
|
|
//权限控制
|
|
|
@@ -1760,6 +1765,12 @@ export default {
|
|
|
) {
|
|
|
delete this.filterMap.saleOrderStatusList
|
|
|
}
|
|
|
+ if (typeof obj.saleRemark != 'undefined' && obj.saleRemark.length > 0) {
|
|
|
+ this.filterMap.saleRemarkList = obj.saleRemark
|
|
|
+ }
|
|
|
+ if (typeof obj.saleRemark != 'undefined' && obj.saleRemark.length == 0) {
|
|
|
+ delete this.filterMap.saleRemarkList
|
|
|
+ }
|
|
|
// if (obj)
|
|
|
this.onclick(this.filterMap)
|
|
|
},
|
|
|
@@ -1817,6 +1828,9 @@ export default {
|
|
|
let saleOrderStatusList = this.tableData.map(e => {
|
|
|
return e.saleOrderStatus
|
|
|
})
|
|
|
+ let saleRemarkList = this.tableData.map(e => {
|
|
|
+ return e.saleRemark
|
|
|
+ })
|
|
|
this.filterConsigneeList = []
|
|
|
this.filterCarrierList = []
|
|
|
this.filterCapacityList = []
|
|
|
@@ -1826,6 +1840,7 @@ export default {
|
|
|
this.filteraddressPlace = []
|
|
|
this.filtermaterialSpe = []
|
|
|
this.filterSaleOrderStatus = []
|
|
|
+ this.filterSaleRemark = []
|
|
|
Array.from(new Set(consigneeNameList)).forEach(e => {
|
|
|
let map = {}
|
|
|
map.text = e
|
|
|
@@ -1880,6 +1895,12 @@ export default {
|
|
|
map.value = e
|
|
|
this.filterSaleOrderStatus.push(map)
|
|
|
})
|
|
|
+ Array.from(new Set(saleRemarkList)).forEach(e => {
|
|
|
+ let map = {}
|
|
|
+ map.text = e
|
|
|
+ map.value = e
|
|
|
+ this.filterSaleRemark.push(map)
|
|
|
+ })
|
|
|
},
|
|
|
cellStyle({ row, column, rowIndex, columnIndex }) {
|
|
|
if (
|
|
|
@@ -2227,22 +2248,22 @@ export default {
|
|
|
if (res.data.code == 200) {
|
|
|
this.$message.success('变更车牌号成功!')
|
|
|
this.operation(this.steelMap)
|
|
|
- console.log("更改车牌号之后的变化")
|
|
|
+ console.log('更改车牌号之后的变化')
|
|
|
console.log(res.data)
|
|
|
- if(res.data.data.capacityTel != 0){
|
|
|
- console.log("进入了这个界面")
|
|
|
- this.steelMap.capacityTel=res.data.data.capacityTel
|
|
|
- }else{
|
|
|
+ if (res.data.data.capacityTel != 0) {
|
|
|
+ console.log('进入了这个界面')
|
|
|
+ this.steelMap.capacityTel = res.data.data.capacityTel
|
|
|
+ } else {
|
|
|
this.axios
|
|
|
- .post(
|
|
|
- '/api/v1/ams/matchingDriverTelRecently?capacityNumber=' +
|
|
|
- this.steelMap.capacityNo
|
|
|
- )
|
|
|
- .then(res => {
|
|
|
- if (res.data.data != null) {
|
|
|
- this.steelMap.capacityTel = res.data.data
|
|
|
- }
|
|
|
- })
|
|
|
+ .post(
|
|
|
+ '/api/v1/ams/matchingDriverTelRecently?capacityNumber=' +
|
|
|
+ this.steelMap.capacityNo
|
|
|
+ )
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.data != null) {
|
|
|
+ this.steelMap.capacityTel = res.data.data
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
this.updateDriverTel()
|
|
|
this.getSteelReport()
|
|
|
@@ -2326,8 +2347,8 @@ export default {
|
|
|
loading.close()
|
|
|
return
|
|
|
}
|
|
|
- var regex=/^[1][2,3,4,5,6,7,8,9][0-9]{9}$/
|
|
|
- if(!regex.test(this.steelMap.capacityTel)){
|
|
|
+ var regex = /^[1][2,3,4,5,6,7,8,9][0-9]{9}$/
|
|
|
+ if (!regex.test(this.steelMap.capacityTel)) {
|
|
|
this.$message.error('电话号码不符合规则')
|
|
|
loading.close()
|
|
|
return
|
|
|
@@ -2883,6 +2904,7 @@ export default {
|
|
|
let carrierSsoId = null
|
|
|
let carrierName = null
|
|
|
let consigneeName = null
|
|
|
+ let consigneeSsoId = null
|
|
|
let capacityNo = null
|
|
|
let remark = null
|
|
|
let saler = null
|
|
|
@@ -2896,6 +2918,10 @@ export default {
|
|
|
if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
|
|
|
saler = getCookie('loginName')
|
|
|
}
|
|
|
+ if (getCookie('orgCode') == 'shouhuokehu') {
|
|
|
+ consigneeSsoId = getCookie('userId')
|
|
|
+ this.filterMap.consigneeSsoId = consigneeSsoId
|
|
|
+ }
|
|
|
if (this.screen == '客户') {
|
|
|
consigneeName = this.input
|
|
|
} else if (this.screen == '承运商') {
|
|
|
@@ -2920,6 +2946,7 @@ export default {
|
|
|
if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
|
|
|
saler = getCookie('loginName')
|
|
|
}
|
|
|
+
|
|
|
this.axios
|
|
|
.post(
|
|
|
'/api/v1/tms/getSaleSteelReport?startTime=' +
|
|
|
@@ -2939,7 +2966,8 @@ export default {
|
|
|
'&carrierName=' +
|
|
|
carrierName +
|
|
|
'&capacityNo=' +
|
|
|
- capacityNo
|
|
|
+ capacityNo,
|
|
|
+ this.filterMap
|
|
|
)
|
|
|
.then(res => {
|
|
|
this.tableData = res.data.data
|
zengyf