单据提交的bug修复

src/main/webapp/js/pages/materials/in_out.js

@@ -1999,6 +1999,19 @@
 				}
 				else if(listTitle === "调拨出库列表"){
 
+				}
+				//进行明细的校验
+				if(depotHeadID ==0) {
+					//新增模式下
+					if (!CheckData("add")) {
+						return;
+					}
+				}
+				else {
+					//编辑模式下
+					if (!CheckData("edit")) {
+						return;
+					}
 				}
 				var OrganId = null, ProjectId = null,AllocationProjectId = null;
 				var ChangeAmount = $.trim($("#ChangeAmount").val())-0;
@@ -2121,11 +2134,11 @@
 							if(depotHeadID ==0)
 							{
 								getMaxId(); //查找最大的Id
-								accept(depotHeadMaxId,closeDialog,"add"); //新增
+								accept(depotHeadMaxId,closeDialog); //新增
 							}
 							else
 							{
-								accept(depotHeadID,closeDialog,"edit"); //修改
+								accept(depotHeadID,closeDialog); //修改
 							}
 						}
 						else
@@ -2871,7 +2884,14 @@
 	    editIndex = undefined;
 	}
 	//判断
-	function CheckData() {
+	function CheckData(type) {
+		append();
+		removeit();
+		var change = $('#materialData').datagrid('getChanges').length;
+		if(type =="add" && !change) {
+			$.messager.alert('提示','请输入明细信息！','warning');
+			return false;
+		}
 	    var row = $('#materialData').datagrid('getRows');
 		if(!row.length){
 			$.messager.alert('提示',"请输入明细信息！",'info');
@@ -2891,18 +2911,7 @@
 	    return true;
 	}
 	//保存
-	function accept(accepId,fun,type) {
-	    append();
-	    removeit();
-		var change = $('#materialData').datagrid('getChanges').length;
-		if(type =="add" && !change) {
-			$.messager.alert('提示','请输入明细信息！','warning');
-			return;
-		}
-	    if (change) {
-	        if (!CheckData()) {
-				return;
-			}
+	function accept(accepId,fun) {
 		var inserted = $("#materialData").datagrid('getChanges', "inserted");
 		var deleted = $("#materialData").datagrid('getChanges', "deleted");
 		var updated = $("#materialData").datagrid('getChanges', "updated");
@@ -2932,10 +2941,6 @@
 				fun && fun();
 			}
 		});
-	    }
-		else {
-			fun && fun();
-		}
 	    if (endEditing()) {
 	        $('#materialData').datagrid('acceptChanges');
 	    }