diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js
index e6bb101..5af16c7 100644
--- a/src/main/resources/static/assets/js/project_common.js
+++ b/src/main/resources/static/assets/js/project_common.js
@@ -131,15 +131,9 @@ function calCostInclude() {
 
     var $costTotalTaxInclude = $("input[name='costTotalTaxInclude']");
 
-    if(costPurchaseDeviceTaxInclude && costPurchaseBuildTaxInclude
-        && costPurchaseServiceTaxInclude && costPurchaseOtherTaxInclude
-        && costProjectManageTaxInclude && costOtherOtherTaxInclude){
-        $costTotalTaxInclude.val(f2(costPurchaseDeviceTaxInclude) +f2(costPurchaseBuildTaxInclude)
-            +f2(costPurchaseServiceTaxInclude)+f2(costPurchaseOtherTaxInclude)
-            +f2(costProjectManageTaxInclude)+f2(costOtherOtherTaxInclude));
-    }else {
-        $costTotalTaxInclude.val("");
-    }
+    $costTotalTaxInclude.val(f2(costPurchaseDeviceTaxInclude) +f2(costPurchaseBuildTaxInclude)
+        +f2(costPurchaseServiceTaxInclude)+f2(costPurchaseOtherTaxInclude)
+        +f2(costProjectManageTaxInclude)+f2(costOtherOtherTaxInclude));
 }
 /**
  * 统计成本(不含税)，有一项没填就置空
@@ -155,13 +149,7 @@ function calCostExclude() {
 
     var $costTotalTaxExclude = $("input[name='costTotalTaxExclude']");
 
-    if(costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude
-        && costPurchaseServiceTaxExclude && costPurchaseOtherTaxExclude
-        && costProjectManageTaxExclude && costOtherOtherTaxExclude){
-        $costTotalTaxExclude.val(f2(costPurchaseDeviceTaxExclude)+f2(costPurchaseBuildTaxExclude)
-            +f2(costPurchaseServiceTaxExclude)+f2(costPurchaseOtherTaxExclude)
-            +f2(costProjectManageTaxExclude)+f2(costOtherOtherTaxExclude));
-    }else {
-        $costTotalTaxExclude.val("");
-    }
+    $costTotalTaxExclude.val(f2(costPurchaseDeviceTaxExclude)+f2(costPurchaseBuildTaxExclude)
+        +f2(costPurchaseServiceTaxExclude)+f2(costPurchaseOtherTaxExclude)
+        +f2(costProjectManageTaxExclude)+f2(costOtherOtherTaxExclude));
 }
\ No newline at end of file
diff --git a/src/main/resources/static/assets/js/project_estimate.js b/src/main/resources/static/assets/js/project_estimate.js
index cbcbf93..ed0a1b1 100644
--- a/src/main/resources/static/assets/js/project_estimate.js
+++ b/src/main/resources/static/assets/js/project_estimate.js
@@ -102,11 +102,7 @@ function calIncomeInclude() {
 
     var $incomeTotalTaxInclude = $("input[name='incomeTotalTaxInclude']");
 
-    if(incomeDeviceTaxInclude && incomeEngineerTaxInclude && incomeServiceTaxInclude){
-        $incomeTotalTaxInclude.val(f2(incomeDeviceTaxInclude)+f2(incomeEngineerTaxInclude)+f2(incomeServiceTaxInclude));
-    }else {
-        $incomeTotalTaxInclude.val("");
-    }
+    $incomeTotalTaxInclude.val(f2(incomeDeviceTaxInclude)+f2(incomeEngineerTaxInclude)+f2(incomeServiceTaxInclude));
 }
 /**
  * 统计收入(不含税)，有一项没填就置空
@@ -118,11 +114,7 @@ function calIncomeExclude() {
 
     var $incomeTotalTaxExclude = $("input[name='incomeTotalTaxExclude']");
 
-    if(incomeDeviceTaxExclude && incomeEngineerTaxExclude && incomeServiceTaxExclude){
-        $incomeTotalTaxExclude.val(f2(incomeDeviceTaxExclude)+f2(incomeEngineerTaxExclude)+f2(incomeServiceTaxExclude));
-    }else {
-        $incomeTotalTaxExclude.val("");
-    }
+    $incomeTotalTaxExclude.val(f2(incomeDeviceTaxExclude)+f2(incomeEngineerTaxExclude)+f2(incomeServiceTaxExclude));
 }
 
 /**
@@ -139,17 +131,18 @@ function calIncomeCost() {
     var $projectContributionProfit = $("input[name='projectContributionProfit']");
     var $projectContributionProfitRate = $("input[name='projectContributionProfitRate']");
 
-    if (incomeTotalTaxExclude && costTotalTaxExclude && costExpropriationTaxExclude) {
+    var incomeTotalTaxExcludeValue = f2(incomeTotalTaxExclude);
+    if (incomeTotalTaxExcludeValue != 0) {
         $projectGrossProfit.val(f2(incomeTotalTaxExclude) - f2(costTotalTaxExclude) - f2(costExpropriationTaxExclude));
-        $projectGrossProfitRate.val(f2($projectGrossProfit.val()) * 100 / f2(incomeTotalTaxExclude));
+        $projectGrossProfitRate.val(f2(f2($projectGrossProfit.val()) * 100 / incomeTotalTaxExcludeValue));
     } else {
         $projectGrossProfit.val("");
         $projectGrossProfitRate.val("");
     }
 
-    if ($projectGrossProfit.val() && costCompanyManageTaxExclude) {
+    if ($projectGrossProfit.val()) {
         $projectContributionProfit.val(f2($projectGrossProfit.val()) - f2(costCompanyManageTaxExclude));
-        $projectContributionProfitRate.val(f2($projectContributionProfit.val()) * 100 / f2(incomeTotalTaxExclude))
+        $projectContributionProfitRate.val(f2(f2($projectContributionProfit.val()) * 100 / f2(incomeTotalTaxExclude)))
     } else {
         $projectContributionProfit.val("");
         $projectContributionProfitRate.val("");
diff --git a/src/main/resources/static/assets/js/project_settle.js b/src/main/resources/static/assets/js/project_settle.js
index 8c8bc49..9efb385 100644
--- a/src/main/resources/static/assets/js/project_settle.js
+++ b/src/main/resources/static/assets/js/project_settle.js
@@ -107,8 +107,6 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     $("input[name='taxReturn']").change(function () {
         calTaxReturnSettle();
@@ -116,8 +114,6 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     $("input[name='earnestMoneyIncome']").change(function () {
         calEarnestMoneyIncomeSettle();
@@ -125,8 +121,6 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     $("input[name='purchaseCost']").change(function () {
         calPurchaseCostSettle();
@@ -134,8 +128,6 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     $("input[name='taxCost']").change(function () {
         calTaxCostSettle();
@@ -143,8 +135,6 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     $("input[name='earnestMoneyCost']").change(function () {
         calEarnestMoneyCostSettle();
@@ -152,8 +142,6 @@ function calculateSettle() {
         calNetCashFlowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     // $("input[name='netCashFlow']").change(function () {
     //     calNetCashFlowSettle();
@@ -167,8 +155,6 @@ function calculateSettle() {
         calNetCashFromInvestingActivitiesSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     $("input[name='cashOutflowFromInvestingActivities']").change(function () {
         calCashOutflowFromInvestingActivitiesSettle();
@@ -176,8 +162,6 @@ function calculateSettle() {
         calNetCashFromInvestingActivitiesSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     // $("input[name='netCashFromInvestingActivities']").change(function () {
     //     calNetCashFromInvestingActivitiesSettle();
@@ -191,8 +175,6 @@ function calculateSettle() {
         calFinancingCapitalCashflowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     $("input[name='financingCapitalOutflow']").change(function () {
         calFinancingCapitalOutflowSettle();
@@ -200,8 +182,6 @@ function calculateSettle() {
         calFinancingCapitalCashflowSettle();
         calNetIncreaseMonetaryFunds();
         calNetIncreaseMonetaryFundsSettle();
-        calCashFlowTotal();
-        calCashFlowSettleTotal();
     });
     // $("input[name='financingCapitalCashflow']").change(function () {
     //     calFinancingCapitalCashflowSettle();
@@ -975,78 +955,6 @@ function calNetIncreaseMonetaryFunds() {
     }
 }
 
-/**
- * 本月现金流量表总额(不含税)，有一项没填就置空
- */
-function calCashFlowTotal() {
-    var saleIncomeCash = $("input[name='saleIncomeCash']").val();
-    var taxReturn = $("input[name='taxReturn']").val();
-    var earnestMoneyIncome = $("input[name='earnestMoneyIncome']").val();
-    var purchaseCost = $("input[name='purchaseCost']").val();
-    var taxCost = $("input[name='taxCost']").val();
-    var earnestMoneyCost = $("input[name='earnestMoneyCost']").val();
-    var netCashFlow = $("input[name='netCashFlow']").val();
-    var cashInflowFromInvestingActivities = $("input[name='cashInflowFromInvestingActivities']").val();
-    var cashOutflowFromInvestingActivities = $("input[name='cashOutflowFromInvestingActivities']").val();
-    var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']").val();
-    var financingCapitalInflow = $("input[name='financingCapitalInflow']").val();
-    var financingCapitalOutflow = $("input[name='financingCapitalOutflow']").val();
-    var financingCapitalCashflow = $("input[name='financingCapitalCashflow']").val();
-    var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']").val();
-
-    var cashFlowTotal = $("input[name='cashFlowTotal']");
-
-    if(saleIncomeCash && taxReturn && earnestMoneyIncome &&
-        purchaseCost && taxCost && earnestMoneyCost&&
-        netCashFlow && cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities &&
-        netCashFromInvestingActivities && financingCapitalInflow && financingCapitalOutflow
-        && financingCapitalCashflow && netIncreaseMonetaryFunds){
-        cashFlowTotal.val(parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)+
-            parseFloat(purchaseCost)+parseFloat(taxCost)+parseFloat(earnestMoneyCost)+
-            parseFloat(netCashFlow)+parseFloat(cashInflowFromInvestingActivities)+parseFloat(cashOutflowFromInvestingActivities)+
-            parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalInflow)+parseFloat(financingCapitalOutflow)+
-            parseFloat(financingCapitalCashflow)+parseFloat(netIncreaseMonetaryFunds));
-    }else {
-        cashFlowTotal.val("");
-    }
-}
-
-/**
- * 现金流量表总额(不含税)，有一项没填就置空
- */
-function calCashFlowSettleTotal() {
-    var saleIncomeCashSettle = $("input[name='saleIncomeCashSettle']").val();
-    var taxReturnSettle = $("input[name='taxReturnSettle']").val();
-    var earnestMoneyIncomeSettle = $("input[name='earnestMoneyIncomeSettle']").val();
-    var purchaseCostSettle = $("input[name='purchaseCostSettle']").val();
-    var taxCostSettle = $("input[name='taxCostSettle']").val();
-    var earnestMoneyCostSettle = $("input[name='earnestMoneyCostSettle']").val();
-    var netCashFlowSettle = $("input[name='netCashFlowSettle']").val();
-    var cashInflowFromInvestingActivitiesSettle = $("input[name='cashInflowFromInvestingActivitiesSettle']").val();
-    var cashOutflowFromInvestingActivitiesSettle = $("input[name='cashOutflowFromInvestingActivitiesSettle']").val();
-    var netCashFromInvestingActivitiesSettle = $("input[name='netCashFromInvestingActivitiesSettle']").val();
-    var financingCapitalInflowSettle = $("input[name='financingCapitalInflowSettle']").val();
-    var financingCapitalOutflowSettle = $("input[name='financingCapitalOutflowSettle']").val();
-    var financingCapitalCashflowSettle = $("input[name='financingCapitalCashflowSettle']").val();
-    var netIncreaseMonetaryFundsSettle = $("input[name='netIncreaseMonetaryFundsSettle']").val();
-
-    var cashFlowSettleTotal = $("input[name='cashFlowSettleTotal']");
-
-    if(saleIncomeCashSettle && taxReturnSettle && earnestMoneyIncomeSettle &&
-        purchaseCostSettle && taxCostSettle && earnestMoneyCostSettle&&
-        netCashFlowSettle && cashInflowFromInvestingActivitiesSettle && cashOutflowFromInvestingActivitiesSettle &&
-        netCashFromInvestingActivitiesSettle && financingCapitalInflowSettle && financingCapitalOutflowSettle
-        && financingCapitalCashflowSettle && netIncreaseMonetaryFundsSettle){
-        cashFlowSettleTotal.val(parseFloat(saleIncomeCashSettle)+parseFloat(taxReturnSettle)+parseFloat(earnestMoneyIncomeSettle)+
-            parseFloat(purchaseCostSettle)+parseFloat(taxCostSettle)+parseFloat(earnestMoneyCostSettle)+
-            parseFloat(netCashFlowSettle)+parseFloat(cashInflowFromInvestingActivitiesSettle)+parseFloat(cashOutflowFromInvestingActivitiesSettle)+
-            parseFloat(netCashFromInvestingActivitiesSettle)+parseFloat(financingCapitalInflowSettle)+parseFloat(financingCapitalOutflowSettle)+
-            parseFloat(financingCapitalCashflowSettle)+parseFloat(netIncreaseMonetaryFundsSettle));
-    }else {
-        cashFlowSettleTotal.val("");
-    }
-}
-
 
 
 
diff --git a/src/main/resources/static/assets/js/project_settle_valid.js b/src/main/resources/static/assets/js/project_settle_valid.js
index 25d4154..63bddfb 100644
--- a/src/main/resources/static/assets/js/project_settle_valid.js
+++ b/src/main/resources/static/assets/js/project_settle_valid.js
@@ -1,12 +1,15 @@
 var valid = function() {
-    return incomeDeviceValid() && incomeEngineerValid() && incomeServiceValid() && costPurchaseDeviceValid() && costPurchaseBuildValid() && costPurchaseServiceValid() && costPurchaseOtherValid() && costProjectManageValid() && costOtherValid() && costExpropriationValid() && costCompanyManageValid()
-        && grossProfitValid() && contributionProfitValid() && netProfitValid() && saleIncomeCashValid() && earnestMoneyIncomeValid() && purchaseCostValid() && earnestMoneyCostValid() && financingCapitalInflowValid() && financingCapitalOutflowValid() && financingCapitalCashflowValid();
+    return incomeDeviceValid() && incomeEngineerValid() && incomeServiceValid() && incomeTotalValid()
+        && costPurchaseDeviceValid() && costPurchaseBuildValid() && costPurchaseServiceValid() && costPurchaseOtherValid()
+        && costProjectManageValid() && costOtherValid() && costTotalValid() && costExpropriationValid()
+        && costCompanyManageValid() && costIncomeTaxValid() && saleIncomeCashValid() && taxReturnValid()
+        && earnestMoneyIncomeValid() && purchaseCostValid() && taxCostValid() && earnestMoneyCostValid()
+        && cashInflowFromInvestingActivitiesValid() && cashOutflowFromInvestingActivitiesValid()
+        && financingCapitalInflowValid() && financingCapitalOutflowValid();
 };
 
 var incomeDeviceValid = function() {
-    var settle = $("input[name='incomeDeviceSettleTotal']").val();
     var month = $("input[name='incomeDevice']").val();
-    var budget = $("input[name='incomeDeviceBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -14,10 +17,10 @@ var incomeDeviceValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("收入设备类结算总额不能高于预算总额");
+            layer.alert("本月收入设备类数据不能小于0");
         });
         return false;
     }
