2 Commits aaffeedb5c ... 23f7b87b26

Author SHA1 Message Date
  huchenghua 23f7b87b26 Merge remote-tracking branch 'origin/master' 5 months ago
  huchenghua f00b3bd3d1 项目等级枚举调整 5 months ago

+ 2 - 69
addon/customer/web/js/project/projectManagementList.js

@@ -92,7 +92,7 @@ shr.defineClass("shr.project.projectManagementList",shr.framework.List,{
 				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
 				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
 				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
 				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
 					shr.showWarning({
 					shr.showWarning({
-						message : '只能结束“进行中”、“禁用”的项目!',
+						message : '只能删除“进行中”、“禁用”的项目!',
 						hideAfter : 5
 						hideAfter : 5
 					});
 					});
 					return ;
 					return ;
@@ -107,73 +107,6 @@ shr.defineClass("shr.project.projectManagementList",shr.framework.List,{
 				});
 				});
 			});
 			});
 		}
 		}
-	},	
-//	/**
-//	 * 描述:项目变更
-//	 * 
-//	 * @action
-//	 */
-//	changeAction : function() {
-//		var that = this;
-//		var billIds = $("#grid").jqGrid("getSelectedRows");
-//		if (billIds == undefined || billIds.length == 0 || (billIds && billIds.length == 1 && billIds[0] == "")) {
-//			shr.showWarning({
-//				message : "请先选中一行数据!",
-//				hideAfter : 5
-//			})
-//			return;
-//		} else {
-//			for(var i = 0; i < billIds.length; i++) {
-//				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
-//				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
-//					shr.showWarning({
-//						message : '只能删除“已禁用”的项目!',
-//						hideAfter : 5
-//					});
-//					return ;
-//				}
-//			}
-//			var confirmMsg = '是否确认删除所选项目?';
-//			shr.showConfirm(confirmMsg, function() {
-//				top.Messenger().hideAll();
-//				that.doRemoteWithBatchAction({
-//					method : "delete",
-//					billId : billIds.toString()
-//				});
-//			});
-//		}
-//	},
-//	/**描述:项目变更-列表
-//	 */
-//	changeListAction : function() {
-//		var that = this;
-//		var billIds = $("#grid").jqGrid("getSelectedRows");
-//		if (billIds == undefined || billIds.length == 0 || (billIds && billIds.length == 1 && billIds[0] == "")) {
-//			shr.showWarning({
-//				message : "请先选中一行数据!",
-//				hideAfter : 5
-//			})
-//			return;
-//		} else {
-//			for(var i = 0; i < billIds.length; i++) {
-//				var state = $("#grid").jqGrid("getCell",billIds[i], "projectState"); 
-//				if(state && state != '未启用' && state != '禁用' && state != "0" && state != "3"){
-//					shr.showWarning({
-//						message : '只能删除“已禁用”的项目!',
-//						hideAfter : 5
-//					});
-//					return ;
-//				}
-//			}
-//			var confirmMsg = '是否确认删除所选项目?';
-//			shr.showConfirm(confirmMsg, function() {
-//				top.Messenger().hideAll();
-//				that.doRemoteWithBatchAction({
-//					method : "deleteOne",
-//					billId : billIds.toString()
-//				});
-//			});
-//		}
-//	},
+	}
 });
 });
 
 

+ 9 - 9
metadata/com/kingdee/eas/hr/project/projectLevel.enum

