wanyong:

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

@@ -104,9 +104,6 @@
             <lang locale="en_US" value="14" />
             <lang locale="zh_CN" value="14" />
             <lang locale="zh_TW" value="14" />
-            <lang locale="en_US" value="13" />
-            <lang locale="zh_CN" value="13" />
-            <lang locale="zh_TW" value="13" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectManagement].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

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

@@ -49,6 +49,20 @@
             <scale>0</scale>
             <precision>100</precision>
         </column>
+        <column>
+            <name>CFProjectLevel</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectLevel].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectLevel].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue>'projectLevel1'</defaultValue>
+            <sqlType>VARCHAR</sqlType>
+            <length>100</length>
+            <scale>0</scale>
+            <precision>100</precision>
+        </column>
         <column>
             <name>CFProjectManagerID</name>
             <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectManagerID].alias</alias>
@@ -445,9 +459,6 @@
             <name>CFBeingChanged</name>
             <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFBeingChanged].alias</alias>
             <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFBeingChanged].description</description>
-            <name>CFProjectLevel</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectLevel].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagement].columns.column[CFProjectLevel].description</description>
             <userDefined>true</userDefined>
             <isMultilingual>false</isMultilingual>
             <isEncoded>false</isEncoded>
@@ -469,8 +480,6 @@
             <defaultValue />
             <sqlType>INT</sqlType>
             <length>10</length>
-            <sqlType>VARCHAR</sqlType>
-            <length>100</length>
             <scale>0</scale>
             <precision>0</precision>
         </column>

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

@@ -21,6 +21,20 @@
             <scale>0</scale>
             <precision>0</precision>
         </column>
+        <column>
+            <name>CFClockLocation</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagementEntry].columns.column[CFClockLocation].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagementEntry].columns.column[CFClockLocation].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>VARCHAR</sqlType>
+            <length>80</length>
+            <scale>0</scale>
+            <precision>80</precision>
+        </column>
         <column>
             <name>FSeq</name>
             <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagementEntry].columns.column[FSeq].alias</alias>
@@ -49,20 +63,6 @@
             <scale>0</scale>
             <precision>44</precision>
         </column>
-        <column>
-            <name>CFClockLocation</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagementEntry].columns.column[CFClockLocation].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagementEntry].columns.column[CFClockLocation].description</description>
-            <userDefined>true</userDefined>
-            <isMultilingual>false</isMultilingual>
-            <isEncoded>false</isEncoded>
-            <isNullable>true</isNullable>
-            <defaultValue />
-            <sqlType>NVARCHAR</sqlType>
-            <length>500</length>
-            <scale>0</scale>
-            <precision>0</precision>
-        </column>
     </columns>
     <primaryKey>
         <name>PK_ProjectManageme</name>

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

@@ -249,6 +249,26 @@
                 <key name="name" value="CFProjectName" />
             </mappingField>
         </ownProperty>
+        <ownProperty>
+            <name>projectLevel</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[projectLevel].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[projectLevel].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>Enum</dataType>
+            <metadataRef>com.kingdee.eas.hr.project.projectLevel</metadataRef>
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>80</length>
+            <precision>100</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[projectLevel].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFProjectLevel" />
+            </mappingField>
+        </ownProperty>
         <linkProperty>
             <name>projectManager</name>
             <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.linkProperty[projectManager].alias</alias>
@@ -451,13 +471,6 @@
             <configured>false</configured>
             <dataType>Enum</dataType>
             <metadataRef>com.kingdee.eas.hr.project.projectState</metadataRef>
-            <name>projectLevel</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[projectLevel].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[projectLevel].description</description>
-            <userDefined>true</userDefined>
-            <configured>false</configured>
-            <dataType>Enum</dataType>
-            <metadataRef>com.kingdee.eas.hr.project.projectLevel</metadataRef>
             <isMultilingual>false</isMultilingual>
             <isNullable>false</isNullable>
             <formula />
@@ -468,10 +481,6 @@
             <displayFormat />
             <mappingField>
                 <key name="name" value="CFProjectState" />
