样式优化

src/main/resources/static/assets/js/project_budget_plan.js

@@ -6,6 +6,7 @@ $(function () {
     $(".budget-plan-detail").click(function () {
         $('#my-prompt-budget-plan-detail').modal({
             relatedTarget: this,
+            closeOnConfirm:false,
             onConfirm: function(e) {
 
                 //校验数据正确性
@@ -46,6 +47,18 @@ $(function () {
  * 校验失败返回相应的报错信息，否则返回""
  */
 function verifyBudgetPlan(){
+    //判断月份是否有重复
+    var months = [];
+    $(".input-changeable-month-budget-plan").each(function () {
+        months.push($(this).val());
+    });
+    var ms = months.sort();
+    for(var i = 0; i < ms.length - 1; i++) {
+        if(ms[i] == ms[i + 1]) {
+            return "选择的月份有重复，["+ms[i]+"]";
+        }
+    }
+
 
     var costPurchaseDeviceTaxExclude = inputVal("costPurchaseDeviceTaxExclude");
     var costPurchaseBuildTaxExclude = inputVal("costPurchaseBuildTaxExclude");
@@ -61,7 +74,7 @@ function verifyBudgetPlan(){
     var input_total_earnest_money_income_budget_plan = classVal("input-total-earnest-money-income-budget-plan");
 
 
-    /*//从采购成本明细中取“设备”大类下的总计---设备支出
+    //从采购成本明细中取“设备”大类下的总计---设备支出
     if(costPurchaseDeviceTaxExclude != input_total_device_cost_budget_plan){
         return "采购成本明细中取“设备”大类下的总计["+costPurchaseDeviceTaxExclude+"]与设备支出["+input_total_device_cost_budget_plan+"]不等";
     }
@@ -81,17 +94,6 @@ function verifyBudgetPlan(){
     //保证金支出和收入一致
     if(input_total_earnest_money_cost_budget_plan != input_total_earnest_money_income_budget_plan){
         return "保证金支出["+input_total_earnest_money_cost_budget_plan+"]与保证金收款["+input_total_earnest_money_income_budget_plan+"]不等";
-    }*/
-
-    var months = [];
-    $(".input-changeable-month-budget-plan").each(function () {
-        months.push($(this).val());
-    });
-    var ms = months.sort();
-    for(var i = 0; i < ms.length - 1; i++) {
-        if(ms[i] == ms[i + 1]) {
-            return "选择的月份有重复，["+ms[i]+"]";
-        }
     }
 
     return "";

src/main/resources/templates/admin/project_budget_edit.ftl

@@ -20,6 +20,10 @@
     input[readonly]{
         background-color: #eee;
     }
+
+    .am-btn-warning {
+        color: #F37B1D;
+    }
 </style>
 
 <div class="admin-content">
@@ -593,7 +597,7 @@
     <#--资金计划明细表弹窗-->
     <div class="am-modal am-modal-prompt" style="width: 1500px;max-height:600px;overflow-y:auto;" tabindex="-1" id="my-prompt-budget-plan-detail">
         <div class="am-modal-dialog">
-            <div class="am-modal-hd">新增资金计划明细表——${project.name}</div>
+            <div class="am-modal-hd">新增资金计划明细表——${project.name}<a href="javascript: void(0)" class="am-close<#-- am-close-spin-->" data-am-modal-close>&times;</a></div>
             <div class="am-modal-bd">
                 <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="budgetPlanDetailTable">
                     <tbody>