修改提交

metadata/com/kingdee/eas/hr/project/MemberManagement.bizunit

@@ -101,9 +101,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.MemberManagementListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.MemberManagement].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="6" />
-            <lang locale="zh_CN" value="6" />
-            <lang locale="zh_TW" value="6" />
+            <lang locale="en_US" value="8" />
+            <lang locale="zh_CN" value="8" />
+            <lang locale="zh_TW" value="8" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.MemberManagement].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

metadata/com/kingdee/eas/hr/project/app/CT_PRO_MemberManagement.table

@@ -365,12 +365,40 @@
             <isMultilingual>false</isMultilingual>
             <isEncoded>false</isEncoded>
             <isNullable>false</isNullable>
-            <defaultValue />
+            <defaultValue>''</defaultValue>
             <sqlType>VARCHAR</sqlType>
             <length>44</length>
             <scale>0</scale>
             <precision>44</precision>
         </column>
+        <column>
+            <name>CFState</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFState].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFState].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>INT</sqlType>
+            <length>0</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
+        <column>
+            <name>CFProjectManagemenID</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagemenID].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagemenID].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>VARCHAR</sqlType>
+            <length>44</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
     </columns>
     <primaryKey>
         <name>PK_MemberManagemen</name>
@@ -557,6 +585,25 @@
                 </fkColumnPair>
             </fkColumnPairs>
         </foreignKey>
+        <foreignKey>
+            <name>CFK_PRO_PROMMRjcud</name>
+            <userDefined>true</userDefined>
+            <refTable>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="CT_PRO_ProjectManagement" />
+            </refTable>
+            <fkColumnPairs>
+                <fkColumnPair>
+                    <sequence>0</sequence>
+                    <refColumn>
+                        <key name="name" value="FID" />
+                    </refColumn>
+                    <fkColumn>
+                        <key name="name" value="CFProjectManagemenID" />
+                    </fkColumn>
+                </fkColumnPair>
+            </fkColumnPairs>
+        </foreignKey>
     </foreignKeys>
     <resource>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].alias">
@@ -601,15 +648,16 @@
             <lang locale="zh_HK" value="項目編碼" />
             <lang locale="zh_TW" value="項目編碼" />
         </rs>
-        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagementID].alias">
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagemenID].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目管理" />
             <lang locale="zh_HK" value="項目管理" />
             <lang locale="zh_TW" value="項目管理" />
         </rs>
-        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagementID].description">
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectManagemenID].description">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
             <lang locale="zh_TW" value="項目管理" />
         </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFProjectName].alias">
@@ -636,6 +684,18 @@
             <lang locale="zh_HK" value="項目角色" />
             <lang locale="zh_TW" value="項目角色" />
         </rs>
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFState].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="是否状态" />
+            <lang locale="zh_HK" value="是否狀態" />
+            <lang locale="zh_TW" value="是否狀態" />
+        </rs>
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[CFState].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="是否状态" />
+            <lang locale="zh_HK" value="是否狀態" />
+            <lang locale="zh_TW" value="是否狀態" />
+        </rs>
         <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_MemberManagement].columns.column[FAdminOrgUnitId].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="行政组织" />

metadata/com/kingdee/eas/hr/project/app/CT_PRO_MemberManagementEntry.table

@@ -43,7 +43,7 @@
             <isMultilingual>false</isMultilingual>
             <isEncoded>false</isEncoded>
             <isNullable>false</isNullable>
-            <defaultValue />
+            <defaultValue>''</defaultValue>
             <sqlType>VARCHAR</sqlType>
             <length>44</length>
             <scale>0</scale>
@@ -51,7 +51,7 @@
         </column>
     </columns>
     <primaryKey>
-        <name>PK_MemberManagemen</name>
+        <name>PK_MemberManageEn</name>
         <userDefined>true</userDefined>
         <primaryKeyColumns>
             <primaryKeyColumn>

metadata/com/kingdee/eas/hr/project/app/MemberManagement.entity

@@ -332,6 +332,26 @@
                 <key name="name" value="CFNotes" />
             </mappingField>
         </ownProperty>
+        <ownProperty>
+            <name>state</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>Enum</dataType>
+            <metadataRef>com.kingdee.shr.base.syssetting.BaseItemStateEnum</metadataRef>
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>80</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFState" />
+            </mappingField>
+        </ownProperty>
         <linkProperty>
             <name>projectManagement</name>
             <alias>entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].alias</alias>