-            <defaultValue>entityObject[com.kingdee.eas.hr.project.app.ProjectManagement].properties.ownProperty[projectLevel].defaultValue</defaultValue>
-            <displayFormat />
-            <mappingField>
-                <key name="name" value="CFProjectLevel" />
             </mappingField>
         </ownProperty>
     </properties>

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

@@ -203,8 +203,8 @@
             <isMultilingual>false</isMultilingual>
             <isNullable>false</isNullable>
             <formula />
-            <length>500</length>
-            <precision>0</precision>
+            <length>80</length>
+            <precision>80</precision>
             <decimalDigits>0</decimalDigits>
             <defaultValue>entityObject[com.kingdee.eas.hr.project.app.ProjectManagementEntry].properties.ownProperty[clockLocation].defaultValue</defaultValue>
             <displayFormat />
@@ -373,9 +373,9 @@
             <lang locale="zh_TW" value="50" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectManagementEntry].properties.ownProperty[clockLocation].extendedProperty.bizDataType">
-            <lang locale="en_US" value="NOTE" />
-            <lang locale="zh_CN" value="NOTE" />
-            <lang locale="zh_TW" value="NOTE" />
+            <lang locale="en_US" value="DECIMAL" />
+            <lang locale="zh_CN" value="DECIMAL" />
+            <lang locale="zh_TW" value="DECIMAL" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectManagementEntry].properties.ownProperty[clockLocation].extendedProperty.enableFieldPermission">
             <lang locale="en_US" value="false" />
@@ -398,9 +398,9 @@
             <lang locale="zh_TW" value="false" />
         </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectManagementEntry].properties.ownProperty[clockLocation].extendedProperty.isForWrittenBack">
-            <lang locale="en_US" value="false" />
-            <lang locale="zh_CN" value="false" />
-            <lang locale="zh_TW" value="false" />
+            <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.ProjectManagementEntry].properties.ownProperty[clockLocation].extendedProperty.isInCode">
             <lang locale="en_US" value="false" />

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

@@ -1001,6 +1001,37 @@
                 <key name="name" value="ProjectManagementQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>projectLevel</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[projectLevel].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>String</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>3a9482bc-036e-4fb9-9f66-050e1244bb7a</key>
+                    <parentUnit>
+                        <key name="name" value="projectLevel" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="ProjectManagement" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="projectLevel" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="ProjectManagementQuery" />
+            </query>
+        </queryField>
         <queryField>
             <name>projectManager.name</name>
             <userDefined>true</userDefined>
@@ -1250,11 +1281,11 @@
             </query>
         </queryField>
         <queryField>
-            <name>changedManDays</name>
+            <name>entrys.clockLocation</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[changedManDays].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[entrys.clockLocation].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
@@ -1263,15 +1294,15 @@
             <returnType>Number</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>d9871745-f5ca-469d-83cd-6597de8fb28f</key>
+                    <key>248f1415-630a-47a5-85bb-02fbf260f3a3</key>
                     <parentUnit>
-                        <key name="name" value="changedManDays" />
+                        <key name="name" value="entrys.clockLocation" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="ProjectManagement" />
+                        <key name="name" value="entrys" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="changedManDays" />
+                        <key name="name" value="clockLocation" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1281,28 +1312,28 @@
             </query>
         </queryField>
         <queryField>
-            <name>beingChanged</name>
+            <name>changedManDays</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[beingChanged].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[changedManDays].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
             <isSorter>true</isSorter>
             <isParameter>false</isParameter>
-            <returnType>Boolean</returnType>
+            <returnType>Number</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>c687e17a-0f05-4ba3-812f-6b81fcc2b9df</key>
+                    <key>d9871745-f5ca-469d-83cd-6597de8fb28f</key>
                     <parentUnit>
-                        <key name="name" value="beingChanged" />
+                        <key name="name" value="changedManDays" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="ProjectManagement" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="beingChanged" />
+                        <key name="name" value="changedManDays" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1312,42 +1343,28 @@
             </query>
         </queryField>
         <queryField>
