diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index fb893e9..f86f10e 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -9,7 +9,7 @@ $(function () { var message = verifyProjectContributionProfitRate(); if (message) { - alert(message); + layuiAlert(message); return ; } console.log(message); @@ -28,7 +28,7 @@ $(function () { var message = verifyProjectContributionProfitRate(); if (message) { - alert(message); + layuiAlert(message); return; } @@ -88,7 +88,7 @@ function arr2ObjectVerify(line, arr, detailPropertyArr, detailProperty) { var o = detailProperty[detailPropertyArr[i]]; //空但是要求非空 if(!arr[i] && o[0]){ - alert("第 "+(line+1)+" 行的 "+o[1]+" 不允许为空"); + layuiAlert("第 "+(line+1)+" 行的 "+o[1]+" 不允许为空"); return null; } obj[detailPropertyArr[i]]=arr[i]; 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 becc563..0de7a9f 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -222,7 +222,7 @@ function updateCostData(data, returnData) { updateProjectContributionProfitRate(); - alert("保存成功"); + layuiAlert("保存成功"); $('#my-prompt-cost-detail').modal('close'); } 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 33e3f42..8aa2442 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 @@ -154,6 +154,6 @@ function updateCostProjectManageData(data,returnData) { updateProjectContributionProfitRate(); - alert("保存成功"); + layuiAlert("保存成功"); $('#my-prompt-cost-project-manage-detail').modal('close'); } \ No newline at end of file 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 2c8e101..bc43d3b 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -81,7 +81,7 @@ function updateIncomeData(data,returnData) { updateProjectContributionProfitRate(); - alert("保存成功"); + layuiAlert("保存成功"); $('#my-prompt-income-detail').modal('close'); } 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 1a55db4..edf0102 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -29,7 +29,7 @@ $(function () { //校验数据正确性 var message = verifyBudgetPlan(); if (message) { - alert(message); + layuiAlert(message); return; } @@ -615,7 +615,7 @@ function updateBudgetPlanDetailData(data,returnData) { //更新现金流量 updateCashFlow(); - alert("保存成功"); + layuiAlert("保存成功"); $('#my-prompt-budget-plan-detail').modal('close'); } diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js index c185e1e..40ddd13 100644 --- a/src/main/resources/static/assets/js/project_common.js +++ b/src/main/resources/static/assets/js/project_common.js @@ -1,3 +1,15 @@ +/** + * 使用layui的alert,效果更好 + * @param msg + */ +var layuiAlert = function(msg) { + layui.use('layer', function(){ + var layer = layui.layer; + layer.alert(msg); + }); +}; + + /** * parse float保留两位小数,四舍五入 * 空格或者非数字认为是0 diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index f98a4b4..73a17cf 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -735,6 +735,7 @@ +