Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -15,6 +15,10 @@ 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']
+// let devModules = ['all']
+
 //let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint']
 let devModules = ['all']
 //let devModules=['index']

config/index.js

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

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -1820,17 +1820,23 @@ export default {
     //控制筛选数组变化
     filterListChange() {
       //客户筛选数组
-      let consigneeNameList = this.tableData.map(e => {
-        return e.consigneeName
-      })
+      let consigneeNameList = this.tableData
+        .map(e => {
+          return e.consigneeName
+        })
+        .sort()
       //承运商筛选数组
-      let carrierNameList = this.tableData.map(e => {
-        return e.carrierName
-      })
+      let carrierNameList = this.tableData
+        .map(e => {
+          return e.carrierName
+        })
+        .sort()
       //车牌号筛选数组
-      let capacityList = this.tableData.map(e => {
-        return e.newCapacityNo
-      })
+      let capacityList = this.tableData
+        .map(e => {
+          return e.newCapacityNo
+        })
+        .sort()
       //物资筛选数组
       let materialNameList = this.tableData
         .map(e => {
@@ -1839,6 +1845,7 @@ export default {
         .filter(e => {
           return e != null
         })
+        .sort()
       //销售片区筛选数组
       let saleAreaList = this.tableData
         .map(e => {
@@ -1854,6 +1861,7 @@ export default {
         .filter(e => {
           return e != null
         })
+        .sort()
       let orderStatusList = this.tableData
         .map(e => {
           return e.orderStatus
@@ -1868,12 +1876,15 @@ export default {
         .filter(e => {
           return e != null
         })
+        .sort()
       let saleOrderStatusList = this.tableData.map(e => {
         return e.saleOrderStatus
       })
-      let saleRemarkList = this.tableData.map(e => {
-        return e.saleRemark
-      })
+      let saleRemarkList = this.tableData
+        .map(e => {
+          return e.saleRemark
+        })
+        .sort()
       this.filterConsigneeList = []
       this.filterCarrierList = []
       this.filterCapacityList = []