diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 3bef2b3..f59af9c 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -394,6 +394,16 @@ function checkIfFillIn() { var valueRisk = $("#valueRiskBudget").val(); var principal = $("#principalBudget").val(); + + var contractTimeBudget = $("#contractTimeBudget").val(); + var bidsTimeBudget = $("#bidsTimeBudget").val(); + var isSecondBudget = $("#isSecondBudget").val(); + var signTypeBudget = $("#signTypeBudget").val(); + var calculationCollectionBudget = $("#calculationCollectionBudget").val(); + + + + if (name.length <= 0) { window.confirm('项目名称不能为空'); check = 1; @@ -511,6 +521,33 @@ function checkIfFillIn() { check = 1; return; } + + if (contractTimeBudget.length <= 0) { + window.confirm('预计合同签订时间不能为空'); + check = 1; + return; + } + // + if (bidsTimeBudget.length <= 0) { + window.confirm('项目计划招标时间不能为空'); + check = 1; + return; + } + if(!isSecondBudget){ + window.confirm('是否二次合作不能为空'); + check = 1; + return; + } + if(!signTypeBudget){ + window.confirm('是否汇智中标不能为空'); + check = 1; + return; + } + if(!calculationCollectionBudget){ + window.confirm('计收计划不能为空'); + check = 1; + return; + } } /** 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 a43a403..3ec5584 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -392,8 +392,8 @@ function appendTrBudgetPlan() { ' \n' + ' \n' + - ' \n' + - ' \n' + + ' \n' + + ' \n' + ' \n' + ' \n' + ' \n' + diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 50fd142..575d291 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -787,7 +787,7 @@ name="principalBudget" placeholder="请输入项目负责人" maxlength="20" value="${projectBudget.principalBudget!}"/> - *预计合同签订时间: - *项目计划招标时间: - 是否二次合作: + *是否二次合作: - 是否汇智中标: + *是否汇智中标: