|
@@ -2816,7 +2816,7 @@ export default {
|
|
|
let remark = null
|
|
|
let saler = null
|
|
|
let easPrimaryId = null
|
|
|
- let consigneeSsoId = null
|
|
|
+ let consigneeLoginName = null
|
|
|
if (this.startTime && this.endTime) {
|
|
|
startTime = sjTime(this.startTime)
|
|
|
endTime = sjTime(this.endTime)
|
|
@@ -2828,8 +2828,8 @@ export default {
|
|
|
saler = getCookie('loginName')
|
|
|
}
|
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
|
- consigneeSsoId = getCookie('userId')
|
|
|
- obj.consigneeSsoId = consigneeSsoId
|
|
|
+ consigneeLoginName = getCookie('loginName')
|
|
|
+ obj.consigneeLoginName = consigneeLoginName
|
|
|
}
|
|
|
if (this.screen == '客户') {
|
|
|
consigneeName = this.input
|
|
@@ -2905,6 +2905,7 @@ export default {
|
|
|
let carrierName = null
|
|
|
let consigneeName = null
|
|
|
let consigneeSsoId = null
|
|
|
+ let consigneeLoginName = null
|
|
|
let capacityNo = null
|
|
|
let remark = null
|
|
|
let saler = null
|
|
@@ -2919,8 +2920,8 @@ export default {
|
|
|
saler = getCookie('loginName')
|
|
|
}
|
|
|
if (getCookie('orgCode') == 'shouhuokehu') {
|
|
|
- consigneeSsoId = getCookie('userId')
|
|
|
- this.filterMap.consigneeSsoId = consigneeSsoId
|
|
|
+ consigneeLoginName = getCookie('loginName')
|
|
|
+ this.filterMap.consigneeLoginName = consigneeLoginName
|
|
|
}
|
|
|
if (this.screen == '客户') {
|
|
|
consigneeName = this.input
|
|
@@ -2933,9 +2934,9 @@ export default {
|
|
|
}
|
|
|
if (this.screen1 == '下单客户') {
|
|
|
consigneeName = this.input1
|
|
|
- } else if (this.screen == '承运商') {
|
|
|
+ } else if (this.screen1 == '承运商') {
|
|
|
carrierName = this.input1
|
|
|
- } else if (this.screen == '车牌号') {
|
|
|
+ } else if (this.screen1 == '车牌号') {
|
|
|
capacityNo = this.input1
|
|
|
} else {
|
|
|
remark = this.input1
|
|
@@ -2946,7 +2947,6 @@ export default {
|
|
|
if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
|
|
|
saler = getCookie('loginName')
|
|
|
}
|
|
|
-
|
|
|
this.axios
|
|
|
.post(
|
|
|
'/api/v1/tms/getSaleSteelReport?startTime=' +
|