Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

lazhen

2024-08-14 d3c703272a0387212b3a758c9df2430fcc5b7816

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def

@@ -98,7 +98,7 @@
      Properties:
      [
        Image: 'LOCATION_PIN'
        Label: 'Machine logistics cost report'
        Label: '机加物流成本报表'
        Taborder: 7
      ]
    }
@@ -146,6 +146,17 @@
        Taborder: 10
      ]
    }
    Component bDL_EngineRackReport
    {
      #keys: '[413988.0.1488511896]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'EARTH_LOCATION'
        Label: '大连发动机料架报表'
        Taborder: 11
      ]
    }
    Component ButtonEngineLogisticsCostReport
    {
      #keys: '[415136.0.989557433]'
@@ -158,7 +169,7 @@
      [
        Image: 'MONEY2'
        Label: '发动机物流成本报表'
        Taborder: 11
        Taborder: 12
      ]
    }
  ]