wanyong 6 月之前
父节点
当前提交
77ebf51c70

+ 0 - 33
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI.java

@@ -66,10 +66,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contnotes;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer1;
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer kDLabelContainer2;
-<<<<<<< HEAD
-=======
     protected com.kingdee.bos.ctrl.swing.KDLabelContainer contprojectLevel;
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtCreator;
     protected com.kingdee.bos.ctrl.swing.KDDatePicker kDDateCreateTime;
     protected com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox prmtLastUpdateUser;
@@ -88,10 +85,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
     protected com.kingdee.bos.ctrl.swing.KDTextField txtnotes;
     protected com.kingdee.bos.ctrl.swing.KDFormattedTextField kDFormattedTextField1;
     protected com.kingdee.bos.ctrl.swing.KDFormattedTextField kDFormattedTextField2;
-<<<<<<< HEAD
-=======
     protected com.kingdee.bos.ctrl.swing.KDComboBox projectLevel;
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
     protected com.kingdee.eas.hr.project.ProjectManagementInfo editData = null;
     /**
      * output class constructor
@@ -175,10 +169,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.contnotes = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.kDLabelContainer1 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
         this.kDLabelContainer2 = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
-<<<<<<< HEAD
-=======
         this.contprojectLevel = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
         this.prmtCreator = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
         this.kDDateCreateTime = new com.kingdee.bos.ctrl.swing.KDDatePicker();
         this.prmtLastUpdateUser = new com.kingdee.bos.ctrl.extendcontrols.KDBizPromptBox();
@@ -197,10 +188,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.txtnotes = new com.kingdee.bos.ctrl.swing.KDTextField();
         this.kDFormattedTextField1 = new com.kingdee.bos.ctrl.swing.KDFormattedTextField();
         this.kDFormattedTextField2 = new com.kingdee.bos.ctrl.swing.KDFormattedTextField();
-<<<<<<< HEAD
-=======
         this.projectLevel = new com.kingdee.bos.ctrl.swing.KDComboBox();
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
         this.contCreator.setName("contCreator");
         this.contCreateTime.setName("contCreateTime");
         this.contLastUpdateUser.setName("contLastUpdateUser");
@@ -220,10 +208,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.contnotes.setName("contnotes");
         this.kDLabelContainer1.setName("kDLabelContainer1");
         this.kDLabelContainer2.setName("kDLabelContainer2");
-<<<<<<< HEAD
-=======
         this.contprojectLevel.setName("contprojectLevel");
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
         this.prmtCreator.setName("prmtCreator");
         this.kDDateCreateTime.setName("kDDateCreateTime");
         this.prmtLastUpdateUser.setName("prmtLastUpdateUser");
@@ -242,10 +227,7 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.txtnotes.setName("txtnotes");
         this.kDFormattedTextField1.setName("kDFormattedTextField1");
         this.kDFormattedTextField2.setName("kDFormattedTextField2");
-<<<<<<< HEAD
-=======
         this.projectLevel.setName("projectLevel");
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
         // CoreUI		
         this.btnTraceUp.setVisible(false);		
         this.btnTraceDown.setVisible(false);		
@@ -317,14 +299,11 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
 
 
         this.kdtEntrys.checkParsed();
-<<<<<<< HEAD
-=======
         KDTextArea kdtEntrys_clockLocation_TextArea = new KDTextArea();
         kdtEntrys_clockLocation_TextArea.setName("kdtEntrys_clockLocation_TextArea");
         kdtEntrys_clockLocation_TextArea.setMaxLength(500);
         KDTDefaultCellEditor kdtEntrys_clockLocation_CellEditor = new KDTDefaultCellEditor(kdtEntrys_clockLocation_TextArea);
         this.kdtEntrys.getColumn("clockLocation").setEditor(kdtEntrys_clockLocation_CellEditor);
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
         // contprojectCode		
         this.contprojectCode.setBoundLabelText(resHelper.getString("contprojectCode.boundLabelText"));		
         this.contprojectCode.setBoundLabelLength(100);		
@@ -375,14 +354,11 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.kDLabelContainer2.setBoundLabelLength(100);		
         this.kDLabelContainer2.setBoundLabelUnderline(true);		
         this.kDLabelContainer2.setVisible(true);
-<<<<<<< HEAD
-=======
         // contprojectLevel		
         this.contprojectLevel.setBoundLabelText(resHelper.getString("contprojectLevel.boundLabelText"));		
         this.contprojectLevel.setBoundLabelLength(100);		
         this.contprojectLevel.setBoundLabelUnderline(true);		
         this.contprojectLevel.setVisible(true);
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
         // prmtCreator		
         this.prmtCreator.setEnabled(false);
         // kDDateCreateTime		
@@ -467,15 +443,12 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.kDFormattedTextField2.setMaximumValue( new java.math.BigDecimal("1.0E18"));		
         this.kDFormattedTextField2.setPrecision(10);		
         this.kDFormattedTextField2.setRequired(false);
-<<<<<<< HEAD
         this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtprojectCode,txtprojectName,projectLevel,prmtprojectManager,pkexpectedStartTime,pkexpectedEndTime,txttotalPersonDays,txtcostAmount,txtnotes}));
-=======
         // projectLevel		
         this.projectLevel.setVisible(true);		
         this.projectLevel.addItems(EnumUtils.getEnumList("com.kingdee.eas.hr.project.projectLevel").toArray());		
         this.projectLevel.setRequired(false);
         this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtprojectCode,txtprojectName,prmtprojectManager,pkexpectedStartTime,pkexpectedEndTime,txttotalPersonDays,txtcostAmount,txtnotes,projectLevel}));
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
         this.setFocusCycleRoot(true);
 		//Register control's property binding
 		registerBindings();
@@ -542,11 +515,8 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         this.add(kDLabelContainer1, null);
         kDLabelContainer2.setBounds(new Rectangle(388, 99, 270, 19));
         this.add(kDLabelContainer2, null);
-<<<<<<< HEAD
-=======
         contprojectLevel.setBounds(new Rectangle(0, 0, 270, 19));
         this.add(contprojectLevel, null);
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
         //contCreator
         contCreator.setBoundEditor(prmtCreator);
         //contCreateTime
@@ -583,11 +553,8 @@ public abstract class AbstractProjectManagementEditUI extends com.kingdee.eas.fr
         kDLabelContainer1.setBoundEditor(kDFormattedTextField1);
         //kDLabelContainer2
         kDLabelContainer2.setBoundEditor(kDFormattedTextField2);
-<<<<<<< HEAD
-=======
         //contprojectLevel
         contprojectLevel.setBoundEditor(projectLevel);
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
 
     }
 

+ 0 - 3
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI.properties

@@ -20,11 +20,8 @@ contcostAmount.boundLabelText=\u603B\u4EBA\u5929\u8BDA\u672C\u91D1\u989D
 contnotes.boundLabelText=\u5907\u6CE8
 kDLabelContainer1.boundLabelText=\u5DF2\u62A5\u5DE5\u4EBA\u5929
 kDLabelContainer2.boundLabelText=\u4EBA\u5929\u8017\u7528\u5360\u6BD4
-<<<<<<< HEAD
-=======
 contprojectLevel.boundLabelText=\u9879\u76EE\u7EA7\u522B
 projectLevel.items=[Enum]com.kingdee.eas.hr.project.projectLevel
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

+ 0 - 3
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l1.properties

@@ -19,11 +19,8 @@ contcostAmount.boundLabelText=
 contnotes.boundLabelText=
 kDLabelContainer1.boundLabelText=
 kDLabelContainer2.boundLabelText=
-<<<<<<< HEAD
-=======
 contprojectLevel.boundLabelText=
 projectLevel.items=
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
 ActionSubmit.SHORT_DESCRIPTION=
 ActionSubmit.LONG_DESCRIPTION=
 ActionSubmit.NAME=

+ 0 - 3
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l2.properties

@@ -20,11 +20,8 @@ contcostAmount.boundLabelText=\u603B\u4EBA\u5929\u8BDA\u672C\u91D1\u989D
 contnotes.boundLabelText=\u5907\u6CE8
 kDLabelContainer1.boundLabelText=\u5DF2\u62A5\u5DE5\u4EBA\u5929
 kDLabelContainer2.boundLabelText=\u4EBA\u5929\u8017\u7528\u5360\u6BD4
-<<<<<<< HEAD
-=======
 contprojectLevel.boundLabelText=\u9879\u76EE\u7EA7\u522B
 projectLevel.items=[Enum]com.kingdee.eas.hr.project.projectLevel
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

+ 0 - 3
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementEditUI_l3.properties

@@ -20,11 +20,8 @@ contcostAmount.boundLabelText=\u7E3D\u4EBA\u5929\u8AA0\u672C\u91D1\u984D
 contnotes.boundLabelText=\u5099\u8A3B
 kDLabelContainer1.boundLabelText=\u5DF2\u5831\u5DE5\u4EBA\u5929
 kDLabelContainer2.boundLabelText=\u4EBA\u5929\u8017\u7528\u5360\u6BD4
-<<<<<<< HEAD
-=======
 contprojectLevel.boundLabelText=\u9805\u76EE\u7D1A\u5225
 projectLevel.items=[Enum]com.kingdee.eas.hr.project.projectLevel
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
 ActionSubmit.SHORT_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.LONG_DESCRIPTION=\u63D0\u4EA4
 ActionSubmit.NAME=\u63D0\u4EA4

文件差异内容过多而无法显示
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI.java


文件差异内容过多而无法显示
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI.properties


文件差异内容过多而无法显示
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI_l2.properties


文件差异内容过多而无法显示
+ 0 - 1
src/com/kingdee/eas/hr/project/client/AbstractProjectManagementListUI_l3.properties


部分文件因为文件数量过多而无法显示