@@ -25,9 +28,7 @@ var incomeDeviceValid = function() {
 };
 
 var incomeEngineerValid = function() {
-    var settle = $("input[name='incomeEngineerSettleTotal']").val();
     var month = $("input[name='incomeEngineer']").val();
-    var budget = $("input[name='incomeEngineerBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -35,10 +36,10 @@ var incomeEngineerValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("收入工程类结算总额不能高于预算总额");
+            layer.alert("本月收入工程类数据不能小于0");
         });
         return false;
     }
@@ -46,9 +47,7 @@ var incomeEngineerValid = function() {
 };
 
 var incomeServiceValid = function() {
-    var settle = $("input[name='incomeServiceSettleTotal']").val();
     var month = $("input[name='incomeService']").val();
-    var budget = $("input[name='incomeServiceBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -56,10 +55,23 @@ var incomeServiceValid = function() {
         });
         return false;
     }
+    if (parseFloat(month) < 0) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("本月收入服务类数据不能小于0");
+        });
+        return false;
+    }
+    return true;
+};
+
+var incomeTotalValid = function() {
+    var settle = $("input[name='incomeSettleTotal']").val();
+    var budget = $("input[name='incomeBudgetTotal']").val();
     if (parseFloat(settle) > parseFloat(budget)) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("收入服务类结算总额不能高于预算总额");
+            layer.alert("合计收入结算总额不能高于预算总额");
         });
         return false;
     }
