qingyang_zhang 5 ماه پیش
والد
کامیت
4fde673eb6

+ 8 - 3
metadata/com/kingdee/eas/hr/project/ProjectClock.bizunit

@@ -75,6 +75,11 @@
             <lang locale="zh_CN" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
         </rs>
+        <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.enableFieldPermission">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.isAsstAcctType">
             <lang locale="en_US" value="false" />
             <lang locale="zh_CN" value="false" />
@@ -96,9 +101,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectClockListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="1" />
-            <lang locale="zh_CN" value="1" />
-            <lang locale="zh_TW" value="1" />
+            <lang locale="en_US" value="3" />
+            <lang locale="zh_CN" value="3" />
+            <lang locale="zh_TW" value="3" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.hr.project.ProjectClock].extendedProperty.userDefined">
             <lang locale="en_US" value="true" />

+ 27 - 1
metadata/com/kingdee/eas/hr/project/app/CT_PRO_ProjectClock.table

@@ -161,6 +161,20 @@
             <scale>0</scale>
             <precision>0</precision>
         </column>
+        <column>
+            <name>CFState</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectClock].columns.column[CFState].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectClock].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>
     </columns>
     <primaryKey>
         <name>CPK_PRO_Project73u</name>
@@ -234,7 +248,7 @@
             </fkColumnPairs>
         </foreignKey>
         <foreignKey>
-            <name>CFK_PRO_PROPCRjc7c</name>
+            <name>CFK_PRO_PROPCRjcm5</name>
             <userDefined>true</userDefined>
             <refTable>
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
@@ -272,6 +286,18 @@
             <lang locale="zh_HK" value="項目" />
             <lang locale="zh_TW" value="項目" />
         </rs>
+        <rs key="dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectClock].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_ProjectClock].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_ProjectClock].columns.column[FControlUnitID].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="控制单元" />

+ 161 - 18
metadata/com/kingdee/eas/hr/project/app/ProjectClock.entity

@@ -179,9 +179,9 @@
     </table>
     <properties>
         <linkProperty>
-            <name>Project</name>
-            <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[Project].alias</alias>
-            <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[Project].description</description>
+            <name>project</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[project].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[project].description</description>
             <userDefined>true</userDefined>
             <configured>false</configured>
             <mappingField>
@@ -189,9 +189,29 @@
             </mappingField>
             <relationship>
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
-                <key name="name" value="R_ProjectClock_ProjectManagement_Project" />
+                <key name="name" value="R_ProjectClock_ProjectManagement_project" />
             </relationship>
         </linkProperty>
+        <ownProperty>
+            <name>state</name>
+            <alias>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.ownProperty[state].alias</alias>
+            <description>entityObject[com.kingdee.eas.hr.project.app.ProjectClock].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.ProjectClock].properties.ownProperty[state].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFState" />
+            </mappingField>
+        </ownProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -229,6 +249,56 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.OrgType">
+            <lang locale="en_US" value="NONE" />
+            <lang locale="zh_CN" value="NONE" />
+            <lang locale="zh_TW" value="NONE" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.codingRuleEnabled">
+            <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.ProjectClock].defaultViewextendedProperty.defaultDisplayField">
+            <lang locale="en_US" value="name" />
+            <lang locale="zh_CN" value="name" />
+            <lang locale="zh_TW" value="name" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.defaultF7Query">
+            <lang locale="en_US" value="com.kingdee.eas.hr.project.app.ProjectClockQuery" />
+            <lang locale="zh_CN" value="com.kingdee.eas.hr.project.app.ProjectClockQuery" />
+            <lang locale="zh_TW" value="com.kingdee.eas.hr.project.app.ProjectClockQuery" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.editUI">
+            <lang locale="en_US" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
+            <lang locale="zh_CN" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
+            <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectClockEditUI" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].defaultViewextendedProperty.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.ProjectClock].defaultViewextendedProperty.isAsstAcctType">
+            <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.ProjectClock].defaultViewextendedProperty.isParamObject">
+            <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.ProjectClock].defaultViewextendedProperty.isSimpleEntity">
+            <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.ProjectClock].defaultViewextendedProperty.listUI">
+            <lang locale="en_US" value="com.kingdee.eas.hr.project.client.ProjectClockListUI" />
+            <lang locale="zh_CN" value="com.kingdee.eas.hr.project.client.ProjectClockListUI" />
+            <lang locale="zh_TW" value="com.kingdee.eas.hr.project.client.ProjectClockListUI" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].description">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="" />
@@ -380,59 +450,132 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[Project].alias">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[project].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.ProjectClock].properties.linkProperty[Project].description">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[project].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.ProjectClock].properties.linkProperty[Project].extendedProperty.ColWidthInKDTable">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[project].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.ProjectClock].properties.linkProperty[Project].extendedProperty.dataField">
-            <lang locale="en_US" value="Fivouchered" />
-            <lang locale="zh_CN" value="Fivouchered" />
-            <lang locale="zh_TW" value="Fivouchered" />
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.linkProperty[project].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.ProjectClock].properties.linkProperty[project].extendedProperty.isAsstAcctType">
+            <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.ProjectClock].properties.linkProperty[project].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.ProjectClock].properties.linkProperty[project].extendedProperty.isForMapping">
+            <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.ProjectClock].properties.linkProperty[project].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.ProjectClock].properties.linkProperty[project].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.ProjectClock].properties.linkProperty[project].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.ProjectClock].properties.linkProperty[project].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.ProjectClock].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.ProjectClock].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.ProjectClock].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.ProjectClock].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.ProjectClock].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.ProjectClock].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.ProjectClock].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.ProjectClock].properties.linkProperty[Project].extendedProperty.isAsstAcctType">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.ownProperty[state].extendedProperty.isAsstAcctType">
             <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.ProjectClock].properties.linkProperty[Project].extendedProperty.isForGrouping">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].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.ProjectClock].properties.linkProperty[Project].extendedProperty.isForMapping">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.ownProperty[state].extendedProperty.isForMapping">
             <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.ProjectClock].properties.linkProperty[Project].extendedProperty.isForMatching">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].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.ProjectClock].properties.linkProperty[Project].extendedProperty.isForWrittenBack">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].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.ProjectClock].properties.linkProperty[Project].extendedProperty.isInCode">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].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.ProjectClock].properties.linkProperty[Project].extendedProperty.isVisibleForKDTable">
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.ProjectClock].properties.ownProperty[state].extendedProperty.isVisibleForKDTable">
             <lang locale="en_US" value="true" />
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />

+ 98 - 51
metadata/com/kingdee/eas/hr/project/app/ProjectClockQuery.query

@@ -49,8 +49,8 @@
             </entityRef>
         </subEntity>
         <subEntity>
-            <name>Project</name>
-            <alias>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[Project].alias</alias>
+            <name>project</name>
+            <alias>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[project].alias</alias>
             <userDefined>true</userDefined>
             <query>
                 <key name="package" value="com.kingdee.eas.hr.project.app" />
@@ -529,28 +529,28 @@
             </query>
         </queryField>
         <queryField>
-            <name>Project.Fivouchered</name>
+            <name>project.projectName</name>
             <userDefined>true</userDefined>
             <formulaString>#0</formulaString>
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.queryField[Project.Fivouchered].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.queryField[project.projectName].displayName</displayName>
             <groupType />
             <isSelector>true</isSelector>
             <isFilter>true</isFilter>
             <isSorter>true</isSorter>
             <isParameter>false</isParameter>
-            <returnType>Boolean</returnType>
+            <returnType>String</returnType>
             <propertyRefs>
                 <propertyRef>
-                    <key>cbe17518-600c-44c8-bcff-ac7555e20a33</key>
+                    <key>88f4fef3-300d-48b5-bf99-ad4809f2e04e</key>
                     <parentUnit>
-                        <key name="name" value="Project.Fivouchered" />
+                        <key name="name" value="project.projectName" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="Project" />
+                        <key name="name" value="project" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="Fivouchered" />
+                        <key name="name" value="projectName" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -560,11 +560,11 @@
             </query>
         </queryField>
         <propertyUnit>
-            <name>9e776729-ac47-4e16-b470-a884de9d4352</name>
+            <name>2131dce6-5dd4-454b-b56f-73a15873f7fc</name>
             <userDefined>true</userDefined>
             <formulaString />
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[9e776729-ac47-4e16-b470-a884de9d4352].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[2131dce6-5dd4-454b-b56f-73a15873f7fc].displayName</displayName>
             <groupType />
             <isSelector>false</isSelector>
             <isFilter>false</isFilter>
@@ -573,15 +573,15 @@
             <returnType />
             <propertyRefs>
                 <propertyRef>
-                    <key>ee07f675-09ea-4995-a60b-908f3de514aa</key>
+                    <key>9a603c3a-986e-404d-b564-1dfc256650bd</key>
                     <parentUnit>
-                        <key name="name" value="9e776729-ac47-4e16-b470-a884de9d4352" />
+                        <key name="name" value="2131dce6-5dd4-454b-b56f-73a15873f7fc" />
                     </parentUnit>
                     <subEntity>
                         <key name="name" value="ProjectClock" />
                     </subEntity>
                     <refProperty>
-                        <key name="name" value="Project" />
+                        <key name="name" value="project" />
                     </refProperty>
                 </propertyRef>
             </propertyRefs>
@@ -591,11 +591,11 @@
             </query>
         </propertyUnit>
         <propertyUnit>
-            <name>65b48897-c7bf-43b2-b296-b73ef05dffe2</name>
+            <name>669b3ed5-24ef-4a53-ad9d-298b811f2855</name>
             <userDefined>true</userDefined>
             <formulaString />
             <constString />
-            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[65b48897-c7bf-43b2-b296-b73ef05dffe2].displayName</displayName>
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[669b3ed5-24ef-4a53-ad9d-298b811f2855].displayName</displayName>
             <groupType />
             <isSelector>false</isSelector>
             <isFilter>false</isFilter>
@@ -604,12 +604,12 @@
             <returnType />
             <propertyRefs>
                 <propertyRef>
-                    <key>089925d4-5eab-45da-aeba-438615078ebb</key>
+                    <key>19ab14a4-9b90-40a9-850a-2b2ad0a52891</key>
                     <parentUnit>
-                        <key name="name" value="65b48897-c7bf-43b2-b296-b73ef05dffe2" />
+                        <key name="name" value="669b3ed5-24ef-4a53-ad9d-298b811f2855" />
                     </parentUnit>
                     <subEntity>
-                        <key name="name" value="Project" />
+                        <key name="name" value="project" />
                     </subEntity>
                     <refProperty>
                         <key name="name" value="id" />
@@ -621,6 +621,37 @@
                 <key name="name" value="ProjectClockQuery" />
             </query>
         </propertyUnit>
+        <queryField>
+            <name>state</name>
+            <userDefined>true</userDefined>
+            <formulaString>#0</formulaString>
+            <constString />
+            <displayName>joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.queryField[state].displayName</displayName>
+            <groupType />
+            <isSelector>true</isSelector>
+            <isFilter>true</isFilter>
+            <isSorter>true</isSorter>
+            <isParameter>false</isParameter>
+            <returnType>Int</returnType>
+            <propertyRefs>
+                <propertyRef>
+                    <key>74373718-0a0d-4999-9a19-7b9c2d6d9d8c</key>
+                    <parentUnit>
+                        <key name="name" value="state" />
+                    </parentUnit>
+                    <subEntity>
+                        <key name="name" value="ProjectClock" />
+                    </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="ProjectClockQuery" />
+            </query>
+        </queryField>
     </units>
     <defaultFilter>
         <name>defaultFilter</name>
@@ -715,27 +746,27 @@
             </query>
         </join>
         <join>
-            <name>6672dbbd-ebfb-4c58-ad8e-31c49793214c</name>
+            <name>2a3351ee-4797-4cde-80ec-06018d5483fe</name>
             <formulaString>#0</formulaString>
             <type>LEFT OUTER JOIN</type>
             <leftObject>
                 <key name="name" value="ProjectClock" />
             </leftObject>
             <rightObject>
-                <key name="name" value="Project" />
+                <key name="name" value="project" />
             </rightObject>
             <joinItems>
                 <joinItem>
-                    <name>4c7210b4-a7ce-4c00-9d2b-861d2b2ed8b7</name>
+                    <name>de2e81c5-0bbe-4544-acb8-02ad31e9c2ae</name>
                     <compareType>=</compareType>
                     <leftField>
-                        <key name="name" value="9e776729-ac47-4e16-b470-a884de9d4352" />
+                        <key name="name" value="2131dce6-5dd4-454b-b56f-73a15873f7fc" />
                     </leftField>
                     <rightField>
-                        <key name="name" value="65b48897-c7bf-43b2-b296-b73ef05dffe2" />
+                        <key name="name" value="669b3ed5-24ef-4a53-ad9d-298b811f2855" />
                     </rightField>
                     <join>
-                        <key name="name" value="6672dbbd-ebfb-4c58-ad8e-31c49793214c" />
+                        <key name="name" value="2a3351ee-4797-4cde-80ec-06018d5483fe" />
                     </join>
                 </joinItem>
             </joinItems>
@@ -836,31 +867,31 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[Project].alias">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[creator].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.ProjectClockQuery].subObjects.subEntity[creator].alias">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[lastUpdateUser].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.ProjectClockQuery].subObjects.subEntity[lastUpdateUser].alias">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].subObjects.subEntity[project].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.ProjectClockQuery].units.propertyUnit[65b48897-c7bf-43b2-b296-b73ef05dffe2].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[2131dce6-5dd4-454b-b56f-73a15873f7fc].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.ProjectClockQuery].units.propertyUnit[9e776729-ac47-4e16-b470-a884de9d4352].displayName">
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.propertyUnit[669b3ed5-24ef-4a53-ad9d-298b811f2855].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_HK" value="null" />
@@ -890,27 +921,6 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.queryField[Project.Fivouchered].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.ProjectClockQuery].units.queryField[Project.Fivouchered].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.ProjectClockQuery].units.queryField[Project.Fivouchered].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.ProjectClockQuery].units.queryField[Project.Fivouchered].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.ProjectClockQuery].units.queryField[createTime].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="创建时间" />
@@ -1220,6 +1230,27 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].units.queryField[project.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.ProjectClockQuery].units.queryField[project.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.ProjectClockQuery].units.queryField[project.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.ProjectClockQuery].units.queryField[project.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.ProjectClockQuery].units.queryField[simpleName].displayName">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="简称" />
@@ -1251,5 +1282,21 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="joinQuery[com.kingdee.eas.hr.project.app.ProjectClockQuery].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.ProjectClockQuery].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.ProjectClockQuery].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>

+ 5 - 5
metadata/com/kingdee/eas/hr/project/app/R_ProjectClock_ProjectManagement_Project.relation

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <relationship xmlns="com.kingdee.bos.metadata">
     <package>com.kingdee.eas.hr.project.app</package>
-    <name>R_ProjectClock_ProjectManagement_Project</name>
-    <alias>relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_Project].alias</alias>
-    <description>relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_Project].description</description>
+    <name>R_ProjectClock_ProjectManagement_project</name>
+    <alias>relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_project].alias</alias>
+    <description>relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_project].description</description>
     <userDefined>true</userDefined>
     <type>Association</type>
     <clientCardinality>1</clientCardinality>
@@ -18,12 +18,12 @@
         <key name="name" value="ProjectManagement" />
     </supplierObject>
     <resource>
-        <rs key="relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_Project].alias">
+        <rs key="relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_project].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
-        <rs key="relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_Project].description">
+        <rs key="relationship[com.kingdee.eas.hr.project.app.R_ProjectClock_ProjectManagement_project].description">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="null" />
             <lang locale="zh_TW" value="null" />

+ 187 - 34
metadata/com/kingdee/eas/hr/project/client/ProjectClockEditUI.ui

@@ -214,8 +214,8 @@
             </parent>
         </component>
         <component>
-            <name>contProject</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contProject].alias</alias>
+            <name>contproject</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].alias</alias>
             <userDefined>true</userDefined>
             <classType>com.kingdee.bos.ctrl.swing.KDLabelContainer</classType>
             <isContainer>true</isContainer>
@@ -232,28 +232,77 @@
                 <property>
                     <name>boundLabelText</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contProject].properties.property[boundLabelText].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].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.ProjectClockEditUI].components.component[contProject].properties.property[boundLabelLength].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].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.ProjectClockEditUI].components.component[contProject].properties.property[boundLabelUnderline].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].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.ProjectClockEditUI].components.component[contProject].properties.property[visible].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].properties.property[visible].value</value>