-            <name>projectState</name>
-            <userDefined>true</userDefined>
-            <formulaString>#0</formulaString>
-            <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[projectState].displayName</displayName>
-            <name>entrys.clockLocation</name>
+            <name>beingChanged</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[entrys.clockLocation].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[beingChanged].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
             <isSorter>true</isSorter>
             <isParameter>false</isParameter>
-            <returnType>String</returnType>
+            <returnType>Boolean</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>9c372c9b-e417-4ad7-b512-cde4c5f2dd2b</key>
+                    <key>c687e17a-0f05-4ba3-812f-6b81fcc2b9df</key>
                     <parentUnit>
-                        <key name="name" value="projectState" />
+                        <key name="name" value="beingChanged" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="ProjectManagement" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="projectState" />
-                    <key>6a1df352-2b40-4181-9bf2-5f3dc0194ed8</key>
-                    <parentUnit>
-                        <key name="name" value="entrys.clockLocation" />
-                    </parentUnit>
-                    <subEntity>
-                        <key name="name" value="entrys" />
-                    </subEntity>
-                    <refProperty>
-                        <key name="name" value="clockLocation" />
+                        <key name="name" value="beingChanged" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -1357,11 +1374,11 @@
             </query>
         </queryField>
         <queryField>
-            <name>projectLevel</name>
+            <name>projectState</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[projectLevel].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectManagementQuery].units.queryField[projectState].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
@@ -1370,15 +1387,15 @@
             <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>889ef84d-27ac-453b-be20-7b0969bf3adb</key>
+                    <key>9c372c9b-e417-4ad7-b512-cde4c5f2dd2b</key>
                     <parentUnit>
-                        <key name="name" value="projectLevel" />
+                        <key name="name" value="projectState" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="ProjectManagement" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="projectLevel" />
+                        <key name="name" value="projectState" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>

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

@@ -5,7 +5,7 @@
     <alias>relationship[com.kingdee.eas.hr.project.app.R_ProjectManagement_ProjectManagementEntry_entrys].alias</alias>
     <description>relationship[com.kingdee.eas.hr.project.app.R_ProjectManagement_ProjectManagementEntry_entrys].description</description>
     <userDefined>true</userDefined>
-    <type>Association</type>
+    <type>Composition</type>
     <clientCardinality>1</clientCardinality>
     <supplierCardinality>0..*</supplierCardinality>
     <xmlNodeRelationship />

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

@@ -1386,6 +1386,37 @@
                 <key name="name" value="WorkHoursReportQuery" />
             </query>
         </queryField>
+        <queryField>
+            <name>billState</name>
+            <userDefined>true</userDefined>
+            <formulaString />
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[billState].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>false</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Int</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>a6bacf2a-74fc-4c47-9fea-031d8655fdb9</key>
+                    <parentUnit>
+                        <key name="name" value="billState" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="WorkHoursReport" />
+                    </subEntity>
+                    <refProperty>
+                        <key name="name" value="billState" />
+                    </refProperty>
+                </propertyRef>
+            </propertyRefs>
+            <query>
+                <key name="package" value="com.kingdee.eas.hr.project.app" />
+                <key name="name" value="WorkHoursReportQuery" />
+            </query>
+        </queryField>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -1864,6 +1895,12 @@
             <lang locale="zh_HK" value="用戶名" />
             <lang locale="zh_TW" value="用戶名" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.WorkHoursReportQuery].units.queryField[billState].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.WorkHoursReportQuery].units.queryField[bizDate].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="业务日期" />

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

@@ -584,6 +584,55 @@
                 <key name="name" value="CoreUI" />
             </parent>
         </component>
+        <component>
+            <name>contprojectLevel</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectLevel].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
+            <isContainer>true</isContainer>
+            <constraints>725,8,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.ProjectManagementEditUI].components.component[contprojectLevel].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.ProjectManagementEditUI].components.component[contprojectLevel].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.ProjectManagementEditUI].components.component[contprojectLevel].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.ProjectManagementEditUI].components.component[contprojectLevel].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="CoreUI" />
+            </parent>
+        </component>
         <component>
             <name>contprojectManager</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectManager].alias</alias>
