Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
===================================================================
diff -u -r22102 -r22130
--- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js	(.../workFlowApprovalTaskForm.js)	(revision 22102)
+++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js	(.../workFlowApprovalTaskForm.js)	(revision 22130)
@@ -71,7 +71,6 @@
 		 
 		 if(result.success){
 			 grid.reloadData();
-			 //grid.loadData();
 			 showResult(result.message);
 			 passWindowObj.close();
 			 approvalWindowObj.close();
@@ -82,32 +81,32 @@
 	
 	
 	function updateHandleOpinion(){
-			 var approvalResult = 0;
-			 var handleOpinion = Ext4.getCmp('failFormObj').getForm().findField('failHandleOpinion').getValue();
-			 var result =failHandleOpinionFlag(workFlowApprovalTaskId,formId,approvalResult,handleOpinion);
-			 if(result.success){
-				 grid.reloadData();
-				 showResult("审批成功");
-				 failWindowObj.close();
-				 approvalWindowObj.close();
-			 }else{
-				 showResult(result.message);
-			 }
-		}
+		 var approvalResult = 0;
+		 var handleOpinion = Ext4.getCmp('failFormObj').getForm().findField('failHandleOpinion').getValue();
+		 var result =failHandleOpinionFlag(workFlowApprovalTaskId,formId,approvalResult,handleOpinion);
+		 if(result.success){
+			 grid.reloadData();
+			 showResult("审批成功");
+			 failWindowObj.close();
+			 approvalWindowObj.close();
+		 }else{
+			 showResult(result.message);
+		 }
+	}
 
-		function rollBackHandleOpinion(){	
-			 var approvalResult = 0;
-			 var handleOpinion = Ext4.getCmp('rollBackformObj').getForm().findField('rollBackHandleOpinion').getValue();
-			 var result =callbackSaveHandleOpinionFlag(nodeDefinition_id,workFlowApprovalTaskId,4,handleOpinion);
-			 if(result.success){
-				 grid.reloadData();
-				 showResult("审批成功");
-				 rollBackWindowObj.close();
-				 approvalWindowObj.close();
-			 }else{
-				 showResult("审批失败");
-			 }
-		}
+	function rollBackHandleOpinion(){	
+		 var approvalResult = 0;
+		 var handleOpinion = Ext4.getCmp('rollBackformObj').getForm().findField('rollBackHandleOpinion').getValue();
+		 var result =callbackSaveHandleOpinionFlag(nodeDefinition_id,workFlowApprovalTaskId,4,handleOpinion);
+		 if(result.success){
+			 grid.reloadData();
+			 showResult("审批成功");
+			 rollBackWindowObj.close();
+			 approvalWindowObj.close();
+		 }else{
+			 showResult("审批失败");
+		 }
+	}
 	
 	function submit(){
 		 //弹出警示框
@@ -129,6 +128,7 @@
 		    	formId: formId,
 		    	formType: formType
 	    };
+		//正常通知时要调用表单修改内容,否则是失败通知起单人
 		if(approvalResult==APPROVALRESULT_NOTICE){
 			 var result =confirmNoticeSaveHandleOpinionFlag(workFlowApprovalTaskVO);
 			 if(result.success){
@@ -233,7 +233,6 @@
 			autoScroll : true,
 			buttonAlign : 'center',
 			buttons : [ {
-				//id : 'save',
 				name : 'save',
 				text : '保存',
 				handler : function() {
@@ -365,7 +364,7 @@
 		labelSeparator : ': ',
 		bodyPadding : '5 5 5 5',
 		autoScroll : true,
-		buttonAlign : 'center',
+		buttonAlign : 'center', 
 		buttons : [{
 			text : '确认',
 			iconCls : 'btn_ext_application_edit',
@@ -389,7 +388,7 @@
 			}
 		},{
 			text : '审核不通过',
-			iconCls : 'btn_ext_application_edit',
+			iconCls : 'btn_ext_application_edit',	
 			hidden:  (allowStore.getAt(0).get('allowNoticeFormMan'))||approvalResult==APPROVALRESULT_NOTICEFAIL||(!allowStore.getAt(0).get('allowNoticeFormMan')&&!allowStore.getAt(0).get('allowDisagree'))?true:false,
 			handler : function() {
 				Fail();
@@ -438,7 +437,32 @@
 		items : approvalFormObj
 	});
 	approvalWindowObj.show();
-
+	/*
+	function getByClassName(className){
+		if(document.getElementsByClassName){
+			return document.getElementsByClassName(className);
+		}else{
+			var ele=document.getElementsByTagName('*');
+			var arr=[];
+			for(var i=0;i<ele.length;i++){
+				if(ele[i].className==className){
+					arr.push(ele[i]);
+				}
+			}
+			return arr;
+		}
+	}
+	var objBtn =getByClassName("x4-btn-inner-center");
+	for(var i=objBtn.length-1;i>=objBtn.length-8;i--){
+		objBtn[i].style.setProperty("padding-left","10px");
+		objBtn[i].style.setProperty("padding-right","10px");
+	}*/
+	//设置按钮文字居中
+	var obj = document.getElementsByClassName("x4-btn-inner-center");
+	for(var i=obj.length-1;i>=obj.length-8;i--){
+		obj[i].style.setProperty("padding-left","10px");
+		obj[i].style.setProperty("padding-right","10px");
+	}
 }
 
 function confirmNoticeSaveHandleOpinionFlag(workFlowApprovalTaskVO){
@@ -447,6 +471,7 @@
 	return sub.updateExpensiveGoodsApplicationByApproval(workFlowApprovalTaskVO);
 }
 
+
 function submitSaveHandleOpinionFlag(workFlowApprovalTaskId,formId,formType){
 	var sub = document.getElementById("formIframe").contentWindow;
 	if(!sub) return false;