@@ -339,11 +359,11 @@
             <userDefined>true</userDefined>
             <configured>false</configured>
             <mappingField>
-                <key name="name" value="CFProjectManagementID" />
+                <key name="name" value="CFProjectManagemenID" />
             </mappingField>
             <relationship>
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
-                <key name="name" value="R_MemberManagement_ProjectManagement_entrys" />
+                <key name="name" value="R_MemberManagement_ProjectManagement_projectManagement" />
             </relationship>
         </linkProperty>
     </properties>
@@ -951,9 +971,49 @@
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].description">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
+            <lang locale="zh_TW" value="項目管理" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.ColWidthInKDTable">
+            <lang locale="en_US" value="50" />
+            <lang locale="zh_CN" value="50" />
+            <lang locale="zh_TW" value="50" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.dataField">
+            <lang locale="en_US" value="projectName" />
+            <lang locale="zh_CN" value="projectName" />
+            <lang locale="zh_TW" value="projectName" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isForGrouping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isForMapping">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isForMatching">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isForWrittenBack">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isInCode">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectManagement].extendedProperty.isVisibleForKDTable">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.linkProperty[projectRole].alias">
             <lang locale="en_US" value="null" />
@@ -1259,5 +1319,73 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="是否状态" />
+            <lang locale="zh_HK" value="是否狀態" />
+            <lang locale="zh_TW" value="是否狀態" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="NEW" />
+            <lang locale="zh_HK" value="NEW" />
+            <lang locale="zh_TW" value="NEW" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="是否状态" />
+            <lang locale="zh_HK" value="是否狀態" />
+            <lang locale="zh_TW" value="是否狀態" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.ColWidthInKDTable">
+            <lang locale="en_US" value="50" />
+            <lang locale="zh_CN" value="50" />
+            <lang locale="zh_TW" value="50" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.bizDataType">
+            <lang locale="en_US" value="ENUM" />
+            <lang locale="zh_CN" value="ENUM" />
+            <lang locale="zh_TW" value="ENUM" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.defaultValue">
+            <lang locale="en_US" value="NEW" />
+            <lang locale="zh_CN" value="NEW" />
+            <lang locale="zh_TW" value="NEW" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.enableFieldPermission">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.isForGrouping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.isForMapping">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.isForMatching">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.isForWrittenBack">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.isInCode">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagement].properties.ownProperty[state].extendedProperty.isVisibleForKDTable">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
     </resource>
 </entityObject>

metadata/com/kingdee/eas/hr/project/app/MemberManagementEntry.entity

@@ -217,6 +217,11 @@
             <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagementEntry].extendedProperty.genBusinessImplCode">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.MemberManagementEntry].logicalKey[id].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />

metadata/com/kingdee/eas/hr/project/app/MemberManagementQuery.query

@@ -113,6 +113,19 @@
                 <key name="name" value="Person" />
             </entityRef>
         </subEntity>
+        <subEntity>
+            <name>projectManagement</name>
+            <alias>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].subObjects.subEntity[projectManagement].alias</alias>
+            <userDefined>true</userDefined>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+            <entityRef>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectManagement" />
+            </entityRef>
+        </subEntity>
     </subObjects>
     <units>
         <propertyUnit>
@@ -1231,6 +1244,130 @@
                 <key name="name" value="MemberManagementQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>state</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[state].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Int</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>b4759d1a-93f3-4f0b-b128-566ebf51f301</key>