@@ -67,9 +79,7 @@ var incomeServiceValid = function() {
 };
 
 var costPurchaseDeviceValid = function() {
-    var settle = $("input[name='costPurchaseDeviceSettleTotal']").val();
     var month = $("input[name='costPurchaseDevice']").val();
-    var budget = $("input[name='costPurchaseDeviceBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -77,10 +87,10 @@ var costPurchaseDeviceValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("采购成本设备类结算总额不能高于预算总额");
+            layer.alert("本月采购成本设备类数据不能小于0");
         });
         return false;
     }
@@ -88,9 +98,7 @@ var costPurchaseDeviceValid = function() {
 };
 
 var costPurchaseBuildValid = function() {
-    var settle = $("input[name='costPurchaseBuildSettleTotal']").val();
     var month = $("input[name='costPurchaseBuild']").val();
-    var budget = $("input[name='costPurchaseBuildBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -98,10 +106,10 @@ var costPurchaseBuildValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("采购成本施工类结算总额不能高于预算总额");
+            layer.alert("本月采购成本施工类数据不能小于0");
         });
         return false;
     }
@@ -109,9 +117,7 @@ var costPurchaseBuildValid = function() {
 };
 
 var costPurchaseServiceValid = function() {
-    var settle = $("input[name='costPurchaseServiceSettleTotal']").val();
     var month = $("input[name='costPurchaseService']").val();
-    var budget = $("input[name='costPurchaseServiceBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -119,10 +125,10 @@ var costPurchaseServiceValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("采购成本服务类结算总额不能高于预算总额");
+            layer.alert("本月采购成本服务类数据不能小于0");
         });
         return false;
     }