@@ -1082,12 +1131,6 @@
             <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
             <isContainer>true</isContainer>
             <constraints>32,128,270,19</constraints>
-            <name>contprojectLevel</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectLevel].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 />
@@ -1101,7 +1144,6 @@
                     <name>boundLabelText</name>
                     <type>java.lang.String</type>
                     <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectState].properties.property[boundLabelText].value</value>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectLevel].properties.property[boundLabelText].value</value>
                     <isMultiLan>true</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -1109,7 +1151,6 @@
                     <name>boundLabelLength</name>
                     <type>int</type>
                     <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectState].properties.property[boundLabelLength].value</value>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectLevel].properties.property[boundLabelLength].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -1117,7 +1158,6 @@
                     <name>boundLabelUnderline</name>
                     <type>boolean</type>
                     <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectState].properties.property[boundLabelUnderline].value</value>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectLevel].properties.property[boundLabelUnderline].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -1125,7 +1165,6 @@
                     <name>visible</name>
                     <type>boolean</type>
                     <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectState].properties.property[visible].value</value>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[contprojectLevel].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -1635,6 +1674,54 @@
                 </propertyBinding>
             </propertyBindings>
         </component>
+        <component>
+            <name>projectLevel</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDComboBox</classType>
+            <isContainer>false</isContainer>
+            <constraints>7</constraints>
+            <tabIndex>24</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <layoutInfo>
+                <name />
+                <type>XYLayout</type>
+                <value />
+            </layoutInfo>
+            <properties>
+                <property>
+                    <name>items</name>
+                    <type>java.lang.String</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].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.ProjectManagementEditUI].components.component[projectLevel].properties.property[required].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="contprojectLevel" />
+            </parent>
+            <propertyBindings>
+                <propertyBinding>
+                    <propertyName>selectedItem</propertyName>
+                    <propertyType>java.lang.Object</propertyType>
+                    <bindingObject>editData</bindingObject>
+                    <bindingField>projectLevel</bindingField>
+                    <fieldType>com.kingdee.eas.hr.project.projectLevel</fieldType>
+                    <accessType />
+                    <autoMode>false</autoMode>
+                    <herited>false</herited>
+                    <userDefined>true</userDefined>
+                </propertyBinding>
+            </propertyBindings>
+        </component>
         <component>
             <name>prmtprojectManager</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[prmtprojectManager].alias</alias>
@@ -2249,14 +2336,11 @@
         <component>
             <name>projectState</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectState].alias</alias>
-            <name>projectLevel</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].alias</alias>
             <userDefined>true</userDefined>
             <classType>com.kingdee.bos.ctrl.swing.KDComboBox</classType>
             <isContainer>false</isContainer>
             <constraints>7</constraints>
             <tabIndex>34</tabIndex>
-            <tabIndex>33</tabIndex>
             <herited>false</herited>
             <bimUIObjectPK />
             <properties>
@@ -2264,7 +2348,6 @@
                     <name>visible</name>
                     <type>boolean</type>
                     <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectState].properties.property[visible].value</value>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -2272,7 +2355,6 @@
                     <name>items</name>
                     <type>java.lang.String</type>
                     <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectState].properties.property[items].value</value>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].properties.property[items].value</value>
                     <isMultiLan>true</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -2280,14 +2362,12 @@
                     <name>required</name>
                     <type>boolean</type>
                     <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectState].properties.property[required].value</value>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].properties.property[required].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
             </properties>
             <parent>
                 <key name="name" value="contprojectState" />
-                <key name="name" value="contprojectLevel" />
             </parent>
             <propertyBindings>
                 <propertyBinding>
@@ -2296,8 +2376,6 @@
                     <bindingObject>editData</bindingObject>
                     <bindingField>projectState</bindingField>
                     <fieldType>com.kingdee.eas.hr.project.projectState</fieldType>
-                    <bindingField>projectLevel</bindingField>
-                    <fieldType>com.kingdee.eas.hr.project.projectLevel</fieldType>
                     <accessType>2</accessType>
                     <autoMode>false</autoMode>
                     <herited>false</herited>