+                    <parentUnit>
+                        <key name="name" value="state" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="MemberManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="state" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </queryField>
+        <queryField>
+            <name>projectManagement.projectName</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>4e7390cb-3b74-4865-ad12-713402c479ca</key>
+                    <parentUnit>
+                        <key name="name" value="projectManagement.projectName" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="projectManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="projectName" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </queryField>
+        <propertyUnit>
+            <name>e005d01c-b842-47a8-bafc-01eb7d37d6ee</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[e005d01c-b842-47a8-bafc-01eb7d37d6ee].displayName</displayName>
+            <groupType />
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType />
+            <propertyRefs>
+                <propertyRef>
+                    <key>1d29f728-5af4-42a7-85e5-83caa8f6c49d</key>
+                    <parentUnit>
+                        <key name="name" value="e005d01c-b842-47a8-bafc-01eb7d37d6ee" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="MemberManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="projectManagement" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </propertyUnit>
+        <propertyUnit>
+            <name>9352d077-9a7c-4ac1-a537-4bd54fda31a0</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[9352d077-9a7c-4ac1-a537-4bd54fda31a0].displayName</displayName>
+            <groupType />
+            <isSelector>false</isSelector>
+            <isFilter>false</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType />
+            <propertyRefs>
+                <propertyRef>
+                    <key>e6ed6c1f-80be-49cb-873c-f4ae503a7a02</key>
+                    <parentUnit>
+                        <key name="name" value="9352d077-9a7c-4ac1-a537-4bd54fda31a0" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="projectManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="id" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </propertyUnit>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -1487,6 +1624,36 @@
                 <key name="name" value="MemberManagementQuery" />
             </query>
         </join>
+        <join>
+            <name>63a9c552-fa0d-486a-8928-583a5e79928b</name>
+            <formulaString>#0</formulaString>
+            <type>LEFT OUTER JOIN</type>
+            <leftObject>
+                <key name="name" value="MemberManagement" />
+            </leftObject>
+            <rightObject>
+                <key name="name" value="projectManagement" />
+            </rightObject>
+            <joinItems>
+                <joinItem>
+                    <name>7f4f11ed-ff67-4b72-87e5-a9754377cc59</name>
+                    <compareType>=</compareType>
+                    <leftField>
+                        <key name="name" value="e005d01c-b842-47a8-bafc-01eb7d37d6ee" />
+                    </leftField>
+                    <rightField>
+                        <key name="name" value="9352d077-9a7c-4ac1-a537-4bd54fda31a0" />
+                    </rightField>
+                    <join>
+                        <key name="name" value="63a9c552-fa0d-486a-8928-583a5e79928b" />
+                    </join>
+                </joinItem>
+            </joinItems>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="MemberManagementQuery" />
+            </query>
+        </join>
     </joins>
     <resource>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].alias">
@@ -1570,6 +1737,12 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].subObjects.subEntity[projectManagement].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].subObjects.subEntity[projectRole].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -1594,6 +1767,12 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[9352d077-9a7c-4ac1-a537-4bd54fda31a0].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[NewUnit0].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -1654,6 +1833,12 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[e005d01c-b842-47a8-bafc-01eb7d37d6ee].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.propertyUnit[fbfb6893-e0eb-45e3-afe2-cff6ee18f027].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -1885,6 +2070,27 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
+            <lang locale="zh_TW" value="項目管理" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].extendedProperty.isCommonQueryFilter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].extendedProperty.isCommonQuerySorter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectManagement.projectName].extendedProperty.isUsingF7">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[projectName].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目名称" />
@@ -1922,5 +2128,21 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[state].displayName">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="是否状态" />
+            <lang locale="zh_HK" value="是否狀態" />
+            <lang locale="zh_TW" value="是否狀態" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[state].extendedProperty.isCommonQueryFilter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.MemberManagementQuery].units.queryField[state].extendedProperty.isCommonQuerySorter">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
     </resource>
 </joinQuery>

metadata/com/kingdee/eas/hr/project/app/R_MemberManagement_ProjectManagement_projectManagement.relation

@@ -30,4 +30,3 @@
         </rs>
     </resource>
 </relationship>
-

metadata/com/kingdee/eas/hr/project/client/MemberManagementEditUI.ui

@@ -721,12 +721,12 @@
             </parent>
         </component>
         <component>
-            <name>kDLabelContainer1</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].alias</alias>
+            <name>contstate</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].alias</alias>
             <userDefined>true</userDefined>
             <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
             <isContainer>true</isContainer>
-            <constraints>441,61,270,19</constraints>
+            <constraints>0,0,270,19</constraints>
             <tabIndex>0</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
@@ -739,28 +739,77 @@
                 <property>
                     <name>boundLabelText</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelText].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelText].value</value>
                     <isMultiLan>true</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>boundLabelLength</name>
                     <type>int</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelLength].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelLength].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>boundLabelUnderline</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelUnderline].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelUnderline].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>visible</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[visible].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="CoreUI" />