@@ -130,9 +136,7 @@ var costPurchaseServiceValid = function() {
 };
 
 var costPurchaseOtherValid = function() {
-    var settle = $("input[name='costPurchaseOtherSettleTotal']").val();
     var month = $("input[name='costPurchaseOther']").val();
-    var budget = $("input[name='costPurchaseOtherBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -140,10 +144,10 @@ var costPurchaseOtherValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("采购成本其他类结算总额不能高于预算总额");
+            layer.alert("本月采购成本其他类数据不能小于0");
         });
         return false;
     }
@@ -151,10 +155,8 @@ var costPurchaseOtherValid = function() {
 };
 
 var costProjectManageValid = function() {
-    var settle = $("input[name='costProjectManageSettleTotal']").val();
     var month = $("input[name='costProjectManage']").val();
     var salary = $("input[name='salary']").val();
-    var budget = $("input[name='costProjectManageBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -162,6 +164,13 @@ var costProjectManageValid = function() {
         });
         return false;
     }
+    if (parseFloat(month) < 0) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("本月项目管理成本数据不能小于0");
+        });
+        return false;
+    }
     if (parseFloat(salary) > parseFloat(month)) {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -169,20 +178,11 @@ var costProjectManageValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("项目管理成本结算总额不能高于预算总额");
-        });
-        return false;
-    }
     return true;
 };
 
 var costOtherValid = function() {
-    var settle = $("input[name='costOtherSettleTotal']").val();
     var month = $("input[name='costOther']").val();
-    var budget = $("input[name='costOtherBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -190,10 +190,23 @@ var costOtherValid = function() {
         });
         return false;
     }