@@ -3847,9 +3925,9 @@
         </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[kdtEntrys].properties.property[formatXml].value">
             <lang locale="en_US" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt; &lt;DocRoot xmlns:c=&quot;http://www.kingdee.com/Common&quot; xmlns:f=&quot;http://www.kingdee.com/Form&quot; xmlns:t=&quot;http://www.kingdee.com/Table&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.kingdee.com/KDF KDFSchema.xsd&quot; version=&quot;0.0&quot;&gt;&lt;Styles /&gt;&lt;Table id=&quot;KDTable&quot;&gt;&lt;t:Sheet name=&quot;sheet1&quot;&gt;&lt;t:Table t:selectMode=&quot;15&quot; t:mergeMode=&quot;0&quot; t:dataRequestMode=&quot;0&quot; t:pageRowCount=&quot;100&quot;&gt;&lt;t:ColumnGroup&gt;&lt;t:Column t:key=&quot;id&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; /&gt;&lt;/t:ColumnGroup&gt;&lt;t:Head&gt;&lt;t:Row t:name=&quot;header&quot; t:height=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot;&gt;&lt;t:Cell&gt;id&lt;/t:Cell&gt;&lt;/t:Row&gt;&lt;/t:Head&gt;&lt;/t:Table&gt;&lt;t:SheetOptions&gt;&lt;t:MergeBlocks&gt;&lt;t:Head /&gt;&lt;/t:MergeBlocks&gt;&lt;/t:SheetOptions&gt;&lt;/t:Sheet&gt;&lt;/Table&gt;&lt;/DocRoot&gt; " />