+            </parent>
+        </component>
+        <component>
+            <name>contprojectManagement</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
+            <isContainer>true</isContainer>
+            <constraints>0,0,270,19</constraints>
+            <tabIndex>0</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <layoutInfo>
+                <name />
+                <type>LabelContainerLayout</type>
+                <value />
+            </layoutInfo>
+            <properties>
+                <property>
+                    <name>boundLabelText</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelText].value</value>
+                    <isMultiLan>true</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>boundLabelLength</name>
+                    <type>int</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelLength].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>boundLabelUnderline</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelUnderline].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>visible</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -1471,74 +1520,132 @@
             </propertyBindings>
         </component>
         <component>
-            <name>kDBizPromptBox1</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].alias</alias>
+            <name>state</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDComboBox</classType>
+            <isContainer>false</isContainer>
+            <constraints>7</constraints>
+            <tabIndex>27</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <properties>
+                <property>
+                    <name>visible</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>items</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[items].value</value>
+                    <isMultiLan>true</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+                <property>
+                    <name>required</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[required].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="contstate" />
+            </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>selectedItem</propertyName>
+                    <propertyType>java.lang.Object</propertyType>
+                    <bindingObject>editData</bindingObject>
+                    <bindingField>state</bindingField>
+                    <fieldType>com.kingdee.shr.base.syssetting.BaseItemStateEnum</fieldType>
+                    <accessType>2</accessType>
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
+        </component>
+        <component>
+            <name>prmtprojectManagement</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].alias</alias>
             <userDefined>true</userDefined>
             <classType>com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox</classType>
             <isContainer>false</isContainer>
             <constraints>7</constraints>
-            <tabIndex>0</tabIndex>
+            <tabIndex>28</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
-            <layoutInfo>
-                <name />
-                <type>XYLayout</type>
-                <value />
-            </layoutInfo>
             <properties>
                 <property>
                     <name>queryInfo</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[queryInfo].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[queryInfo].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>visible</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[visible].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>editable</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[editable].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[editable].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>displayFormat</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[displayFormat].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[displayFormat].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>editFormat</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[editFormat].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[editFormat].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>commitFormat</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[commitFormat].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[commitFormat].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
                 <property>
                     <name>required</name>
                     <type>boolean</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[required].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[required].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
             </properties>
             <parent>
-                <key name="name" value="kDLabelContainer1" />
+                <key name="name" value="contprojectManagement" />
             </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>data</propertyName>
+                    <propertyType>java.lang.Object</propertyType>
+                    <bindingObject>editData</bindingObject>
+                    <bindingField>projectManagement</bindingField>
+                    <fieldType>com.kingdee.eas.hr.project.ProjectManagementInfo</fieldType>
+                    <accessType>2</accessType>
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
         </component>
         <component>
             <name>btnTraceUp</name>
