From b276366f399e8cb19a1e175a5adb668ee9534d63 Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Wed, 24 Nov 2021 20:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=BA=E7=A9=BA=E5=8F=AF=E4=BB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js          | 17 ++++++++++-------
 .../static/assets/js/project_budget_cost.js     |  2 +-
 .../js/project_budget_cost_project_manage.js    |  2 +-
 .../static/assets/js/project_budget_income.js   |  2 +-
 .../static/assets/js/project_budget_plan.js     |  2 +-
 .../templates/admin/project_approve.ftl         |  2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

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<arr.length;i++){
-        var obj = arr2Object(arr[i], detailPropertyArr);
+        var obj = arr2Object(arr[i], detailPropertyArr, keepBlank);
         if(obj){
             details.push(obj);
         }
@@ -109,8 +112,8 @@ function convertDetail(data,detailPropertyArr) {
     return details;
 }
 
-function prepareAjaxData(data,detailPropertyArr,projectId){
-    var details = convertDetail(data, detailPropertyArr);
+function prepareAjaxData(data,detailPropertyArr,projectId, keepBlank){
+    var details = convertDetail(data, detailPropertyArr, keepBlank);
     return {
         "details":details,
         "projectId":projectId
diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js
index 8c71e89..170f002 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -71,7 +71,7 @@ $(function () {
             onConfirm: function(e) {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-cost");
-                data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val());
+                data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val(),false);
                 postAjax(base+"/project/budgetEditSaveCostDetail", data, updateCostData);
             },
             onCancel: function(e) {
diff --git a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
index d92edb4..5cd2a7d 100644
--- a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
+++ b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
@@ -9,7 +9,7 @@ $(function () {
             onConfirm: function(e) {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-cost-project-manage");
-                data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val());
+                data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val(),true);
                 postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
             },
             onCancel: function(e) {
diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js
index 34d1a4c..d2150bc 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -10,7 +10,7 @@ $(function () {
             onConfirm: function(e) {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-income");
-                data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val());
+                data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val(),false);
                 postAjax(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
             },
             onCancel: function(e) {
diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index 99f05ea..5b455e2 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -18,7 +18,7 @@ $(function () {
 
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-budget-plan-detail");
-                data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val());
+                data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val(),false);
                 postAjax(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
             },
             onCancel: function(e) {
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index c455644..449d65b 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -1899,7 +1899,7 @@
                 onConfirm: function (e) {
                     //不能使用e.data，因为无法获取动态添加的
                     var data = collectData("am-modal-prompt-input-income");
-                    data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val());
+                    data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val(),false);
                     postAjax(base + "/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
                 },
                 onCancel: function (e) {