From fd58c70e0631bdd09806ead43a573ced43f704f1 Mon Sep 17 00:00:00 2001
From: limj <limj@taizhitech.com>
Date: 星期日, 08 十月 2023 19:57:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lmj
---
_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def
index 911ba95..f2ee867 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def
@@ -70,7 +70,7 @@
DataBinding: 'DataHolderFillingCapacityOrder.Data.Quantity'
Label: '鏁伴噺'
Mask: 'REAL'
- Taborder: 12
+ Taborder: 13
]
}
Component dropDownStringListUnitOfMeasureName id:dropDownStringListUnitOfMeasureName_750
@@ -97,7 +97,7 @@
DataBinding: 'DataHolderFillingCapacityOrder.Data.SalesAmount'
Label: '閿�鍞'
Mask: 'NUMBER'
- Taborder: 13
+ Taborder: 14
]
}
Component dsDemandDate
@@ -108,7 +108,7 @@
[
DataBinding: 'DataHolderFillingCapacityOrder.Data.DemandDate'
Label: '闇�姹傛棩鏈�'
- Taborder: 15
+ Taborder: 16
]
}
Component dsForecastDemandDate
@@ -119,7 +119,7 @@
[
DataBinding: 'DataHolderFillingCapacityOrder.Data.ForecastDemandDate'
Label: '棰勬湡闇�姹傛棩鏈�'
- Taborder: 14
+ Taborder: 15
]
}
Component ddlSalesSegment
@@ -268,7 +268,7 @@
[
DataBinding: 'DataHolderFillingCapacityOrder.Data.Customer'
Label: 'Customer name'
- Taborder: 10
+ Taborder: 11
]
}
Component efCustomID
@@ -278,7 +278,7 @@
Properties:
[
Label: 'Customer ID'
- Taborder: 11
+ Taborder: 12
]
}
Component ddslOrderType
@@ -290,7 +290,34 @@
DataBinding: 'DataHolderFillingCapacityOrder.Data.OrderType'
Label: '璁㈠崟绫诲瀷'
Strings: '鍙嶇;鎺堟潈'
- Taborder: 16
+ Taborder: 17
+ ]
+ }
+ Component ddlCurrency_MP
+ {
+ #keys: '[414502.0.395021898]'
+ BaseType: 'WebDropDownList'
+ Databinding: 'Currency_MP'
+ Children:
+ [
+ Component deContent593
+ {
+ #keys: '[414502.0.395021900]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'Currency_MP'
+ ]
+ }
+ ]
+ Properties:
+ [
+ DisplayField: 'Name'
+ Label: '璐у竵'
+ Taborder: 10
]
}
]
--
Gitblit v1.9.3