@@ -2589,6 +2696,36 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelLength].value">
+            <lang locale="en_US" value="100" />
+            <lang locale="zh_CN" value="100" />
+            <lang locale="zh_HK" value="100" />
+            <lang locale="zh_TW" value="100" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelText].value">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
+            <lang locale="zh_TW" value="項目管理" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[boundLabelUnderline].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectManagement].properties.property[visible].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contprojectName].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -2649,49 +2786,31 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].alias">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[commitFormat].value">
-            <lang locale="en_US" value="$number$" />
-            <lang locale="zh_CN" value="$number$" />
-            <lang locale="zh_HK" value="$number$" />
-            <lang locale="zh_TW" value="$number$" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[displayFormat].value">
-            <lang locale="en_US" value="$type$" />
-            <lang locale="zh_CN" value="$type$" />
-            <lang locale="zh_HK" value="$type$" />
-            <lang locale="zh_TW" value="$type$" />
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelLength].value">
+            <lang locale="en_US" value="100" />
+            <lang locale="zh_CN" value="100" />
+            <lang locale="zh_HK" value="100" />
+            <lang locale="zh_TW" value="100" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[editFormat].value">
-            <lang locale="en_US" value="$number$" />
-            <lang locale="zh_CN" value="$number$" />
-            <lang locale="zh_HK" value="$number$" />
-            <lang locale="zh_TW" value="$number$" />
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelText].value">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="是否状态" />
+            <lang locale="zh_HK" value="是否狀態" />
+            <lang locale="zh_TW" value="是否狀態" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[editable].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[boundLabelUnderline].value">
             <lang locale="en_US" value="true" />
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[queryInfo].value">
-            <lang locale="en_US" value="com.kingdee.eas.hr.project.app.ProjectRoleQuery" />
-            <lang locale="zh_CN" value="com.kingdee.eas.hr.project.app.ProjectRoleQuery" />
-            <lang locale="zh_HK" value="com.kingdee.eas.hr.project.app.ProjectRoleQuery" />
-            <lang locale="zh_TW" value="com.kingdee.eas.hr.project.app.ProjectRoleQuery" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[required].value">
-            <lang locale="en_US" value="false" />
-            <lang locale="zh_CN" value="false" />
-            <lang locale="zh_HK" value="false" />
-            <lang locale="zh_TW" value="false" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDBizPromptBox1].properties.property[visible].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[contstate].properties.property[visible].value">
             <lang locale="en_US" value="true" />
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_HK" value="true" />
@@ -2733,36 +2852,6 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].alias">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="null" />
-            <lang locale="zh_HK" value="null" />
-            <lang locale="zh_TW" value="null" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelLength].value">
-            <lang locale="en_US" value="100" />
-            <lang locale="zh_CN" value="100" />
-            <lang locale="zh_HK" value="100" />
-            <lang locale="zh_TW" value="100" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelText].value">
-            <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="项目管理" />
-            <lang locale="zh_HK" value="項目管理" />
-            <lang locale="zh_TW" value="項目管理" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[boundLabelUnderline].value">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_HK" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kDLabelContainer1].properties.property[visible].value">
-            <lang locale="en_US" value="true" />
-            <lang locale="zh_CN" value="true" />
-            <lang locale="zh_HK" value="true" />
-            <lang locale="zh_TW" value="true" />
-        </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[kdtEntrys].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
@@ -3014,6 +3103,54 @@
             <lang locale="zh_HK" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="项目管理" />
+            <lang locale="zh_HK" value="項目管理" />
+            <lang locale="zh_TW" value="項目管理" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[commitFormat].value">
+            <lang locale="en_US" value="$number$" />
+            <lang locale="zh_CN" value="$number$" />
+            <lang locale="zh_HK" value="$number$" />
+            <lang locale="zh_TW" value="$number$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[displayFormat].value">
+            <lang locale="en_US" value="$projectName$" />
+            <lang locale="zh_CN" value="$projectName$" />
+            <lang locale="zh_HK" value="$projectName$" />
+            <lang locale="zh_TW" value="$projectName$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[editFormat].value">
+            <lang locale="en_US" value="$number$" />
+            <lang locale="zh_CN" value="$number$" />
+            <lang locale="zh_HK" value="$number$" />
+            <lang locale="zh_TW" value="$number$" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[editable].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[queryInfo].value">
+            <lang locale="en_US" value="com.kingdee.eas.hr.project.app.ProjectManagementQuery" />
+            <lang locale="zh_CN" value="com.kingdee.eas.hr.project.app.ProjectManagementQuery" />
+            <lang locale="zh_HK" value="com.kingdee.eas.hr.project.app.ProjectManagementQuery" />
+            <lang locale="zh_TW" value="com.kingdee.eas.hr.project.app.ProjectManagementQuery" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[required].value">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_HK" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectManagement].properties.property[visible].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[prmtprojectRole].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="项目角色" />
@@ -3086,6 +3223,30 @@
             <lang locale="zh_HK" value="false" />
             <lang locale="zh_TW" value="false" />
         </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="是否状态" />
+            <lang locale="zh_HK" value="是否狀態" />
+            <lang locale="zh_TW" value="是否狀態" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[items].value">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum" />
+            <lang locale="zh_HK" value="[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum" />
+            <lang locale="zh_TW" value="[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[required].value">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_HK" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[state].properties.property[visible].value">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_HK" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.MemberManagementEditUI].components.component[txtDescription].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="参考信息" />

src/com/kingdee/eas/hr/project/AbstractMemberManagementInfo.java

@@ -91,17 +91,6 @@ public class AbstractMemberManagementInfo extends com.kingdee.eas.hr.base.HRBill
     {
         setString("notes", item);
     }
