luobang 2 tahun lalu
induk
melakukan
d4353fce14

+ 2 - 2
build/utils.js

@@ -15,8 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint','configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
-// let devModules = ['index', 'statisticalReport', 'queue']
-let devModules = ['all']
+let devModules = ['index', 'statisticalReport', 'queue']
+// let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

+ 2 - 2
config/index.js

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

+ 8 - 8
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -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=' +