diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 07ed08d..32e5896 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -53,12 +53,15 @@ function arrayToMatrix(list, elementsPerSubArray) { /** * 根据映射关系将数组变为对象 + * @param arr 一行数据 + * @param mapArr 映射数组 + * @param keepBlank 如果有空的并且不保留空就返回空,废弃这一行 + * @returns {*} */ -function arr2Object(arr, mapArr) { +function arr2Object(arr, mapArr, keepBlank) { var obj = {}; for (var i = 0; i < mapArr.length; i++) { - if(!arr[i]){ - //如果有空的就返回空 + if(!arr[i] && !keepBlank){ return null; } obj[mapArr[i]]=arr[i]; @@ -95,12 +98,12 @@ function bindDeleteBtn() { * @param detailPropertyArr * @returns {Array} */ -function convertDetail(data,detailPropertyArr) { +function convertDetail(data,detailPropertyArr, keepBlank) { var arr = arrayToMatrix(data,detailPropertyArr.length); var details = []; for (var i=0;i