mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目管理详情为空可以

master
xxssyyyyssxx 2021-11-24 20:36:50 +08:00
parent fb6d9a3c4f
commit b276366f39
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/resources/static/assets/js/project_budget.js
View File

@ -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 = {}; var obj = {};
for (var i = 0; i < mapArr.length; i++) { for (var i = 0; i < mapArr.length; i++) {
if(!arr[i]){ if(!arr[i] && !keepBlank){
//如果有空的就返回空
return null; return null;
} }
obj[mapArr[i]]=arr[i]; obj[mapArr[i]]=arr[i];
@ -95,12 +98,12 @@ function bindDeleteBtn() {
* @param detailPropertyArr * @param detailPropertyArr
* @returns {Array} * @returns {Array}
*/ */
function convertDetail(data,detailPropertyArr) { function convertDetail(data,detailPropertyArr, keepBlank) {
var arr = arrayToMatrix(data,detailPropertyArr.length); var arr = arrayToMatrix(data,detailPropertyArr.length);
var details = []; var details = [];
for (var i=0;i<arr.length;i++){ for (var i=0;i<arr.length;i++){
var obj = arr2Object(arr[i], detailPropertyArr); var obj = arr2Object(arr[i], detailPropertyArr, keepBlank);
if(obj){ if(obj){
details.push(obj); details.push(obj);
} }
@ -109,8 +112,8 @@ function convertDetail(data,detailPropertyArr) {
return details; return details;
} }
function prepareAjaxData(data,detailPropertyArr,projectId){ function prepareAjaxData(data,detailPropertyArr,projectId, keepBlank){
var details = convertDetail(data, detailPropertyArr); var details = convertDetail(data, detailPropertyArr, keepBlank);
return { return {
"details":details, "details":details,
"projectId":projectId "projectId":projectId

2
src/main/resources/static/assets/js/project_budget_cost.js
View File

@ -71,7 +71,7 @@ $(function () {
onConfirm: function(e) { onConfirm: function(e) {
//不能使用e.data，因为无法获取动态添加的 //不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-cost"); 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); postAjax(base+"/project/budgetEditSaveCostDetail", data, updateCostData);
}, },
onCancel: function(e) { onCancel: function(e) {

2
src/main/resources/static/assets/js/project_budget_cost_project_manage.js
View File

@ -9,7 +9,7 @@ $(function () {
onConfirm: function(e) { onConfirm: function(e) {
//不能使用e.data，因为无法获取动态添加的 //不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-cost-project-manage"); 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); postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
}, },
onCancel: function(e) { onCancel: function(e) {

2
src/main/resources/static/assets/js/project_budget_income.js
View File

@ -10,7 +10,7 @@ $(function () {
onConfirm: function(e) { onConfirm: function(e) {
//不能使用e.data，因为无法获取动态添加的 //不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-income"); 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); postAjax(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
}, },
onCancel: function(e) { onCancel: function(e) {

2
src/main/resources/static/assets/js/project_budget_plan.js
View File

@ -18,7 +18,7 @@ $(function () {
//不能使用e.data，因为无法获取动态添加的 //不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-budget-plan-detail"); 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); postAjax(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
}, },
onCancel: function(e) { onCancel: function(e) {

2
src/main/resources/templates/admin/project_approve.ftl
View File

@ -1899,7 +1899,7 @@
onConfirm: function (e) { onConfirm: function (e) {
//不能使用e.data，因为无法获取动态添加的 //不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-income"); 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); postAjax(base + "/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
}, },
onCancel: function (e) { onCancel: function (e) {