gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

单据提交的bug修复

Browse Source
This commit is contained in:
季圣华 2017-12-03 22:42:05 +08:00
parent 884be9bfe2
commit ced1b082bc
1 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/webapp/js/pages/materials/in_out.js
View File

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