+                    <isMultiLan>false</isMultiLan>
+                    <userDefined>true</userDefined>
+                </property>
+            </properties>
+            <parent>
+                <key name="name" value="CoreUI" />
+            </parent>
+        </component>
+        <component>
+            <name>contstate</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contstate].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.ProjectClockEditUI].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.ProjectClockEditUI].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.ProjectClockEditUI].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.ProjectClockEditUI].components.component[contstate].properties.property[visible].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
@@ -409,8 +458,8 @@
             </propertyBindings>
         </component>
         <component>
-            <name>prmtProject</name>
-            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtProject].alias</alias>
+            <name>prmtproject</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].alias</alias>
             <userDefined>true</userDefined>
             <classType>com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox</classType>
             <isContainer>false</isContainer>
@@ -422,62 +471,62 @@
                 <property>
                     <name>queryInfo</name>
                     <type>java.lang.String</type>
-                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtProject].properties.property[queryInfo].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[visible].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[editable].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[displayFormat].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[editFormat].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[commitFormat].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[required].value</value>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].properties.property[required].value</value>
                     <isMultiLan>false</isMultiLan>
                     <userDefined>true</userDefined>
                 </property>
             </properties>
             <parent>
-                <key name="name" value="contProject" />
+                <key name="name" value="contproject" />
             </parent>
             <propertyBindings>
                 <propertyBinding>
                     <propertyName>data</propertyName>
                     <propertyType>java.lang.Object</propertyType>
                     <bindingObject>editData</bindingObject>
-                    <bindingField>Project</bindingField>
+                    <bindingField>project</bindingField>
                     <fieldType>com.kingdee.eas.hr.project.ProjectManagementInfo</fieldType>
                     <accessType>2</accessType>
                     <autoMode>false</autoMode>
@@ -486,6 +535,56 @@
                 </propertyBinding>
             </propertyBindings>
         </component>
+        <component>
+            <name>state</name>
+            <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[state].alias</alias>
+            <userDefined>true</userDefined>
+            <classType>com.kingdee.bos.ctrl.swing.KDComboBox</classType>
+            <isContainer>false</isContainer>
+            <constraints>7</constraints>
+            <tabIndex>11</tabIndex>
+            <herited>false</herited>
+            <bimUIObjectPK />
+            <properties>
+                <property>
+                    <name>visible</name>
+                    <type>boolean</type>
+                    <value>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].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.ProjectClockEditUI].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.ProjectClockEditUI].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>btnPrint</name>
             <alias>uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[btnPrint].alias</alias>
@@ -732,31 +831,61 @@
             <lang locale="zh_HK" value="false" />
             <lang locale="zh_TW" value="false" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contProject].alias">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].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.ProjectClockEditUI].components.component[contProject].properties.property[boundLabelLength].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].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.ProjectClockEditUI].components.component[contProject].properties.property[boundLabelText].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].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.ProjectClockEditUI].components.component[contProject].properties.property[boundLabelUnderline].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[contproject].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.ProjectClockEditUI].components.component[contproject].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.ProjectClockEditUI].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.ProjectClockEditUI].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.ProjectClockEditUI].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.ProjectClockEditUI].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.ProjectClockEditUI].components.component[contProject].properties.property[visible].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].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" />
@@ -894,49 +1023,73 @@
             <lang locale="zh_HK" value="false" />
             <lang locale="zh_TW" value="false" />
         </rs>
-        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtProject].alias">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[commitFormat].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[displayFormat].value">
-            <lang locale="en_US" value="$Fivouchered$" />
-            <lang locale="zh_CN" value="$Fivouchered$" />
-            <lang locale="zh_HK" value="$Fivouchered$" />
-            <lang locale="zh_TW" value="$Fivouchered$" />
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[editFormat].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[editable].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[queryInfo].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtProject].properties.property[required].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].components.component[prmtproject].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.ProjectClockEditUI].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.ProjectClockEditUI].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.ProjectClockEditUI].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.ProjectClockEditUI].components.component[prmtProject].properties.property[visible].value">
+        <rs key="uiObject[com.kingdee.eas.hr.project.client.ProjectClockEditUI].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" />

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 13 - 2
metadata/com/kingdee/eas/hr/project/client/ProjectClockListUI.ui


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است