+    if (parseFloat(month) < 0) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("本月其他成本数据不能小于0");
+        });
+        return false;
+    }
+    return true;
+};
+
+var costTotalValid = function() {
+    var settle = $("input[name='costSettleTotal']").val();
+    var budget = $("input[name='costBudgetTotal']").val();
     if (parseFloat(settle) > parseFloat(budget)) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("其他成本结算总额不能高于预算总额");
+            layer.alert("合计支出结算总额不能高于预算总额");
         });
         return false;
     }
@@ -211,6 +224,13 @@ var costExpropriationValid = function() {
         });
         return false;
     }
+    if (parseFloat(month) < 0) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("本月财务费用数据不能小于0");
+        });
+        return false;
+    }
     if (parseFloat(settle) > parseFloat(budget)) {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -222,9 +242,7 @@ var costExpropriationValid = function() {
 };
 
 var costCompanyManageValid = function() {
-    var settle = $("input[name='costCompanyManageSettleTotal']").val();
     var month = $("input[name='costCompanyManage']").val();
-    var budget = $("input[name='costCompanyManageBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -232,73 +250,29 @@ var costCompanyManageValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("公司管理费用结算总额不能高于预算总额");
+            layer.alert("本月公司管理费用数据不能小于0");
         });
         return false;
     }
     return true;
 };
 
-var grossProfitValid = function() {
-    var settle = $("input[name='grossProfitSettleTotal']").val();
-    var month = $("input[name='grossProfit']").val();
-    var budget = $("input[name='grossProfitBudgetTotal']").val();
+var costIncomeTaxValid = function() {
+    var month = $("input[name='costIncomeTax']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("请填入本月项目毛利数据");
+            layer.alert("请填入本月所得税费用数据");
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("项目毛利结算总额不能高于预算总额");
-        });
-        return false;
-    }
-    return true;
-};
-
-var contributionProfitValid = function() {
-    var settle = $("input[name='contributionProfitSettleTotal']").val();
-    var month = $("input[name='contributionProfit']").val();
-    var budget = $("input[name='contributionProfitBudgetTotal']").val();
-    if (month == "") {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("请填入本月项目贡献利润数据");
-        });
-        return false;
-    }
-    if (parseFloat(settle) > parseFloat(budget)) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("项目贡献利润结算总额不能高于预算总额");
-        });
-        return false;
-    }
-    return true;
-};
-
-var netProfitValid = function() {
-    var settle = $("input[name='netProfitSettleTotal']").val();
-    var month = $("input[name='netProfit']").val();
-    var budget = $("input[name='netProfitBudgetTotal']").val();
-    if (month == "") {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("请填入本月项目净利润数据");
-        });
-        return false;
-    }
-    if (parseFloat(settle) > parseFloat(budget)) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("项目净利润结算总额不能高于预算总额");
+            layer.alert("本月所得税费用数据不能小于0");
         });
         return false;
     }
@@ -306,9 +280,7 @@ var netProfitValid = function() {
 };
 
 var saleIncomeCashValid = function() {
-    var settle = $("input[name='saleIncomeCashSettleTotal']").val();
     var month = $("input[name='saleIncomeCash']").val();
-    var budget = $("input[name='saleIncomeCashBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -316,10 +288,29 @@ var saleIncomeCashValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("销售商品、提供劳务收到的现金结算总额不能高于预算总额");
+            layer.alert("本月本月销售商品、提供劳务收到的现金数据不能小于0");
+        });
+        return false;
+    }
+    return true;
+};
+
+var taxReturnValid = function() {
+    var month = $("input[name='taxReturn']").val();
+    if (month == "") {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("请填入本月收到的税费返还数据");
+        });
+        return false;
+    }
+    if (parseFloat(month) < 0) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("本月收到的税费返还数据不能小于0");
         });
         return false;
     }
