zengyf 2 gadi atpakaļ
vecāks
revīzija
9bff369c58

+ 1 - 1
config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    //target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

+ 12 - 4
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -2799,6 +2799,7 @@ export default {
       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)
@@ -2810,9 +2811,13 @@ export default {
         saler = getCookie('loginName')
       }
       if (getCookie('orgCode') == 'shouhuokehu') {
-        consigneeSsoId = getCookie('userId')
-        obj.consigneeSsoId = consigneeSsoId
+        // consigneeSsoId = getCookie('userId')
+        // obj.consigneeSsoId = consigneeSsoId
+        consigneeLoginName = getCookie('loginName')
+        obj.consigneeLoginName = consigneeLoginName
       }
+      console.log("数据获取")
+      console.log(this.screen)
       if (this.screen == '客户') {
         consigneeName = this.input
       } else if (this.screen == '承运商') {
@@ -2994,6 +2999,7 @@ export default {
       let carrierName = null
       let consigneeName = null
       let consigneeSsoId = null
+      let consigneeLoginName = null
       let capacityNo = null
       let remark = null
       let saler = null
@@ -3008,8 +3014,10 @@ export default {
         saler = getCookie('loginName')
       }
       if (getCookie('orgCode') == 'shouhuokehu') {
-        consigneeSsoId = getCookie('userId')
-        this.filterMap.consigneeSsoId = consigneeSsoId
+        consigneeLoginName = getCookie('loginName')
+        this.filterMap.consigneeLoginName = consigneeLoginName
+        // consigneeSsoId = getCookie('userId')
+        // this.filterMap.consigneeSsoId = consigneeSsoId
       }
       if (this.screen == '客户') {
         consigneeName = this.input