diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 2b629fc..fb893e9 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -82,6 +82,19 @@ function arr2Object(arr, mapArr, keepBlank) { } return obj; } +function arr2ObjectVerify(line, arr, detailPropertyArr, detailProperty) { + var obj = {}; + for (var i = 0; i < detailPropertyArr.length; i++) { + var o = detailProperty[detailPropertyArr[i]]; + //空但是要求非空 + if(!arr[i] && o[0]){ + alert("第 "+(line+1)+" 行的 "+o[1]+" 不允许为空"); + return null; + } + obj[detailPropertyArr[i]]=arr[i]; + } + return obj; +} /** @@ -126,6 +139,21 @@ function convertDetail(data,detailPropertyArr, keepBlank) { } return details; } +function convertDetailVerify(data,detailProperty) { + var detailPropertyArr = Object.keys(detailProperty); + var arr = arrayToMatrix(data,detailPropertyArr.length); + + var details = []; + for (var i=0;i