-    /**
-     * Object: 项目成员管理 's 项目管理 property 
-     */
-    public com.kingdee.eas.hr.project.ProjectManagementInfo getProjectManagement()
-    {
-        return (com.kingdee.eas.hr.project.ProjectManagementInfo)get("projectManagement");
-    }
-    public void setProjectManagement(com.kingdee.eas.hr.project.ProjectManagementInfo item)
-    {
-        put("projectManagement", item);
-    }
     /**
      * Object:项目成员管理's 是否状态property 
      */
@@ -115,6 +104,17 @@ public class AbstractMemberManagementInfo extends com.kingdee.eas.hr.base.HRBill
         setInt("state", item.getValue());
 		}
     }
+    /**
+     * Object: 项目成员管理 's 项目管理 property 
+     */
+    public com.kingdee.eas.hr.project.ProjectManagementInfo getProjectManagement()
+    {
+        return (com.kingdee.eas.hr.project.ProjectManagementInfo)get("projectManagement");
+    }
+    public void setProjectManagement(com.kingdee.eas.hr.project.ProjectManagementInfo item)
+    {
+        put("projectManagement", item);
+    }
     public BOSObjectType getBOSType()
     {
         return new BOSObjectType("B49500FE");

src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI.java

@@ -61,8 +61,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contprojectRole;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contemployee;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contnotes;
-    protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer1;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contstate;
+    protected com.kingdee.bos.ctrl.swing.KDLabelContainer contprojectManagement;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtCreator;
     protected com.kingdee.bos.ctrl.swing.KDDatePicker kDDateCreateTime;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtLastUpdateUser;
@@ -76,8 +76,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtprojectRole;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtemployee;
     protected com.kingdee.bos.ctrl.swing.KDTextField txtnotes;
-    protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox kDBizPromptBox1;
     protected com.kingdee.bos.ctrl.swing.KDComboBox state;
+    protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtprojectManagement;
     protected com.kingdee.eas.hr.project.MemberManagementInfo editData = null;
     /**
      * output class constructor
@@ -156,8 +156,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.contprojectRole = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.contemployee = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.contnotes = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
-        this.kDLabelContainer1 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.contstate = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
+        this.contprojectManagement = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.prmtCreator = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.kDDateCreateTime = new com.kingdee.bos.ctrl.swing.KDDatePicker();
         this.prmtLastUpdateUser = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
@@ -171,8 +171,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.prmtprojectRole = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.prmtemployee = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.txtnotes = new com.kingdee.bos.ctrl.swing.KDTextField();
-        this.kDBizPromptBox1 = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.state = new com.kingdee.bos.ctrl.swing.KDComboBox();
+        this.prmtprojectManagement = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.contCreator.setName("contCreator");
         this.contCreateTime.setName("contCreateTime");
         this.contLastUpdateUser.setName("contLastUpdateUser");
@@ -187,8 +187,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.contprojectRole.setName("contprojectRole");
         this.contemployee.setName("contemployee");
         this.contnotes.setName("contnotes");
-        this.kDLabelContainer1.setName("kDLabelContainer1");
         this.contstate.setName("contstate");
+        this.contprojectManagement.setName("contprojectManagement");
         this.prmtCreator.setName("prmtCreator");
         this.kDDateCreateTime.setName("kDDateCreateTime");
         this.prmtLastUpdateUser.setName("prmtLastUpdateUser");
@@ -202,8 +202,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.prmtprojectRole.setName("prmtprojectRole");
         this.prmtemployee.setName("prmtemployee");
         this.txtnotes.setName("txtnotes");
-        this.kDBizPromptBox1.setName("kDBizPromptBox1");
         this.state.setName("state");
+        this.prmtprojectManagement.setName("prmtprojectManagement");
         // CoreUI		
         this.btnTraceUp.setVisible(false);		
         this.btnTraceDown.setVisible(false);		
@@ -300,16 +300,16 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.contnotes.setBoundLabelLength(100);		
         this.contnotes.setBoundLabelUnderline(true);		
         this.contnotes.setVisible(true);
-        // kDLabelContainer1		
-        this.kDLabelContainer1.setBoundLabelText(resHelper.getString("kDLabelContainer1.boundLabelText"));		
-        this.kDLabelContainer1.setBoundLabelLength(100);		
-        this.kDLabelContainer1.setBoundLabelUnderline(true);		
-        this.kDLabelContainer1.setVisible(true);
         // contstate		
         this.contstate.setBoundLabelText(resHelper.getString("contstate.boundLabelText"));		
         this.contstate.setBoundLabelLength(100);		
         this.contstate.setBoundLabelUnderline(true);		
         this.contstate.setVisible(true);
+        // contprojectManagement		
+        this.contprojectManagement.setBoundLabelText(resHelper.getString("contprojectManagement.boundLabelText"));		
+        this.contprojectManagement.setBoundLabelLength(100);		
+        this.contprojectManagement.setBoundLabelUnderline(true);		
+        this.contprojectManagement.setVisible(true);
         // prmtCreator		
         this.prmtCreator.setEnabled(false);
         // kDDateCreateTime		
@@ -360,19 +360,19 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.txtnotes.setHorizontalAlignment(2);		
         this.txtnotes.setMaxLength(100);		
         this.txtnotes.setRequired(false);
-        // kDBizPromptBox1		
-        this.kDBizPromptBox1.setQueryInfo("com.kingdee.eas.hr.project.app.ProjectRoleQuery");		
-        this.kDBizPromptBox1.setVisible(true);		
-        this.kDBizPromptBox1.setEditable(true);		
-        this.kDBizPromptBox1.setDisplayFormat("$type$");		
-        this.kDBizPromptBox1.setEditFormat("$number$");		
-        this.kDBizPromptBox1.setCommitFormat("$number$");		
-        this.kDBizPromptBox1.setRequired(false);
         // state		
         this.state.setVisible(true);		
         this.state.addItems(EnumUtils.getEnumList("com.kingdee.shr.base.syssetting.BaseItemStateEnum").toArray());		
         this.state.setRequired(false);
-        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtprojectCode,txtprojectName,prmtprojectRole,prmtemployee,txtnotes,state}));
+        // prmtprojectManagement		
+        this.prmtprojectManagement.setQueryInfo("com.kingdee.eas.hr.project.app.ProjectManagementQuery");		
+        this.prmtprojectManagement.setVisible(true);		
+        this.prmtprojectManagement.setEditable(true);		
+        this.prmtprojectManagement.setDisplayFormat("$projectName$");		
+        this.prmtprojectManagement.setEditFormat("$number$");		
+        this.prmtprojectManagement.setCommitFormat("$number$");		
+        this.prmtprojectManagement.setRequired(false);
+        this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtprojectCode,txtprojectName,prmtprojectRole,prmtemployee,txtnotes,state,prmtprojectManagement}));
         this.setFocusCycleRoot(true);
 		//Register control's property binding
 		registerBindings();
@@ -429,10 +429,10 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         this.add(contemployee, null);
         contnotes.setBounds(new Rectangle(731, 61, 270, 19));
         this.add(contnotes, null);
-        kDLabelContainer1.setBounds(new Rectangle(441, 61, 270, 19));
-        this.add(kDLabelContainer1, null);
         contstate.setBounds(new Rectangle(0, 0, 270, 19));
         this.add(contstate, null);
+        contprojectManagement.setBounds(new Rectangle(0, 0, 270, 19));
+        this.add(contprojectManagement, null);
         //contCreator
         contCreator.setBoundEditor(prmtCreator);
         //contCreateTime
@@ -459,10 +459,10 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
         contemployee.setBoundEditor(prmtemployee);
         //contnotes
         contnotes.setBoundEditor(txtnotes);
-        //kDLabelContainer1
-        kDLabelContainer1.setBoundEditor(kDBizPromptBox1);
         //contstate
         contstate.setBoundEditor(state);
+        //contprojectManagement
+        contprojectManagement.setBoundEditor(prmtprojectManagement);
 
     }
 
@@ -654,7 +654,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
 		dataBinder.registerBinding("projectRole", com.kingdee.eas.hr.project.ProjectRoleInfo.class, this.prmtprojectRole, "data");
 		dataBinder.registerBinding("employee", com.kingdee.eas.basedata.person.PersonInfo.class, this.prmtemployee, "data");
 		dataBinder.registerBinding("notes", String.class, this.txtnotes, "text");
-		dataBinder.registerBinding("state", com.kingdee.shr.base.syssetting.BaseItemStateEnum.class, this.state, "selectedItem");		
+		dataBinder.registerBinding("state", com.kingdee.shr.base.syssetting.BaseItemStateEnum.class, this.state, "selectedItem");
+		dataBinder.registerBinding("projectManagement", com.kingdee.eas.hr.project.ProjectManagementInfo.class, this.prmtprojectManagement, "data");		
 	}
 	//Regiester UI State
 	private void registerUIState(){		
@@ -804,7 +805,8 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
 		getValidateHelper().registerBindProperty("projectRole", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("employee", ValidateHelper.ON_SAVE);    
 		getValidateHelper().registerBindProperty("notes", ValidateHelper.ON_SAVE);    
-		getValidateHelper().registerBindProperty("state", ValidateHelper.ON_SAVE);    		
+		getValidateHelper().registerBindProperty("state", ValidateHelper.ON_SAVE);    
+		getValidateHelper().registerBindProperty("projectManagement", ValidateHelper.ON_SAVE);    		
 	}
 
 
@@ -894,6 +896,15 @@ public abstract class AbstractMemberManagementEditUI extends com.kingdee.eas.fra
 		}
         sic.add(new SelectorItemInfo("notes"));
         sic.add(new SelectorItemInfo("state"));
+		if(selectorAll.equalsIgnoreCase("true"))
+		{
+			sic.add(new SelectorItemInfo("projectManagement.*"));
+		}
+		else{
+        	sic.add(new SelectorItemInfo("projectManagement.id"));
+        	sic.add(new SelectorItemInfo("projectManagement.number"));
+        	sic.add(new SelectorItemInfo("projectManagement.projectName"));
+		}
         return sic;
     }        
     	

src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI.properties

@@ -14,9 +14,9 @@ contprojectName.boundLabelText=\u9879\u76EE\u540D\u79F0
 contprojectRole.boundLabelText=\u9879\u76EE\u89D2\u8272
 contemployee.boundLabelText=\u5458\u5DE5
 contnotes.boundLabelText=\u5907\u6CE8
-kDLabelContainer1.boundLabelText=\u9879\u76EE\u7BA1\u7406
 contstate.boundLabelText=\u662F\u5426\u72B6\u6001
 state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum
+contprojectManagement.boundLabelText=\u9879\u76EE\u7BA1\u7406
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l1.properties

@@ -14,9 +14,9 @@ contprojectName.boundLabelText=
 contprojectRole.boundLabelText=
 contemployee.boundLabelText=
 contnotes.boundLabelText=
-kDLabelContainer1.boundLabelText=
 contstate.boundLabelText=
 state.items=
+contprojectManagement.boundLabelText=
 ActionSubmit.SHORT_DESCRIPTION=
 ActionSubmit.LONG_DESCRIPTION=
 ActionSubmit.NAME=

src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l2.properties

@@ -14,9 +14,9 @@ contprojectName.boundLabelText=\u9879\u76EE\u540D\u79F0
 contprojectRole.boundLabelText=\u9879\u76EE\u89D2\u8272
 contemployee.boundLabelText=\u5458\u5DE5
 contnotes.boundLabelText=\u5907\u6CE8
-kDLabelContainer1.boundLabelText=\u9879\u76EE\u7BA1\u7406
 contstate.boundLabelText=\u662F\u5426\u72B6\u6001
 state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum
+contprojectManagement.boundLabelText=\u9879\u76EE\u7BA1\u7406
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

src/com/kingdee/eas/hr/project/client/AbstractMemberManagementEditUI_l3.properties

@@ -14,9 +14,9 @@ contprojectName.boundLabelText=\u9805\u76EE\u540D\u7A31
 contprojectRole.boundLabelText=\u9805\u76EE\u89D2\u8272
 contemployee.boundLabelText=\u54E1\u5DE5
 contnotes.boundLabelText=\u5099\u8A3B
-kDLabelContainer1.boundLabelText=\u9805\u76EE\u7BA1\u7406
 contstate.boundLabelText=\u662F\u5426\u72C0\u614B
 state.items=[Enum]com.kingdee.shr.base.syssetting.BaseItemStateEnum
+contprojectManagement.boundLabelText=\u9805\u76EE\u7BA1\u7406
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4