@@ -327,9 +318,7 @@ var saleIncomeCashValid = function() {
 };
 
 var earnestMoneyIncomeValid = function() {
-    var settle = $("input[name='earnestMoneyIncomeSettleTotal']").val();
     var month = $("input[name='earnestMoneyIncome']").val();
-    var budget = $("input[name='earnestMoneyIncomeBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -337,10 +326,10 @@ var earnestMoneyIncomeValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("收到其他与经营活动有关的现金结算总额不能高于预算总额");
+            layer.alert("本月收到其他与经营活动有关的现金数据不能小于0");
         });
         return false;
     }
@@ -348,9 +337,7 @@ var earnestMoneyIncomeValid = function() {
 };
 
 var purchaseCostValid = function() {
-    var settle = $("input[name='purchaseCostSettleTotal']").val();
     var month = $("input[name='purchaseCost']").val();
-    var budget = $("input[name='purchaseCostBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -358,10 +345,29 @@ var purchaseCostValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("购买商品、接受劳务支付的现金结算总额不能高于预算总额");
+            layer.alert("本月购买商品、接受劳务支付的现金数据不能小于0");
+        });
+        return false;
+    }
+    return true;
+};
+
+var taxCostValid = function() {
+    var month = $("input[name='taxCost']").val();
+    if (month == "") {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("请填入本月支付的各项税费数据");
+        });
+        return false;
+    }
+    if (parseFloat(month) < 0) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("本月支付的各项税费数据不能小于0");
         });
         return false;
     }
@@ -369,9 +375,7 @@ var purchaseCostValid = function() {
 };
 
 var earnestMoneyCostValid = function() {
-    var settle = $("input[name='earnestMoneyCostSettleTotal']").val();
     var month = $("input[name='earnestMoneyCost']").val();
-    var budget = $("input[name='earnestMoneyCostBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -379,10 +383,48 @@ var earnestMoneyCostValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("支付其他与经营活动有关的现金结算总额不能高于预算总额");
+            layer.alert("本月支付其他与经营活动有关的现金数据不能小于0");
+        });
+        return false;
+    }
+    return true;
+};
+
+var cashInflowFromInvestingActivitiesValid = function() {
+    var month = $("input[name='cashInflowFromInvestingActivities']").val();
+    if (month == "") {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("请填入本月投资活动现金流入数据");
+        });
+        return false;
+    }
+    if (parseFloat(month) < 0) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("本月投资活动现金流入数据不能小于0");
+        });
+        return false;
+    }
+    return true;
+};
+
+var cashOutflowFromInvestingActivitiesValid = function() {
+    var month = $("input[name='cashOutflowFromInvestingActivities']").val();
+    if (month == "") {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("请填入本月投资活动现金流出数据");
+        });
+        return false;
+    }
+    if (parseFloat(month) < 0) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("本月投资活动现金流出数据不能小于0");
         });
         return false;
     }
@@ -390,9 +432,7 @@ var earnestMoneyCostValid = function() {
 };
 
 var financingCapitalInflowValid = function() {
-    var settle = $("input[name='financingCapitalInflowSettleTotal']").val();
     var month = $("input[name='financingCapitalInflow']").val();
-    var budget = $("input[name='financingCapitalInflowBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -400,10 +440,10 @@ var financingCapitalInflowValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("融资资金流入结算总额不能高于预算总额");
+            layer.alert("本月融资资金流入数据不能小于0");
         });
         return false;
     }
@@ -411,9 +451,7 @@ var financingCapitalInflowValid = function() {
 };
 
 var financingCapitalOutflowValid = function() {
-    var settle = $("input[name='financingCapitalOutflowSettleTotal']").val();
     var month = $("input[name='financingCapitalOutflow']").val();
-    var budget = $("input[name='financingCapitalOutflowBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -421,34 +459,14 @@ var financingCapitalOutflowValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(month) < 0) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("还款资金流出结算总额不能高于预算总额");
+            layer.alert("本月还款资金流出数据不能小于0");
         });
         return false;
     }
     return true;
 };
 
