修改

build/utils.js

@@ -17,9 +17,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 // let devModules = ['all']
-// let devModules = ['index', 'statisticalReport']
-// let devModules = ['all']
-let devModules = ['index', 'OYE', 'RMS']
+// let devModules = ['index', 'OYE', 'statisticalReport']
+let devModules = ['all']
+// let devModules = ['index', 'OYE', 'RMS']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

src/views/OYE/components/oYeInbound.vue

@@ -211,6 +211,9 @@ export default {
       if (this.orgCode == 'xiaoshouyewuyuan') {
         queryMap['saler'] = getCookie('loginName')
       }
+      if (this.orgCode == 'ouyechangwaiku') {
+        queryMap['inboundWarehouse'] = this.inboundWarehouse
+      }
       if (Object.keys(this.queryMap).length > 0) {
         queryMap = { ...queryMap, ...this.queryMap }
       }

src/views/OYE/components/oYeOutbound.vue

@@ -200,6 +200,9 @@ export default {
       if (Object.keys(this.queryMap).length > 0) {
         queryMap = { ...queryMap, ...this.queryMap }
       }
+      if (this.orgCode == 'ouyechangwaiku') {
+        queryMap['inboundWarehouse'] = this.inboundWarehouse
+      }
       this.options.requestQuery = JSON.parse(JSON.stringify(queryMap))
     },
     search() {

src/views/RMS/components/rmsDirectlySentCity.vue

@@ -134,7 +134,8 @@ export default {
   data() {
     return {
       options: {
-        requestUrl: '/api/v1/rms/getDirectlySentCity?apiId=528'
+        requestUrl: '/api/v1/rms/getDirectlySentCity?apiId=528',
+        requestQuery: {}
       },
       con: '',
       visible: false,
@@ -261,7 +262,7 @@ export default {
             console.log(e, 'e')
             Object.keys(e).forEach(e1 => {
               if (e1.includes('摘要备注')) {
-                map.directlySentName = e[e1]
+                map.directlySentName = e[e1].replace('，', ',')
               }
               if (e1.includes('省')) {
                 map.provinceName = e[e1]
@@ -375,6 +376,9 @@ export default {
         this.con +
         '&i=' +
         new Date()
+      this.options.requestQuery = {
+        flag: 'rms'
+      }
     },
     insert() {
       this.visible = true
@@ -436,6 +440,9 @@ export default {
     },
     makeSure() {
       console.log(this.tableData)
+      this.tableData.forEach(item => {
+        item.directlySentName = item.directlySentName.replace('，', ',')
+      })
       let map = {
         userName: getCookie('loginName'),
         mapList: this.tableData

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

@@ -2744,18 +2744,20 @@ export default {
           map.theoryWeight = e.netWeight
         }
         let reg = /钢材.*组/g
-        let reg1 = /直发.*(,|\s){0,1}/
+
         let saleArea = e.saleRemarkByasm.replace('，', ',').match(reg)[0]
-        let directly = e.saleRemarkByasm.replace('，', ',').match(reg1)
+        let directly = e.saleRemarkByasm.replace('，', ',').split(',')[1]
+        console.log(directly, 'directly')
         if (saleArea != null) {
           map.saleArea = saleArea
         }
-        if (directly != null && directly.length > 0) {
-          map.saleArea =
-            map.saleArea + ',' + directly[0].toString().replace(',', '')
+        if (directly != null && directly != '') {
+          map.saleArea = map.saleArea + ',' + directly
         }
         return map
       })
+      console.log(arr)
+      return
       if (!item.addressPlace.includes(item.inboundWarehouse)) {
         this.$confirm('所填仓库与下货地址不匹配,是否继续', '提示', {
           cancelButtonText: '取消',