@@ -42,21 +42,21 @@
         </rs>
         </rs>
         <rs key="bizEnum[com.kingdee.eas.hr.project.projectLevel].enumValues.enumValue[projectLevel1].alias">
         <rs key="bizEnum[com.kingdee.eas.hr.project.projectLevel].enumValues.enumValue[projectLevel1].alias">
             <lang locale="en_US" value="null" />
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="级别1" />
-            <lang locale="zh_HK" value="級別1" />
-            <lang locale="zh_TW" value="級別1" />
+            <lang locale="zh_CN" value="级" />
+            <lang locale="zh_HK" value="一级" />
+            <lang locale="zh_TW" value="一级" />
         </rs>
         </rs>
         <rs key="bizEnum[com.kingdee.eas.hr.project.projectLevel].enumValues.enumValue[projectLevel2].alias">
         <rs key="bizEnum[com.kingdee.eas.hr.project.projectLevel].enumValues.enumValue[projectLevel2].alias">
             <lang locale="en_US" value="null" />
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="级别2" />
-            <lang locale="zh_HK" value="級別2" />
-            <lang locale="zh_TW" value="級別2" />
+            <lang locale="zh_CN" value="级" />
+            <lang locale="zh_HK" value="二级" />
+            <lang locale="zh_TW" value="二级" />
         </rs>
         </rs>
         <rs key="bizEnum[com.kingdee.eas.hr.project.projectLevel].enumValues.enumValue[projectLevel3].alias">
         <rs key="bizEnum[com.kingdee.eas.hr.project.projectLevel].enumValues.enumValue[projectLevel3].alias">
             <lang locale="en_US" value="null" />
             <lang locale="en_US" value="null" />
-            <lang locale="zh_CN" value="级别3" />
-            <lang locale="zh_HK" value="級別3" />
-            <lang locale="zh_TW" value="級別3" />
+            <lang locale="zh_CN" value="级" />
+            <lang locale="zh_HK" value="三级" />
+            <lang locale="zh_TW" value="三级" />
         </rs>
         </rs>
     </resource>
     </resource>
 </bizEnum>
 </bizEnum>

+ 3 - 3
src/com/kingdee/eas/hr/project/projectLevel.java

@@ -13,9 +13,9 @@ import com.kingdee.util.enums.StringEnum;
  */
  */
 public class projectLevel extends StringEnum
 public class projectLevel extends StringEnum
 {
 {
-    public static final String PROJECTLEVEL1_VALUE = "1";//alias=级别1
-    public static final String PROJECTLEVEL2_VALUE = "2";//alias=级别2
-    public static final String PROJECTLEVEL3_VALUE = "3";//alias=级别3
+    public static final String PROJECTLEVEL1_VALUE = "1";//alias=
+    public static final String PROJECTLEVEL2_VALUE = "2";//alias=
+    public static final String PROJECTLEVEL3_VALUE = "3";//alias=
 
 
     public static final projectLevel projectLevel1 = new projectLevel("projectLevel1", PROJECTLEVEL1_VALUE);
     public static final projectLevel projectLevel1 = new projectLevel("projectLevel1", PROJECTLEVEL1_VALUE);
     public static final projectLevel projectLevel2 = new projectLevel("projectLevel2", PROJECTLEVEL2_VALUE);
     public static final projectLevel projectLevel2 = new projectLevel("projectLevel2", PROJECTLEVEL2_VALUE);

+ 3 - 3
src/com/kingdee/eas/hr/project/projectLevel.properties

@@ -1,3 +1,3 @@
-projectLevel1=\u7EA7\u522B1
-projectLevel2=\u7EA7\u522B2
-projectLevel3=\u7EA7\u522B3
+projectLevel1=\u4E00\u7EA7
+projectLevel2=\u4E8C\u7EA7
+projectLevel3=\u4E09\u7EA7

+ 3 - 3
src/com/kingdee/eas/hr/project/projectLevel_l2.properties

@@ -1,3 +1,3 @@
-projectLevel1=\u7EA7\u522B1
-projectLevel2=\u7EA7\u522B2
-projectLevel3=\u7EA7\u522B3
+projectLevel1=\u4E00\u7EA7
+projectLevel2=\u4E8C\u7EA7
+projectLevel3=\u4E09\u7EA7

+ 3 - 3
src/com/kingdee/eas/hr/project/projectLevel_l3.properties

@@ -1,3 +1,3 @@
-projectLevel1=\u7D1A\u52251
-projectLevel2=\u7D1A\u52252
-projectLevel3=\u7D1A\u52253
+projectLevel1=\u4E00\u7EA7
+projectLevel2=\u4E8C\u7EA7
+projectLevel3=\u4E09\u7EA7