-var financingCapitalCashflowValid = function() {
-    var settle = $("input[name='financingCapitalCashflowSettleTotal']").val();
-    var month = $("input[name='financingCapitalCashflow']").val();
-    var budget = $("input[name='financingCapitalCashflowBudgetTotal']").val();
-    if (month == "") {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("请填入本月筹资活动产生的现金流量净额数据");
-        });
-        return false;
-    }
-    if (parseFloat(settle) > parseFloat(budget)) {
-        layui.use('layer', function(){
-            var layer = layui.layer;
-            layer.alert("筹资活动产生的现金流量净额结算总额不能高于预算总额");
-        });
-        return false;
-    }
-    return true;
-};
 
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index a3d575a..4a38aac 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -330,6 +330,7 @@
 
 </div>
 </div>
+<script src="${base}/assets/js/project_common.js"></script>
 <script src="${base}/assets/js/project_estimate.js"></script>
 <script>
     $(function () {
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 1b7ea07..5cfe8e3 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -94,14 +94,13 @@
                                         <div class="am-form-group am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="startDate"
-                                                   value="${startDate!}" placeholder="开始日期" data-am-datepicker>
+                                                   value="${startDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
                                         </div>
                                         <div class="am-form-group">至</div>
                                         <div class="am-form-group am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="endDate"
-                                                   value="${endDate!}"
-                                                   placeholder="结束日期" data-am-datepicker>
+                                                   value="${endDate!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
                                         </div>
                                     </div>
                                 </div>
@@ -113,14 +112,13 @@
                                         <div class="am-form-group am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="startUpdateDate"
-                                                   value="${startUpdateDate!}" placeholder="开始日期" data-am-datepicker>
+                                                   value="${startUpdateDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
                                         </div>
                                         <div class="am-form-group">至</div>
                                         <div class="am-form-group am-form-icon">
                                             <i class="am-icon-calendar"></i>
                                             <input type="text" class="am-form-field am-input-sm" id="endUpdateDate"
-                                                   value="${endUpdateDate!}"
-                                                   placeholder="结束日期" data-am-datepicker>
+                                                   value="${endUpdateDate!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
                                         </div>
                                     </div>
                                 </div>
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index bc7da26..59a03e9 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -383,14 +383,6 @@
                         <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netIncreaseMonetaryFunds" readonly required title="本月结算金额"></td>
                         <td><input name="netIncreaseMonetaryFundsSettle" type="number" readonly title="结算总额"></td>
                     </tr>
-                    <tr>
-                        <td>合计</td>
-                        <td><input name="cashFlowBudgetTotal" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash + cashFlowBean.earnestMoneyIncome + cashFlowBean.purchaseCost + cashFlowBean.earnestMoneyCost + cashFlowBean.getNetCashFlow() +
-                            cashFlowBean.financingCapitalInflow + cashFlowBean.financingCapitalOutflow + cashFlowBean.getFinancingCapitalCashflow() + cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFlowFormerSettleTotal" type="number" value="${Utils.format(formerBean.cashFlowTotal,'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFlowTotal" type="number" readonly required title="此列累计"></td>
-                        <td><input name="cashFlowSettleTotal" type="number" readonly required title="此列累计"></td>
-                    </tr>
                     </tbody>
                 </table>
             </div>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 3cf080f..4587642 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -381,14 +381,6 @@
                         <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" readonly required title="本月结算金额"></td>
                         <td><input name="netIncreaseMonetaryFundsSettle" type="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>
                     </tr>
-                    <tr>
-                        <td>合计</td>
-                        <td><input name="cashFlowBudgetTotal" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash + cashFlowBean.earnestMoneyIncome + cashFlowBean.purchaseCost + cashFlowBean.earnestMoneyCost + cashFlowBean.getNetCashFlow() +
-                            cashFlowBean.financingCapitalInflow + cashFlowBean.financingCapitalOutflow + cashFlowBean.getFinancingCapitalCashflow() + cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFlowFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFlowTotal" type="number" value="${Utils.format(monthBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                        <td><input name="cashFlowSettleTotal" type="number" value="${Utils.format(currentBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                    </tr>
                     </tbody>
                 </table>
             </div>