-            <lang locale="zh_CN" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;DocRoot xmlns:c=&quot;http://www.kingdee.com/Common&quot; xmlns:f=&quot;http://www.kingdee.com/Form&quot; xmlns:t=&quot;http://www.kingdee.com/Table&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.kingdee.com/KDF KDFSchema.xsd&quot; version=&quot;0.0&quot;&gt;&lt;Styles&gt;&lt;c:Style id=&quot;sCol0&quot;&gt;&lt;c:Protection hidden=&quot;true&quot; /&gt;&lt;/c:Style&gt;&lt;/Styles&gt;&lt;Table id=&quot;KDTable&quot;&gt;&lt;t:Sheet name=&quot;sheet1&quot;&gt;&lt;t:Table t:selectMode=&quot;15&quot; t:mergeMode=&quot;0&quot; t:dataRequestMode=&quot;0&quot; t:pageRowCount=&quot;100&quot;&gt;&lt;t:ColumnGroup&gt;&lt;t:Column t:key=&quot;id&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol0&quot; /&gt;&lt;t:Column t:key=&quot;clockLocation&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; /&gt;&lt;/t:ColumnGroup&gt;&lt;t:Head&gt;&lt;t:Row t:name=&quot;header&quot; t:height=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot;&gt;&lt;t:Cell&gt;id&lt;/t:Cell&gt;&lt;t:Cell&gt;项目打卡位置&lt;/t:Cell&gt;&lt;/t:Row&gt;&lt;/t:Head&gt;&lt;/t:Table&gt;&lt;t:SheetOptions&gt;&lt;t:MergeBlocks&gt;&lt;t:Head /&gt;&lt;/t:MergeBlocks&gt;&lt;/t:SheetOptions&gt;&lt;/t:Sheet&gt;&lt;/Table&gt;&lt;/DocRoot&gt;" />
-            <lang locale="zh_HK" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;DocRoot xmlns:c=&quot;http://www.kingdee.com/Common&quot; xmlns:f=&quot;http://www.kingdee.com/Form&quot; xmlns:t=&quot;http://www.kingdee.com/Table&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.kingdee.com/KDF KDFSchema.xsd&quot; version=&quot;0.0&quot;&gt;&lt;Styles&gt;&lt;c:Style id=&quot;sCol0&quot;&gt;&lt;c:Protection hidden=&quot;true&quot; /&gt;&lt;/c:Style&gt;&lt;/Styles&gt;&lt;Table id=&quot;KDTable&quot;&gt;&lt;t:Sheet name=&quot;sheet1&quot;&gt;&lt;t:Table t:selectMode=&quot;15&quot; t:mergeMode=&quot;0&quot; t:dataRequestMode=&quot;0&quot; t:pageRowCount=&quot;100&quot;&gt;&lt;t:ColumnGroup&gt;&lt;t:Column t:key=&quot;id&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol0&quot; /&gt;&lt;t:Column t:key=&quot;clockLocation&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; /&gt;&lt;/t:ColumnGroup&gt;&lt;t:Head&gt;&lt;t:Row t:name=&quot;header&quot; t:height=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot;&gt;&lt;t:Cell&gt;id&lt;/t:Cell&gt;&lt;t:Cell&gt;項目打卡位置&lt;/t:Cell&gt;&lt;/t:Row&gt;&lt;/t:Head&gt;&lt;/t:Table&gt;&lt;t:SheetOptions&gt;&lt;t:MergeBlocks&gt;&lt;t:Head /&gt;&lt;/t:MergeBlocks&gt;&lt;/t:SheetOptions&gt;&lt;/t:Sheet&gt;&lt;/Table&gt;&lt;/DocRoot&gt;" />
-            <lang locale="zh_TW" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;DocRoot xmlns:c=&quot;http://www.kingdee.com/Common&quot; xmlns:f=&quot;http://www.kingdee.com/Form&quot; xmlns:t=&quot;http://www.kingdee.com/Table&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.kingdee.com/KDF KDFSchema.xsd&quot; version=&quot;0.0&quot;&gt;&lt;Styles&gt;&lt;c:Style id=&quot;sCol0&quot;&gt;&lt;c:Protection hidden=&quot;true&quot; /&gt;&lt;/c:Style&gt;&lt;/Styles&gt;&lt;Table id=&quot;KDTable&quot;&gt;&lt;t:Sheet name=&quot;sheet1&quot;&gt;&lt;t:Table t:selectMode=&quot;15&quot; t:mergeMode=&quot;0&quot; t:dataRequestMode=&quot;0&quot; t:pageRowCount=&quot;100&quot;&gt;&lt;t:ColumnGroup&gt;&lt;t:Column t:key=&quot;id&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol0&quot; /&gt;&lt;t:Column t:key=&quot;clockLocation&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; /&gt;&lt;/t:ColumnGroup&gt;&lt;t:Head&gt;&lt;t:Row t:name=&quot;header&quot; t:height=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot;&gt;&lt;t:Cell&gt;id&lt;/t:Cell&gt;&lt;t:Cell&gt;項目打卡位置&lt;/t:Cell&gt;&lt;/t:Row&gt;&lt;/t:Head&gt;&lt;/t:Table&gt;&lt;t:SheetOptions&gt;&lt;t:MergeBlocks&gt;&lt;t:Head /&gt;&lt;/t:MergeBlocks&gt;&lt;/t:SheetOptions&gt;&lt;/t:Sheet&gt;&lt;/Table&gt;&lt;/DocRoot&gt;" />
+            <lang locale="zh_CN" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;DocRoot xmlns:c=&quot;http://www.kingdee.com/Common&quot; xmlns:f=&quot;http://www.kingdee.com/Form&quot; xmlns:t=&quot;http://www.kingdee.com/Table&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.kingdee.com/KDF KDFSchema.xsd&quot; version=&quot;0.0&quot;&gt;&lt;Styles&gt;&lt;c:Style id=&quot;sCol0&quot;&gt;&lt;c:Protection hidden=&quot;true&quot; /&gt;&lt;/c:Style&gt;&lt;c:Style id=&quot;sCol1&quot;&gt;&lt;c:NumberFormat&gt;&amp;amp;double&lt;/c:NumberFormat&gt;&lt;/c:Style&gt;&lt;/Styles&gt;&lt;Table id=&quot;KDTable&quot;&gt;&lt;t:Sheet name=&quot;sheet1&quot;&gt;&lt;t:Table t:selectMode=&quot;15&quot; t:mergeMode=&quot;0&quot; t:dataRequestMode=&quot;0&quot; t:pageRowCount=&quot;100&quot;&gt;&lt;t:ColumnGroup&gt;&lt;t:Column t:key=&quot;id&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol0&quot; /&gt;&lt;t:Column t:key=&quot;clockLocation&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol1&quot; /&gt;&lt;/t:ColumnGroup&gt;&lt;t:Head&gt;&lt;t:Row t:name=&quot;header&quot; t:height=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot;&gt;&lt;t:Cell&gt;id&lt;/t:Cell&gt;&lt;t:Cell&gt;项目打卡位置&lt;/t:Cell&gt;&lt;/t:Row&gt;&lt;/t:Head&gt;&lt;/t:Table&gt;&lt;t:SheetOptions&gt;&lt;t:MergeBlocks&gt;&lt;t:Head /&gt;&lt;/t:MergeBlocks&gt;&lt;/t:SheetOptions&gt;&lt;/t:Sheet&gt;&lt;/Table&gt;&lt;/DocRoot&gt;" />
+            <lang locale="zh_HK" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;DocRoot xmlns:c=&quot;http://www.kingdee.com/Common&quot; xmlns:f=&quot;http://www.kingdee.com/Form&quot; xmlns:t=&quot;http://www.kingdee.com/Table&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.kingdee.com/KDF KDFSchema.xsd&quot; version=&quot;0.0&quot;&gt;&lt;Styles&gt;&lt;c:Style id=&quot;sCol0&quot;&gt;&lt;c:Protection hidden=&quot;true&quot; /&gt;&lt;/c:Style&gt;&lt;c:Style id=&quot;sCol1&quot;&gt;&lt;c:NumberFormat&gt;&amp;amp;double&lt;/c:NumberFormat&gt;&lt;/c:Style&gt;&lt;/Styles&gt;&lt;Table id=&quot;KDTable&quot;&gt;&lt;t:Sheet name=&quot;sheet1&quot;&gt;&lt;t:Table t:selectMode=&quot;15&quot; t:mergeMode=&quot;0&quot; t:dataRequestMode=&quot;0&quot; t:pageRowCount=&quot;100&quot;&gt;&lt;t:ColumnGroup&gt;&lt;t:Column t:key=&quot;id&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol0&quot; /&gt;&lt;t:Column t:key=&quot;clockLocation&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol1&quot; /&gt;&lt;/t:ColumnGroup&gt;&lt;t:Head&gt;&lt;t:Row t:name=&quot;header&quot; t:height=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot;&gt;&lt;t:Cell&gt;id&lt;/t:Cell&gt;&lt;t:Cell&gt;項目打卡位置&lt;/t:Cell&gt;&lt;/t:Row&gt;&lt;/t:Head&gt;&lt;/t:Table&gt;&lt;t:SheetOptions&gt;&lt;t:MergeBlocks&gt;&lt;t:Head /&gt;&lt;/t:MergeBlocks&gt;&lt;/t:SheetOptions&gt;&lt;/t:Sheet&gt;&lt;/Table&gt;&lt;/DocRoot&gt;" />
+            <lang locale="zh_TW" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&lt;DocRoot xmlns:c=&quot;http://www.kingdee.com/Common&quot; xmlns:f=&quot;http://www.kingdee.com/Form&quot; xmlns:t=&quot;http://www.kingdee.com/Table&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://www.kingdee.com/KDF KDFSchema.xsd&quot; version=&quot;0.0&quot;&gt;&lt;Styles&gt;&lt;c:Style id=&quot;sCol0&quot;&gt;&lt;c:Protection hidden=&quot;true&quot; /&gt;&lt;/c:Style&gt;&lt;c:Style id=&quot;sCol1&quot;&gt;&lt;c:NumberFormat&gt;&amp;amp;double&lt;/c:NumberFormat&gt;&lt;/c:Style&gt;&lt;/Styles&gt;&lt;Table id=&quot;KDTable&quot;&gt;&lt;t:Sheet name=&quot;sheet1&quot;&gt;&lt;t:Table t:selectMode=&quot;15&quot; t:mergeMode=&quot;0&quot; t:dataRequestMode=&quot;0&quot; t:pageRowCount=&quot;100&quot;&gt;&lt;t:ColumnGroup&gt;&lt;t:Column t:key=&quot;id&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol0&quot; /&gt;&lt;t:Column t:key=&quot;clockLocation&quot; t:width=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot; t:moveable=&quot;true&quot; t:group=&quot;false&quot; t:required=&quot;false&quot; t:index=&quot;-1&quot; t:styleID=&quot;sCol1&quot; /&gt;&lt;/t:ColumnGroup&gt;&lt;t:Head&gt;&lt;t:Row t:name=&quot;header&quot; t:height=&quot;-1&quot; t:mergeable=&quot;true&quot; t:resizeable=&quot;true&quot;&gt;&lt;t:Cell&gt;id&lt;/t:Cell&gt;&lt;t:Cell&gt;項目打卡位置&lt;/t:Cell&gt;&lt;/t:Row&gt;&lt;/t:Head&gt;&lt;/t:Table&gt;&lt;t:SheetOptions&gt;&lt;t:MergeBlocks&gt;&lt;t:Head /&gt;&lt;/t:MergeBlocks&gt;&lt;/t:SheetOptions&gt;&lt;/t:Sheet&gt;&lt;/Table&gt;&lt;/DocRoot&gt;" />
         </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[menuItemAddLine].alias">
             <lang locale="en_US" value="null" />
