Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupForm.js
===================================================================
diff -u -r21618 -r28794
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupForm.js	(.../taskGroupForm.js)	(revision 21618)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupForm.js	(.../taskGroupForm.js)	(revision 28794)
@@ -1,6 +1,7 @@
 var id;
 var formObj;
 var taskGroupWin;
+var oldName = '';
 function addAndEditContainer(id) {
 	this.id = id;
 	
@@ -145,6 +146,7 @@
 			method : 'GET',
 			waitMsg : '正在加载数据，请稍候',
 			success : function(form, action) {
+				oldName = action.result.data.taskGroupName;
 			},
 			failure : function(form, action) {
 			},
@@ -156,34 +158,73 @@
 }
 
 function validateAndSubmit1(){
-	Ext.Ajax.request({
-		url :  WWWROOT + '/disinfectSystem/baseData/taskGroupAction!validate.do',
-		params : {validateId : top.Ext.getCmp('id').getValue(),valifateName:top.Ext.getCmp('taskGroupName').getValue()},
-		success : function(response, options) {
-			var result = Ext.decode(response.responseText);
-			if(result.stauts==1){
-				formObj.form.submit({
-					url : WWWROOT + '/disinfectSystem/baseData/taskGroupAction!saveTaskGroup.do',
-					method : 'POST',
-					waitMsg : '正在保存数据，请稍候',
-					waitTitle : '提交表单',
-					success : function(form, action) {
-						cancel();
-						showResult('保存成功');
-						grid.dwrReload();
-					},
-					failure : function(form, action) {
+	var id = top.Ext.getCmp('id').getValue();
+	var taskGroupName = top.Ext.getCmp('taskGroupName').getValue();
+	if(id == ''){
+		Ext.Ajax.request({
+			url :  WWWROOT + '/disinfectSystem/baseData/taskGroupAction!validate.do',
+			params : {validateId : id,valifateName:taskGroupName},
+			success : function(response, options) {
+				var result = Ext.decode(response.responseText);
+				if(result.stauts==1){
+					formObj.form.submit({
+						url : WWWROOT + '/disinfectSystem/baseData/taskGroupAction!saveTaskGroup.do?oldTaskGroupName='+oldName,
+						method : 'POST',
+						waitMsg : '正在保存数据，请稍候',
+						waitTitle : '提交表单',
+						success : function(form, action) {
+							cancel();
+							showResult('保存成功');
+							grid.dwrReload();
+						},
+						failure : function(form, action) {
+						}
+					});
+				}else{
+					showResult(result.message);
+				}
+			},
+			failure : function(response, options) {
+			}
+		});
+	}else {
+		top.Ext.MessageBox
+		.confirm("请确认",
+				"修改任务组名称会联动修改包定义以及待装配任务的任务组，您确定要修改任务组名称吗？",
+				function(button, text) {
+					if ("yes" == button){
+						Ext.Ajax.request({
+							url :  WWWROOT + '/disinfectSystem/baseData/taskGroupAction!validate.do',
+							params : {validateId : id,valifateName:taskGroupName},
+							success : function(response, options) {
+								var result = Ext.decode(response.responseText);
+								if(result.stauts==1){
+									formObj.form.submit({
+										url : WWWROOT + '/disinfectSystem/baseData/taskGroupAction!saveTaskGroup.do?oldTaskGroupName='+oldName,
+										method : 'POST',
+										waitMsg : '正在保存数据，请稍候',
+										waitTitle : '提交表单',
+										success : function(form, action) {
+											cancel();
+											showResult('保存成功');
+											grid.dwrReload();
+										},
+										failure : function(form, action) {
+										}
+									});
+								}else{
+									showResult(result.message);
+								}
+							},
+							failure : function(response, options) {
+							}
+						});
 					}
 				});
-			}else{
-				showResult(result.message);
-			}
-		},
-		failure : function(response, options) {
-		}
-	});
-}
+	}
 
+	
+}
 function save() {
 	this.disable();
 	if (!formObj.form.isValid()) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupView.js
===================================================================
diff -u -r22459 -r28794
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupView.js	(.../taskGroupView.js)	(revision 22459)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupView.js	(.../taskGroupView.js)	(revision 28794)
@@ -24,7 +24,7 @@
 					function(button, text) {
 						if ("yes" == button){
 							Ext.Ajax.request({
-								url : WWWROOT + '/disinfectSystem/baseData/taskGroupAction!deleteTaskGroup.do',
+								url : WWWROOT + '/disinfectSystem/packingAction!deleteTaskGroup.do',
 								params : {
 									ids : ids
 								},success : function(response, options) {