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

admin

2025-01-22 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de

 _Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Component_pnlLeft#88.def

@@ -5,16 +5,6 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component efFactory
    {
      #keys: '[415136.0.1044211287]'
      BaseType: 'WebEditField'
      Properties:
      [
        Label: '工厂代码'
        Taborder: 0
      ]
    }
    Component dsStartDate
    {
      #keys: '[415136.0.1044211288]'
@@ -46,60 +36,37 @@
        Taborder: 5
      ]
    }
    Component ddlOriginMacroPlan
    Component efVersionFrom
    {
      #keys: '[415136.0.1043064647]'
      BaseType: 'WebDropDownList'
      Databinding: 'ScenarioMP'
      Children:
      [
        Component deMacroPlan id:deMacroPlan_640
        {
          #keys: '[415136.0.1043064648]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'ScenarioManager'
            Source: 'ScenarioManager'
            Taborder: 0
            Transformation: 'ScenarioMP'
          ]
        }
      ]
      #keys: '[415136.0.1047640864]'
      BaseType: 'WebEditField'
      Properties:
      [
        DisplayField: 'Name'
        Label: '从版本'
        Taborder: 3
      ]
    }
    Component ddlDestinationMacroPlan
    Component efVersionTo
    {
      #keys: '[415136.0.1043064790]'
      BaseType: 'WebDropDownList'
      Databinding: 'ScenarioMP'
      Children:
      [
        Component deMacroPlan950
        {
          #keys: '[415136.0.1043064791]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'ScenarioManager'
            Source: 'ScenarioManager'
            Taborder: 0
            Transformation: 'ScenarioMP'
          ]
        }
      ]
      #keys: '[415136.0.1047640919]'
      BaseType: 'WebEditField'
      Properties:
      [
        DisplayField: 'Name'
        Label: '到版本'
        Taborder: 4
      ]
    }
    Component ddslFactory
    {
      #keys: '[415136.0.1047641023]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        Label: '工厂代码'
        Strings: 'All;DL;CC'
        Taborder: 0
      ]
    }
  ]
  Properties:
  [