@@ -4139,9 +4217,9 @@
         </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].properties.property[items].value">
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="[Enum]com.kingdee.eas.hr.project.projectLevel" />
-            <lang locale="zh_HK" value="[Enum]com.kingdee.eas.hr.project.projectLevel" />
-            <lang locale="zh_TW" value="[Enum]com.kingdee.eas.hr.project.projectLevel" />
+            <lang locale="zh_CN" value="[Enum]com.kingdee.eas.hr.projectLevel" />
+            <lang locale="zh_HK" value="[Enum]com.kingdee.eas.hr.projectLevel" />
+            <lang locale="zh_TW" value="[Enum]com.kingdee.eas.hr.projectLevel" />
         </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].properties.property[required].value">
             <lang locale="en_US" value="false" />
@@ -4149,7 +4227,6 @@
             <lang locale="zh_HK" value="false" />
             <lang locale="zh_TW" value="false" />
         </rs>
-<<<<<<< HEAD
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectState].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="单据状态" />
@@ -4169,9 +4246,6 @@
             <lang locale="zh_TW" value="false" />
         </rs>
         <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectState].properties.property[visible].value">
-=======
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectManagementEditUI].components.component[projectLevel].properties.property[visible].value">
->>>>>>> remotes/origin/master
             <lang locale="en_US" value="true" />
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_HK" value="true" />

