wanyong：项目工时填报分录更改父类继承

addon/customer/web/js/project/projectManagementEdit.js

@@ -5,6 +5,22 @@ shr.defineClass("shr.project.projectManagementEdit",shr.framework.Edit,{
 	initalizeDOM : function() {
 		shr.project.projectManagementEdit.superClass.initalizeDOM.call(this);
 		var _self = this;
+		   window.onload = function () {
+            var projectStateElement = document.getElementById('projectState');
+            if (projectStateElement) {
+                // var projectStateValue = projectStateElement.options[projectStateElement.selectedIndex].text;
+                   var projectStateValue = projectStateElement.value;
+                console.log('项目状态值为:', projectStateValue);
+                if (projectStateValue =="1") {
+                    $("#edit").hide();
+                }
+                if (projectStateValue == "1" || projectStateValue == "2") {
+                     $("#enable").hide();
+                }
+            } else {
+                console.log('未找到项目状态元素');
+            }
+        };
 	},
 	/**
 	 * 启用

addon/customer/web/js/project/projectManagementList.js

@@ -24,7 +24,7 @@ shr.defineClass("shr.project.projectManagementList",shr.framework.List,{
 				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
 				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
 					shr.showWarning({
-						message : '只能启用“未启用”、“禁用”的招聘项目！',
+						message : '只能启用“未启用”、“禁用”的项目！',
 						hideAfter : 5
 					});
 					return ;
@@ -57,7 +57,7 @@ shr.defineClass("shr.project.projectManagementList",shr.framework.List,{
 				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
 				if(state && state != '已启用' && state != "1"){
 					shr.showWarning({
-						message : '只能禁用“进行中”的招聘项目！！',
+						message : '只能禁用“进行中”的项目！！',
 						hideAfter : 5
 					});
 					return ;
@@ -92,7 +92,7 @@ shr.defineClass("shr.project.projectManagementList",shr.framework.List,{
 				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
 				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
 					shr.showWarning({
-						message : '只能结束“进行中”、“禁用”的招聘项目！',
+						message : '只能结束“进行中”、“禁用”的项目！',
 						hideAfter : 5
 					});
 					return ;

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

@@ -19,35 +19,7 @@
             <sqlType>VARCHAR</sqlType>
             <length>44</length>
             <scale>0</scale>
-            <precision>44</precision>
-        </column>
-        <column>
-            <name>FSeq</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[FSeq].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[FSeq].description</description>
-            <userDefined>true</userDefined>
-            <isMultilingual>false</isMultilingual>
-            <isEncoded>false</isEncoded>
-            <isNullable>true</isNullable>
-            <defaultValue />
-            <sqlType>INT</sqlType>
-            <length>4</length>
-            <scale>0</scale>
-            <precision>4</precision>
-        </column>
-        <column>
-            <name>FID</name>
-            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[FID].alias</alias>
-            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[FID].description</description>
-            <userDefined>true</userDefined>
-            <isMultilingual>false</isMultilingual>
-            <isEncoded>false</isEncoded>
-            <isNullable>false</isNullable>
-            <defaultValue>''</defaultValue>
-            <sqlType>VARCHAR</sqlType>
-            <length>44</length>
-            <scale>0</scale>
-            <precision>44</precision>
+            <precision>0</precision>
         </column>
         <column>
             <name>CFEmployeeID</name>
@@ -72,10 +44,10 @@
             <isEncoded>false</isEncoded>
             <isNullable>true</isNullable>
             <defaultValue />
-            <sqlType>NVARCHAR</sqlType>
+            <sqlType>VARCHAR</sqlType>
             <length>100</length>
             <scale>0</scale>
-            <precision>0</precision>
+            <precision>100</precision>
         </column>
         <column>
             <name>CFClockLocation</name>
@@ -86,10 +58,10 @@
             <isEncoded>false</isEncoded>
             <isNullable>true</isNullable>
             <defaultValue />
-            <sqlType>NVARCHAR</sqlType>
+            <sqlType>VARCHAR</sqlType>
             <length>100</length>
             <scale>0</scale>
-            <precision>0</precision>
+            <precision>100</precision>
         </column>
         <column>
             <name>CFData</name>
@@ -103,7 +75,7 @@
             <sqlType>DATETIME</sqlType>
             <length>8</length>
             <scale>0</scale>
-            <precision>0</precision>
+            <precision>8</precision>
         </column>
         <column>
             <name>CFWorkingHours</name>
@@ -128,10 +100,38 @@
             <isEncoded>false</isEncoded>
             <isNullable>true</isNullable>
             <defaultValue />
-            <sqlType>NVARCHAR</sqlType>
+            <sqlType>VARCHAR</sqlType>
             <length>100</length>
             <scale>0</scale>
-            <precision>0</precision>
+            <precision>100</precision>
+        </column>
+        <column>
+            <name>FSeq</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[FSeq].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[FSeq].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>INT</sqlType>
+            <length>4</length>
+            <scale>0</scale>
+            <precision>4</precision>
+        </column>
+        <column>
+            <name>FID</name>
+            <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[FID].alias</alias>
+            <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_WorkHoursReportEntry].columns.column[FID].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>false</isNullable>
+            <defaultValue />
+            <sqlType>VARCHAR</sqlType>
+            <length>44</length>
+            <scale>0</scale>
+            <precision>44</precision>
         </column>
     </columns>
     <primaryKey>
@@ -168,7 +168,7 @@
             </fkColumnPairs>
         </foreignKey>
         <foreignKey>
-            <name>CFK_PRO_PROWHREMm3</name>
+            <name>CFK_PRO_PROWHREMpl</name>
             <userDefined>true</userDefined>
             <refTable>
                 <key name="package" value="com.kingdee.eas.basedata.person" />

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

@@ -170,8 +170,8 @@
     <isAbstract>false</isAbstract>
     <bizUnitPK>com.kingdee.eas.hr.project.WorkHoursReport</bizUnitPK>
     <baseEntity>
-        <key name="package" value="com.kingdee.eas.framework.app" />
-        <key name="name" value="CoreBillEntryBase" />
+        <key name="package" value="com.kingdee.eas.hr.base.app" />
+        <key name="name" value="HRBillBaseEntry" />
     </baseEntity>
     <table>
         <key name="package" value="com.kingdee.eas.hr.project.app" />
@@ -343,6 +343,11 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].defaultViewextendedProperty.genBusinessImplCode">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.hr.project.app.WorkHoursReportEntry].description">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="" />

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

@@ -7,7 +7,7 @@ import com.kingdee.util.TypeConversionUtils;
 import com.kingdee.bos.util.BOSObjectType;
 
 
-public class AbstractWorkHoursReportEntryInfo extends com.kingdee.eas.framework.CoreBillEntryBaseInfo implements Serializable 
+public class AbstractWorkHoursReportEntryInfo extends com.kingdee.eas.hr.base.HRBillBaseEntryInfo implements Serializable 
 {
     public AbstractWorkHoursReportEntryInfo()
     {

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

@@ -10,7 +10,7 @@ import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.util.*;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
-import com.kingdee.eas.framework.ICoreBillEntryBase;
+import com.kingdee.eas.hr.base.IHRBillBaseEntry;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.eas.framework.CoreBaseInfo;
@@ -19,7 +19,7 @@ import java.lang.String;
 import com.kingdee.bos.Context;
 import com.kingdee.bos.framework.*;
 
-public interface IWorkHoursReportEntry extends ICoreBillEntryBase
+public interface IWorkHoursReportEntry extends IHRBillBaseEntry
 {
     public WorkHoursReportEntryInfo getWorkHoursReportEntryInfo(IObjectPK pk) throws BOSException, EASBizException;
     public WorkHoursReportEntryInfo getWorkHoursReportEntryInfo(IObjectPK pk, SelectorItemCollection selector) throws BOSException, EASBizException;

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

@@ -7,21 +7,21 @@ import com.kingdee.bos.framework.AbstractBizCtrl;
 import com.kingdee.bos.orm.template.ORMObject;
 
 import com.kingdee.bos.util.*;
-import com.kingdee.eas.framework.ICoreBillEntryBase;
 import com.kingdee.eas.hr.project.app.*;
 import com.kingdee.eas.framework.CoreBaseInfo;
-import com.kingdee.eas.framework.CoreBillEntryBase;
 import com.kingdee.bos.Context;
+import com.kingdee.eas.hr.base.HRBillBaseEntry;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
+import com.kingdee.eas.hr.base.IHRBillBaseEntry;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.framework.CoreBaseCollection;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;
 import com.kingdee.bos.framework.*;
 
-public class WorkHoursReportEntry extends CoreBillEntryBase implements IWorkHoursReportEntry
+public class WorkHoursReportEntry extends HRBillBaseEntry implements IWorkHoursReportEntry
 {
     public WorkHoursReportEntry()
     {

src/com/kingdee/eas/hr/project/app/AbstractWorkHoursReportEntryControllerBean.java

@@ -26,15 +26,16 @@ import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.hr.project.WorkHoursReportEntryInfo;
 import com.kingdee.eas.framework.CoreBillEntryBaseCollection;
 import com.kingdee.eas.framework.CoreBaseCollection;
+import com.kingdee.eas.hr.base.app.HRBillBaseEntryControllerBean;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.hr.project.WorkHoursReportEntryCollection;
 import com.kingdee.bos.metadata.entity.EntityViewInfo;
 import java.lang.String;
-import com.kingdee.eas.framework.app.CoreBillEntryBaseControllerBean;
+import com.kingdee.eas.hr.base.HRBillBaseEntryCollection;
 
 
 
-public abstract class AbstractWorkHoursReportEntryControllerBean extends CoreBillEntryBaseControllerBean implements WorkHoursReportEntryController
+public abstract class AbstractWorkHoursReportEntryControllerBean extends HRBillBaseEntryControllerBean implements WorkHoursReportEntryController
 {
     protected AbstractWorkHoursReportEntryControllerBean()
     {
@@ -189,6 +190,18 @@ public abstract class AbstractWorkHoursReportEntryControllerBean extends CoreBil
         return super._getCollection(ctx, svcCtx, oql);
     }
 
+    public HRBillBaseEntryCollection getHRBillBaseEntryCollection (Context ctx) throws BOSException
+    {
+    	return (HRBillBaseEntryCollection)(getWorkHoursReportEntryCollection(ctx).cast(HRBillBaseEntryCollection.class));
+    }
+    public HRBillBaseEntryCollection getHRBillBaseEntryCollection (Context ctx, EntityViewInfo view) throws BOSException
+    {
+    	return (HRBillBaseEntryCollection)(getWorkHoursReportEntryCollection(ctx, view).cast(HRBillBaseEntryCollection.class));
+    }
+    public HRBillBaseEntryCollection getHRBillBaseEntryCollection (Context ctx, String oql) throws BOSException
+    {
+    	return (HRBillBaseEntryCollection)(getWorkHoursReportEntryCollection(ctx, oql).cast(HRBillBaseEntryCollection.class));
+    }
     public CoreBillEntryBaseCollection getCoreBillEntryBaseCollection (Context ctx) throws BOSException
     {
     	return (CoreBillEntryBaseCollection)(getWorkHoursReportEntryCollection(ctx).cast(CoreBillEntryBaseCollection.class));

src/com/kingdee/eas/hr/project/app/WorkHoursReportEntryController.java

@@ -7,10 +7,10 @@ import com.kingdee.bos.util.*;
 import com.kingdee.bos.Context;
 
 import com.kingdee.bos.util.*;
-import com.kingdee.eas.framework.app.CoreBillEntryBaseController;
 import com.kingdee.eas.hr.project.WorkHoursReportEntryInfo;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.bos.Context;
+import com.kingdee.eas.hr.base.app.HRBillBaseEntryController;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
@@ -24,7 +24,7 @@ import com.kingdee.bos.framework.*;
 import java.rmi.RemoteException;
 import com.kingdee.bos.framework.ejb.BizController;
 
-public interface WorkHoursReportEntryController extends CoreBillEntryBaseController
+public interface WorkHoursReportEntryController extends HRBillBaseEntryController
 {
     public WorkHoursReportEntryInfo getWorkHoursReportEntryInfo(Context ctx, IObjectPK pk) throws BOSException, EASBizException, RemoteException;
     public WorkHoursReportEntryInfo getWorkHoursReportEntryInfo(Context ctx, IObjectPK pk, SelectorItemCollection selector) throws BOSException, EASBizException, RemoteException;