metadata/entity_pkmapping.properties

@@ -1,6 +1,5 @@
-
+#
 #Fri Nov 29 11:38:19 CST 2024
-#Thu Nov 28 14:12:18 CST 202
 79ADB148=com.kingdee.eas.hr.project.app.ProjectChange
 95FA0614=com.kingdee.eas.hr.project.app.MemberManagementEntry
 C5DD122F=com.kingdee.eas.hr.project.app.Employee
@@ -11,8 +10,6 @@ B15489DB=com.kingdee.eas.hr.project.app.ProjectManagement
 1315F40A=com.kingdee.eas.hr.project.app.ProjectChangeEntry
 2AC6A40E=com.kingdee.eas.hr.project.app.ProjectRole
 2AC7B2D2=com.kingdee.eas.hr.project.app.ProjectType
-CF9DCEB1=com.kingdee.eas.hr.project.app.WorkHoursReport
-400CA33B=com.kingdee.eas.hr.project.app.Type
 9F122B78=com.kingdee.eas.hr.project.app.Project
 CF9DCEB1=com.kingdee.eas.hr.project.app.WorkHoursReport
 400CA33B=com.kingdee.eas.hr.project.app.Type

metadata/facade_pkmapping.properties

@@ -1,3 +1,2 @@
-
-#Fri Nov 29 11:38:19 
-#Thu Nov 28 14:12:18 CST 2024
+#
+#Fri Nov 29 11:38:19 CST 2024