Merge remote-tracking branch 'origin/master'
xxssyyyyssxx
commit
7bfcded829
|
|
@ -8,6 +8,7 @@ import cn.palmte.work.service.ProjectEstimateService;
|
|||
import cn.palmte.work.service.ProjectFinalSevice;
|
||||
import cn.palmte.work.service.ProjectService;
|
||||
import cn.palmte.work.service.*;
|
||||
import cn.palmte.work.utils.DateKit;
|
||||
import cn.palmte.work.utils.FreeMarkerUtil;
|
||||
import cn.palmte.work.utils.InterfaceUtil;
|
||||
import cn.palmte.work.utils.Utils;
|
||||
|
|
@ -27,9 +28,7 @@ import org.springframework.web.bind.annotation.*;
|
|||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
|
|
@ -346,7 +345,9 @@ public class ProjectController extends BaseController {
|
|||
* 审核页面
|
||||
*/
|
||||
@RequestMapping("/approve")
|
||||
public String approve(@RequestParam("id") int id, @RequestParam String listFrom, Map<String, Object> model) {
|
||||
public String approve(@RequestParam(value = KEYWORDS, required = false) String keywords,
|
||||
@RequestParam("id") int id, @RequestParam String listFrom,
|
||||
Map<String, Object> model) {
|
||||
Project project = projectService.getProject(id);
|
||||
|
||||
//项目信息
|
||||
|
|
@ -378,13 +379,18 @@ public class ProjectController extends BaseController {
|
|||
model.put("cashFlowBean", projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails));
|
||||
|
||||
//结算信息
|
||||
ProjectSettleIncome projectSettleIncome = projectSettleIncomeRepository.findNewByProjectId(id);
|
||||
String time = "";
|
||||
if(null == projectSettleIncome){
|
||||
model.put("time", time);
|
||||
}else {
|
||||
time = projectSettleIncome.getTime();
|
||||
model.put("keywords",keywords);
|
||||
ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords,model);
|
||||
String time;
|
||||
if (!searchInfo.containsKey("time")) {
|
||||
Calendar instance = Calendar.getInstance();
|
||||
instance.setTime(new Date());
|
||||
instance.set(Calendar.MONTH, instance.get(Calendar.MONTH));
|
||||
Date current = instance.getTime();
|
||||
time = DateKit.toStr(current, DateKit.DATE_FORMAT_YEAR_MONTH2);
|
||||
model.put("time", time);
|
||||
} else {
|
||||
time = searchInfo.get("time");
|
||||
}
|
||||
model.put("formerBean", projectSettleService.getFormerSettle(project, time));
|
||||
model.put("monthBean", projectSettleService.getMonthSettle(project, time));
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ function calIncomeInclude() {
|
|||
|
||||
var $incomeTotalTaxInclude = $("input[name='incomeTotalTaxInclude']");
|
||||
|
||||
$incomeTotalTaxInclude.val(f2(incomeDeviceTaxInclude)+f2(incomeEngineerTaxInclude)+f2(incomeServiceTaxInclude));
|
||||
$incomeTotalTaxInclude.val(f2(f2(incomeDeviceTaxInclude)+f2(incomeEngineerTaxInclude)+f2(incomeServiceTaxInclude)));
|
||||
}
|
||||
/**
|
||||
* 统计收入(不含税)，有一项没填就置空
|
||||
|
|
@ -114,7 +114,7 @@ function calIncomeExclude() {
|
|||
|
||||
var $incomeTotalTaxExclude = $("input[name='incomeTotalTaxExclude']");
|
||||
|
||||
$incomeTotalTaxExclude.val(f2(incomeDeviceTaxExclude)+f2(incomeEngineerTaxExclude)+f2(incomeServiceTaxExclude));
|
||||
$incomeTotalTaxExclude.val(f2(f2(incomeDeviceTaxExclude)+f2(incomeEngineerTaxExclude)+f2(incomeServiceTaxExclude)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -133,7 +133,7 @@ function calIncomeCost() {
|
|||
|
||||
var incomeTotalTaxExcludeValue = f2(incomeTotalTaxExclude);
|
||||
if (incomeTotalTaxExcludeValue != 0) {
|
||||
$projectGrossProfit.val(f2(incomeTotalTaxExclude) - f2(costTotalTaxExclude) - f2(costExpropriationTaxExclude));
|
||||
$projectGrossProfit.val(f2(f2(incomeTotalTaxExclude) - f2(costTotalTaxExclude) - f2(costExpropriationTaxExclude)));
|
||||
$projectGrossProfitRate.val(f2(f2($projectGrossProfit.val()) * 100 / incomeTotalTaxExcludeValue));
|
||||
} else {
|
||||
$projectGrossProfit.val("");
|
||||
|
|
@ -141,7 +141,7 @@ function calIncomeCost() {
|
|||
}
|
||||
|
||||
if ($projectGrossProfit.val()) {
|
||||
$projectContributionProfit.val(f2($projectGrossProfit.val()) - f2(costCompanyManageTaxExclude));
|
||||
$projectContributionProfit.val(f2(f2($projectGrossProfit.val()) - f2(costCompanyManageTaxExclude)));
|
||||
$projectContributionProfitRate.val(f2(f2($projectContributionProfit.val()) * 100 / f2(incomeTotalTaxExclude)))
|
||||
} else {
|
||||
$projectContributionProfit.val("");
|
||||
|
|
|
|||
|
|
@ -148,8 +148,8 @@ function calNetCashFlow() {
|
|||
|
||||
if (saleIncomeCash && taxReturn && earnestMoneyIncome
|
||||
&& purchaseCost && taxCost && earnestMoneyCost) {
|
||||
netCashFlow.val((parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome)
|
||||
- parseFloat(purchaseCost) - parseFloat(taxCost) - parseFloat(earnestMoneyCost)).toFixed(2));
|
||||
netCashFlow.val(f2(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome)
|
||||
- parseFloat(purchaseCost) - parseFloat(taxCost) - parseFloat(earnestMoneyCost)));
|
||||
} else {
|
||||
netCashFlow.val("");
|
||||
}
|
||||
|
|
@ -165,7 +165,7 @@ function calNetCashFromInvestingActivities() {
|
|||
var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']");
|
||||
|
||||
if (cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities) {
|
||||
netCashFromInvestingActivities.val((parseFloat(cashInflowFromInvestingActivities) - parseFloat(cashOutflowFromInvestingActivities)).toFixed(2));
|
||||
netCashFromInvestingActivities.val(f2(parseFloat(cashInflowFromInvestingActivities) - parseFloat(cashOutflowFromInvestingActivities)));
|
||||
} else {
|
||||
netCashFromInvestingActivities.val("");
|
||||
}
|
||||
|
|
@ -181,7 +181,7 @@ function calFinancingCapitalCashflow() {
|
|||
var financingCapitalCashflow = $("input[name='financingCapitalCashflow']");
|
||||
|
||||
if (financingCapitalInflow && financingCapitalOutflow) {
|
||||
financingCapitalCashflow.val((parseFloat(financingCapitalInflow) - parseFloat(financingCapitalOutflow)).toFixed(2));
|
||||
financingCapitalCashflow.val(f2(parseFloat(financingCapitalInflow) - parseFloat(financingCapitalOutflow)));
|
||||
} else {
|
||||
financingCapitalCashflow.val("");
|
||||
}
|
||||
|
|
@ -195,7 +195,7 @@ function calNetIncreaseMonetaryFunds() {
|
|||
var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']");
|
||||
|
||||
if (netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow) {
|
||||
netIncreaseMonetaryFunds.val((parseFloat(netCashFlow) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalCashflow)).toFixed(2));
|
||||
netIncreaseMonetaryFunds.val(f2(parseFloat(netCashFlow) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalCashflow)));
|
||||
} else {
|
||||
netIncreaseMonetaryFunds.val("");
|
||||
}
|
||||
|
|
@ -212,7 +212,7 @@ function calIncomeFinalTotal() {
|
|||
var incomeFinalTotal = $("input[name='incomeFinalTotal']");
|
||||
|
||||
if (incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal) {
|
||||
incomeFinalTotal.val((parseFloat(incomeDeviceFinalTotal) + parseFloat(incomeEngineerFinalTotal) + parseFloat(incomeServiceFinalTotal)).toFixed(2));
|
||||
incomeFinalTotal.val(f2(parseFloat(incomeDeviceFinalTotal) + parseFloat(incomeEngineerFinalTotal) + parseFloat(incomeServiceFinalTotal)));
|
||||
} else {
|
||||
incomeFinalTotal.val("");
|
||||
}
|
||||
|
|
@ -233,8 +233,8 @@ function calCostFinalTotal() {
|
|||
|
||||
if (costPurchaseDeviceFinalTotal && costPurchaseBuildFinalTotal && costPurchaseServiceFinalTotal &&
|
||||
costPurchaseOtherFinalTotal && costProjectManageFinalTotal && costOtherFinalTotal) {
|
||||
costFinalTotal.val((parseFloat(costPurchaseDeviceFinalTotal) + parseFloat(costPurchaseBuildFinalTotal) + parseFloat(costPurchaseServiceFinalTotal) +
|
||||
parseFloat(costPurchaseOtherFinalTotal) + parseFloat(costProjectManageFinalTotal) + parseFloat(costOtherFinalTotal)).toFixed(2));
|
||||
costFinalTotal.val(f2(parseFloat(costPurchaseDeviceFinalTotal) + parseFloat(costPurchaseBuildFinalTotal) + parseFloat(costPurchaseServiceFinalTotal) +
|
||||
parseFloat(costPurchaseOtherFinalTotal) + parseFloat(costProjectManageFinalTotal) + parseFloat(costOtherFinalTotal)));
|
||||
} else {
|
||||
costFinalTotal.val("");
|
||||
}
|
||||
|
|
@ -252,7 +252,7 @@ function calManageFinalTotal() {
|
|||
var manageFinalTotal = $("input[name='manageFinalTotal']");
|
||||
|
||||
if (costExpropriationFinalTotal && costCompanyManageFinalTotal && costIncomeTaxFinalTotal) {
|
||||
manageFinalTotal.val((parseFloat(costExpropriationFinalTotal) + parseFloat(costCompanyManageFinalTotal) + parseFloat(costIncomeTaxFinalTotal)).toFixed(2));
|
||||
manageFinalTotal.val(f2(parseFloat(costExpropriationFinalTotal) + parseFloat(costCompanyManageFinalTotal) + parseFloat(costIncomeTaxFinalTotal)));
|
||||
} else {
|
||||
manageFinalTotal.val("");
|
||||
}
|
||||
|
|
@ -284,11 +284,11 @@ function calCashFluxFinalTotal() {
|
|||
netCashFlow && cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities &&
|
||||
netCashFromInvestingActivities && financingCapitalInflow && financingCapitalOutflow
|
||||
&& financingCapitalCashflow && netIncreaseMonetaryFunds) {
|
||||
cashFluxFinalTotal.val((parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) +
|
||||
cashFluxFinalTotal.val(f2(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)).toFixed(2));
|
||||
parseFloat(financingCapitalCashflow) + parseFloat(netIncreaseMonetaryFunds)));
|
||||
} else {
|
||||
cashFluxFinalTotal.val("");
|
||||
}
|
||||
|
|
@ -305,7 +305,7 @@ function calGrossProfitFinalTotal() {
|
|||
var grossProfitFinalTotal = $("input[name='grossProfitFinalTotal']");
|
||||
|
||||
if (incomeFinalTotal && costFinalTotal && costExpropriationFinalTotal) {
|
||||
grossProfitFinalTotal.val((parseFloat(incomeFinalTotal) - parseFloat(costFinalTotal) - parseFloat(costExpropriationFinalTotal)).toFixed(2));
|
||||
grossProfitFinalTotal.val(f2(parseFloat(incomeFinalTotal) - parseFloat(costFinalTotal) - parseFloat(costExpropriationFinalTotal)));
|
||||
} else {
|
||||
grossProfitFinalTotal.val("");
|
||||
}
|
||||
|
|
@ -337,7 +337,7 @@ function calContributionMarginFinalTotal() {
|
|||
var contributionMarginFinalTotal = $("input[name='contributionMarginFinalTotal']");
|
||||
|
||||
if (grossProfitFinalTotal && costCompanyManageFinalTotal) {
|
||||
contributionMarginFinalTotal.val((parseFloat(grossProfitFinalTotal) - parseFloat(costCompanyManageFinalTotal)).toFixed(2));
|
||||
contributionMarginFinalTotal.val(f2(parseFloat(grossProfitFinalTotal) - parseFloat(costCompanyManageFinalTotal)));
|
||||
} else {
|
||||
contributionMarginFinalTotal.val("");
|
||||
}
|
||||
|
|
@ -369,7 +369,7 @@ function calNetMarginFinalTotal() {
|
|||
var netMarginFinalTotal = $("input[name='netMarginFinalTotal']");
|
||||
|
||||
if (contributionMarginFinalTotal && costIncomeTaxFinalTotal) {
|
||||
netMarginFinalTotal.val((parseFloat(contributionMarginFinalTotal) - parseFloat(costIncomeTaxFinalTotal)).toFixed(2));
|
||||
netMarginFinalTotal.val(f2(parseFloat(contributionMarginFinalTotal) - parseFloat(costIncomeTaxFinalTotal)));
|
||||
} else {
|
||||
netMarginFinalTotal.val("");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ function calIncomeDeviceSettleTotal() {
|
|||
var incomeDeviceSettleTotal = $("input[name='incomeDeviceSettleTotal']");
|
||||
|
||||
if(incomeDeviceFormerSettleTotal && incomeDevice){
|
||||
incomeDeviceSettleTotal.val((parseFloat(incomeDeviceFormerSettleTotal)+parseFloat(incomeDevice)).toFixed(2));
|
||||
incomeDeviceSettleTotal.val(f2(parseFloat(incomeDeviceFormerSettleTotal)+parseFloat(incomeDevice)));
|
||||
}else {
|
||||
incomeDeviceSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -238,7 +238,7 @@ function calIncomeEngineerSettleTotal() {
|
|||
var incomeEngineerSettleTotal = $("input[name='incomeEngineerSettleTotal']");
|
||||
|
||||
if(incomeEngineerFormerSettleTotal && incomeEngineer){
|
||||
incomeEngineerSettleTotal.val((parseFloat(incomeEngineerFormerSettleTotal)+parseFloat(incomeEngineer)).toFixed(2));
|
||||
incomeEngineerSettleTotal.val(f2(parseFloat(incomeEngineerFormerSettleTotal)+parseFloat(incomeEngineer)));
|
||||
}else {
|
||||
incomeEngineerSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -254,7 +254,7 @@ function calIncomeServiceSettleTotal() {
|
|||
var incomeServiceSettleTotal = $("input[name='incomeServiceSettleTotal']");
|
||||
|
||||
if(incomeServiceFormerSettleTotal && incomeService){
|
||||
incomeServiceSettleTotal.val((parseFloat(incomeServiceFormerSettleTotal)+parseFloat(incomeService)).toFixed(2));
|
||||
incomeServiceSettleTotal.val(f2(parseFloat(incomeServiceFormerSettleTotal)+parseFloat(incomeService)));
|
||||
}else {
|
||||
incomeServiceSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -271,7 +271,7 @@ function calIncomeTotal() {
|
|||
var incomeTotal = $("input[name='incomeTotal']");
|
||||
|
||||
if(incomeDevice && incomeEngineer && incomeService){
|
||||
incomeTotal.val((parseFloat(incomeDevice)+parseFloat(incomeEngineer)+parseFloat(incomeService)).toFixed(2));
|
||||
incomeTotal.val(f2(parseFloat(incomeDevice)+parseFloat(incomeEngineer)+parseFloat(incomeService)));
|
||||
}else {
|
||||
incomeTotal.val("");
|
||||
}
|
||||
|
|
@ -288,7 +288,7 @@ function calIncomeSettleTotal() {
|
|||
var incomeSettleTotal = $("input[name='incomeSettleTotal']");
|
||||
|
||||
if(incomeDeviceSettleTotal && incomeEngineerSettleTotal && incomeServiceSettleTotal){
|
||||
incomeSettleTotal.val((parseFloat(incomeDeviceSettleTotal)+parseFloat(incomeEngineerSettleTotal)+parseFloat(incomeServiceSettleTotal)).toFixed(2));
|
||||
incomeSettleTotal.val(f2(parseFloat(incomeDeviceSettleTotal)+parseFloat(incomeEngineerSettleTotal)+parseFloat(incomeServiceSettleTotal)));
|
||||
}else {
|
||||
incomeSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -304,7 +304,7 @@ function calCostPurchaseDeviceSettleTotal() {
|
|||
var costPurchaseDeviceSettleTotal = $("input[name='costPurchaseDeviceSettleTotal']");
|
||||
|
||||
if(costPurchaseDeviceFormerSettleTotal && costPurchaseDevice){
|
||||
costPurchaseDeviceSettleTotal.val((parseFloat(costPurchaseDeviceFormerSettleTotal)+parseFloat(costPurchaseDevice)).toFixed(2));
|
||||
costPurchaseDeviceSettleTotal.val(f2(parseFloat(costPurchaseDeviceFormerSettleTotal)+parseFloat(costPurchaseDevice)));
|
||||
}else {
|
||||
costPurchaseDeviceSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -320,7 +320,7 @@ function calCostPurchaseBuildSettleTotal() {
|
|||
var costPurchaseBuildSettleTotal = $("input[name='costPurchaseBuildSettleTotal']");
|
||||
|
||||
if(costPurchaseBuildFormerSettleTotal && costPurchaseBuild){
|
||||
costPurchaseBuildSettleTotal.val((parseFloat(costPurchaseBuildFormerSettleTotal)+parseFloat(costPurchaseBuild)).toFixed(2));
|
||||
costPurchaseBuildSettleTotal.val(f2(parseFloat(costPurchaseBuildFormerSettleTotal)+parseFloat(costPurchaseBuild)));
|
||||
}else {
|
||||
costPurchaseBuildSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -336,7 +336,7 @@ function calCostPurchaseServiceSettleTotal() {
|
|||
var costPurchaseServiceSettleTotal = $("input[name='costPurchaseServiceSettleTotal']");
|
||||
|
||||
if(costPurchaseServiceFormerSettleTotal && costPurchaseService){
|
||||
costPurchaseServiceSettleTotal.val((parseFloat(costPurchaseServiceFormerSettleTotal)+parseFloat(costPurchaseService)).toFixed(2));
|
||||
costPurchaseServiceSettleTotal.val(f2(parseFloat(costPurchaseServiceFormerSettleTotal)+parseFloat(costPurchaseService)));
|
||||
}else {
|
||||
costPurchaseServiceSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -352,7 +352,7 @@ function calCostPurchaseOtherSettleTotal() {
|
|||
var costPurchaseOtherSettleTotal = $("input[name='costPurchaseOtherSettleTotal']");
|
||||
|
||||
if(costPurchaseOtherFormerSettleTotal && costPurchaseOther){
|
||||
costPurchaseOtherSettleTotal.val((parseFloat(costPurchaseOtherFormerSettleTotal)+parseFloat(costPurchaseOther)).toFixed(2));
|
||||
costPurchaseOtherSettleTotal.val(f2(parseFloat(costPurchaseOtherFormerSettleTotal)+parseFloat(costPurchaseOther)));
|
||||
}else {
|
||||
costPurchaseOtherSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -368,7 +368,7 @@ function calCostProjectManageSettleTotal() {
|
|||
var costProjectManageSettleTotal = $("input[name='costProjectManageSettleTotal']");
|
||||
|
||||
if(costProjectManageFormerSettleTotal && costProjectManage){
|
||||
costProjectManageSettleTotal.val((parseFloat(costProjectManageFormerSettleTotal)+parseFloat(costProjectManage)).toFixed(2));
|
||||
costProjectManageSettleTotal.val(f2(parseFloat(costProjectManageFormerSettleTotal)+parseFloat(costProjectManage)));
|
||||
}else {
|
||||
costProjectManageSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -384,7 +384,7 @@ function calCostOtherSettleTotal() {
|
|||
var costOtherSettleTotal = $("input[name='costOtherSettleTotal']");
|
||||
|
||||
if(costOtherFormerSettleTotal && costOther){
|
||||
costOtherSettleTotal.val((parseFloat(costOtherFormerSettleTotal)+parseFloat(costOther)).toFixed(2));
|
||||
costOtherSettleTotal.val(f2(parseFloat(costOtherFormerSettleTotal)+parseFloat(costOther)));
|
||||
}else {
|
||||
costOtherSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -404,7 +404,7 @@ function calCostTotal() {
|
|||
var costTotal = $("input[name='costTotal']");
|
||||
|
||||
if(costPurchaseDevice && costPurchaseBuild && costPurchaseService && costPurchaseOther && costProjectManage && costOther){
|
||||
costTotal.val((parseFloat(costPurchaseDevice)+parseFloat(costPurchaseBuild)+parseFloat(costPurchaseService)+parseFloat(costPurchaseOther)+parseFloat(costProjectManage)+parseFloat(costOther)).toFixed(2));
|
||||
costTotal.val(f2(parseFloat(costPurchaseDevice)+parseFloat(costPurchaseBuild)+parseFloat(costPurchaseService)+parseFloat(costPurchaseOther)+parseFloat(costProjectManage)+parseFloat(costOther)));
|
||||
}else {
|
||||
costTotal.val("");
|
||||
}
|
||||
|
|
@ -425,8 +425,8 @@ function calCostSettleTotal() {
|
|||
|
||||
if(costPurchaseDeviceSettleTotal && costPurchaseBuildSettleTotal && costPurchaseServiceSettleTotal &&
|
||||
costPurchaseOtherSettleTotal && costProjectManageSettleTotal && costOtherSettleTotal){
|
||||
costSettleTotal.val((parseFloat(costPurchaseDeviceSettleTotal)+parseFloat(costPurchaseBuildSettleTotal)+parseFloat(costPurchaseServiceSettleTotal)+
|
||||
parseFloat(costPurchaseOtherSettleTotal)+parseFloat(costProjectManageSettleTotal)+parseFloat(costOtherSettleTotal)).toFixed(2));
|
||||
costSettleTotal.val(f2(parseFloat(costPurchaseDeviceSettleTotal)+parseFloat(costPurchaseBuildSettleTotal)+parseFloat(costPurchaseServiceSettleTotal)+
|
||||
parseFloat(costPurchaseOtherSettleTotal)+parseFloat(costProjectManageSettleTotal)+parseFloat(costOtherSettleTotal)));
|
||||
}else {
|
||||
costSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -442,7 +442,7 @@ function calCostExpropriationSettleTotal() {
|
|||
var costExpropriationSettleTotal = $("input[name='costExpropriationSettleTotal']");
|
||||
|
||||
if(costExpropriationFormerSettleTotal && costExpropriation){
|
||||
costExpropriationSettleTotal.val((parseFloat(costExpropriationFormerSettleTotal)+parseFloat(costExpropriation)).toFixed(2));
|
||||
costExpropriationSettleTotal.val(f2(parseFloat(costExpropriationFormerSettleTotal)+parseFloat(costExpropriation)));
|
||||
}else {
|
||||
costExpropriationSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -458,7 +458,7 @@ function calCostCompanyManageSettleTotal() {
|
|||
var costCompanyManageSettleTotal = $("input[name='costCompanyManageSettleTotal']");
|
||||
|
||||
if(costCompanyManageFormerSettleTotal && costCompanyManage){
|
||||
costCompanyManageSettleTotal.val((parseFloat(costCompanyManageFormerSettleTotal)+parseFloat(costCompanyManage)).toFixed(2));
|
||||
costCompanyManageSettleTotal.val(f2(parseFloat(costCompanyManageFormerSettleTotal)+parseFloat(costCompanyManage)));
|
||||
}else {
|
||||
costCompanyManageSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -474,7 +474,7 @@ function calCostIncomeTaxSettleTotal() {
|
|||
var costIncomeTaxSettleTotal = $("input[name='costIncomeTaxSettleTotal']");
|
||||
|
||||
if(costIncomeTaxFormerSettleTotal && costIncomeTax){
|
||||
costIncomeTaxSettleTotal.val((parseFloat(costIncomeTaxFormerSettleTotal)+parseFloat(costIncomeTax)).toFixed(2));
|
||||
costIncomeTaxSettleTotal.val(f2(parseFloat(costIncomeTaxFormerSettleTotal)+parseFloat(costIncomeTax)));
|
||||
}else {
|
||||
costIncomeTaxSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -491,7 +491,7 @@ function calCostManageTotal() {
|
|||
var costManageTotal = $("input[name='costManageTotal']");
|
||||
|
||||
if(costExpropriation && costCompanyManage && costIncomeTax){
|
||||
costManageTotal.val((parseFloat(costExpropriation)+parseFloat(costCompanyManage)+parseFloat(costIncomeTax)).toFixed(2));
|
||||
costManageTotal.val(f2(parseFloat(costExpropriation)+parseFloat(costCompanyManage)+parseFloat(costIncomeTax)));
|
||||
}else {
|
||||
costManageTotal.val("");
|
||||
}
|
||||
|
|
@ -508,7 +508,7 @@ function calCostManageSettleTotal() {
|
|||
var costManageSettleTotal = $("input[name='costManageSettleTotal']");
|
||||
|
||||
if(costExpropriationSettleTotal && costCompanyManageSettleTotal && costIncomeTaxSettleTotal){
|
||||
costManageSettleTotal.val((parseFloat(costExpropriationSettleTotal)+parseFloat(costCompanyManageSettleTotal)+parseFloat(costIncomeTaxSettleTotal)).toFixed(2));
|
||||
costManageSettleTotal.val(f2(parseFloat(costExpropriationSettleTotal)+parseFloat(costCompanyManageSettleTotal)+parseFloat(costIncomeTaxSettleTotal)));
|
||||
}else {
|
||||
costManageSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -525,7 +525,7 @@ function calGrossProfit() {
|
|||
var grossProfit = $("input[name='grossProfit']");
|
||||
|
||||
if(incomeTotal && costTotal && costExpropriation){
|
||||
grossProfit.val((parseFloat(incomeTotal)-parseFloat(costTotal)-parseFloat(costExpropriation)).toFixed(2));
|
||||
grossProfit.val(f2(parseFloat(incomeTotal)-parseFloat(costTotal)-parseFloat(costExpropriation)));
|
||||
}else {
|
||||
grossProfit.val("");
|
||||
}
|
||||
|
|
@ -541,7 +541,7 @@ function calGrossProfitSettleTotal() {
|
|||
var grossProfitSettleTotal = $("input[name='grossProfitSettleTotal']");
|
||||
|
||||
if(grossProfitFormerSettleTotal && grossProfit){
|
||||
grossProfitSettleTotal.val((parseFloat(grossProfitFormerSettleTotal)+parseFloat(grossProfit)).toFixed(2));
|
||||
grossProfitSettleTotal.val(f2(parseFloat(grossProfitFormerSettleTotal)+parseFloat(grossProfit)));
|
||||
}else {
|
||||
grossProfitSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -573,7 +573,7 @@ function calContributionProfit() {
|
|||
var contributionProfit = $("input[name='contributionProfit']");
|
||||
|
||||
if(grossProfit && costCompanyManage){
|
||||
contributionProfit.val((parseFloat(grossProfit)-parseFloat(costCompanyManage)).toFixed(2));
|
||||
contributionProfit.val(f2(parseFloat(grossProfit)-parseFloat(costCompanyManage)));
|
||||
}else {
|
||||
contributionProfit.val("");
|
||||
}
|
||||
|
|
@ -589,7 +589,7 @@ function calContributionProfitSettleTotal() {
|
|||
var contributionProfitSettleTotal = $("input[name='contributionProfitSettleTotal']");
|
||||
|
||||
if(contributionProfitFormerSettleTotal && contributionProfit){
|
||||
contributionProfitSettleTotal.val((parseFloat(contributionProfitFormerSettleTotal)+parseFloat(contributionProfit)).toFixed(2));
|
||||
contributionProfitSettleTotal.val(f2(parseFloat(contributionProfitFormerSettleTotal)+parseFloat(contributionProfit)));
|
||||
}else {
|
||||
contributionProfitSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -621,7 +621,7 @@ function calNetProfit() {
|
|||
var netProfit = $("input[name='netProfit']");
|
||||
|
||||
if(contributionProfit && costIncomeTax){
|
||||
netProfit.val((parseFloat(contributionProfit)-parseFloat(costIncomeTax)).toFixed(2));
|
||||
netProfit.val(f2(parseFloat(contributionProfit)-parseFloat(costIncomeTax)));
|
||||
}else {
|
||||
netProfit.val("");
|
||||
}
|
||||
|
|
@ -637,7 +637,7 @@ function calNetProfitSettleTotal() {
|
|||
var netProfitSettleTotal = $("input[name='netProfitSettleTotal']");
|
||||
|
||||
if(netProfitFormerSettleTotal && netProfit){
|
||||
netProfitSettleTotal.val((parseFloat(netProfitFormerSettleTotal)+parseFloat(netProfit)).toFixed(2));
|
||||
netProfitSettleTotal.val(f2(parseFloat(netProfitFormerSettleTotal)+parseFloat(netProfit)));
|
||||
}else {
|
||||
netProfitSettleTotal.val("");
|
||||
}
|
||||
|
|
@ -669,7 +669,7 @@ function calSaleIncomeCashSettle() {
|
|||
var saleIncomeCashSettle = $("input[name='saleIncomeCashSettle']");
|
||||
|
||||
if(saleIncomeCashFormerSettle && saleIncomeCash){
|
||||
saleIncomeCashSettle.val((parseFloat(saleIncomeCashFormerSettle)+parseFloat(saleIncomeCash)).toFixed(2));
|
||||
saleIncomeCashSettle.val(f2(parseFloat(saleIncomeCashFormerSettle)+parseFloat(saleIncomeCash)));
|
||||
}else {
|
||||
saleIncomeCashSettle.val("");
|
||||
}
|
||||
|
|
@ -685,7 +685,7 @@ function calTaxReturnSettle() {
|
|||
var taxReturnSettle = $("input[name='taxReturnSettle']");
|
||||
|
||||
if(taxReturnFormerSettle && taxReturn){
|
||||
taxReturnSettle.val((parseFloat(taxReturnFormerSettle)+parseFloat(taxReturn)).toFixed(2));
|
||||
taxReturnSettle.val(f2(parseFloat(taxReturnFormerSettle)+parseFloat(taxReturn)));
|
||||
}else {
|
||||
taxReturnSettle.val("");
|
||||
}
|
||||
|
|
@ -701,7 +701,7 @@ function calEarnestMoneyIncomeSettle() {
|
|||
var earnestMoneyIncomeSettle = $("input[name='earnestMoneyIncomeSettle']");
|
||||
|
||||
if(earnestMoneyIncomeFormerSettle && earnestMoneyIncome){
|
||||
earnestMoneyIncomeSettle.val((parseFloat(earnestMoneyIncomeFormerSettle)+parseFloat(earnestMoneyIncome)).toFixed(2));
|
||||
earnestMoneyIncomeSettle.val(f2(parseFloat(earnestMoneyIncomeFormerSettle)+parseFloat(earnestMoneyIncome)));
|
||||
}else {
|
||||
earnestMoneyIncomeSettle.val("");
|
||||
}
|
||||
|
|
@ -717,7 +717,7 @@ function calPurchaseCostSettle() {
|
|||
var purchaseCostSettle = $("input[name='purchaseCostSettle']");
|
||||
|
||||
if(purchaseCostFormerSettle && purchaseCost){
|
||||
purchaseCostSettle.val((parseFloat(purchaseCostFormerSettle)+parseFloat(purchaseCost)).toFixed(2));
|
||||
purchaseCostSettle.val(f2(parseFloat(purchaseCostFormerSettle)+parseFloat(purchaseCost)));
|
||||
}else {
|
||||
purchaseCostSettle.val("");
|
||||
}
|
||||
|
|
@ -733,7 +733,7 @@ function calTaxCostSettle() {
|
|||
var taxCostSettle = $("input[name='taxCostSettle']");
|
||||
|
||||
if(taxCostFormerSettle && taxCost){
|
||||
taxCostSettle.val((parseFloat(taxCostFormerSettle)+parseFloat(taxCost)).toFixed(2));
|
||||
taxCostSettle.val(f2(parseFloat(taxCostFormerSettle)+parseFloat(taxCost)));
|
||||
}else {
|
||||
taxCostSettle.val("");
|
||||
}
|
||||
|
|
@ -750,7 +750,7 @@ function calEarnestMoneyCostSettle() {
|
|||
var earnestMoneyCostSettle = $("input[name='earnestMoneyCostSettle']");
|
||||
|
||||
if(earnestMoneyCostFormerSettle && earnestMoneyCost){
|
||||
earnestMoneyCostSettle.val((parseFloat(earnestMoneyCostFormerSettle)+parseFloat(earnestMoneyCost)).toFixed(2));
|
||||
earnestMoneyCostSettle.val(f2(parseFloat(earnestMoneyCostFormerSettle)+parseFloat(earnestMoneyCost)));
|
||||
}else {
|
||||
earnestMoneyCostSettle.val("");
|
||||
}
|
||||
|
|
@ -766,7 +766,7 @@ function calNetCashFlowSettle() {
|
|||
var netCashFlowSettle = $("input[name='netCashFlowSettle']");
|
||||
|
||||
if(netCashFlowFormerSettle && netCashFlow){
|
||||
netCashFlowSettle.val((parseFloat(netCashFlowFormerSettle)+parseFloat(netCashFlow)).toFixed(2));
|
||||
netCashFlowSettle.val(f2(parseFloat(netCashFlowFormerSettle)+parseFloat(netCashFlow)));
|
||||
}else {
|
||||
netCashFlowSettle.val("");
|
||||
}
|
||||
|
|
@ -782,7 +782,7 @@ function calCashInflowFromInvestingActivitiesSettle() {
|
|||
var cashInflowFromInvestingActivitiesSettle = $("input[name='cashInflowFromInvestingActivitiesSettle']");
|
||||
|
||||
if(cashInflowFromInvestingActivitiesFormerSettle && cashInflowFromInvestingActivities){
|
||||
cashInflowFromInvestingActivitiesSettle.val((parseFloat(cashInflowFromInvestingActivitiesFormerSettle)+parseFloat(cashInflowFromInvestingActivities)).toFixed(2));
|
||||
cashInflowFromInvestingActivitiesSettle.val(f2(parseFloat(cashInflowFromInvestingActivitiesFormerSettle)+parseFloat(cashInflowFromInvestingActivities)));
|
||||
}else {
|
||||
cashInflowFromInvestingActivitiesSettle.val("");
|
||||
}
|
||||
|
|
@ -798,7 +798,7 @@ function calCashOutflowFromInvestingActivitiesSettle() {
|
|||
var cashOutflowFromInvestingActivitiesSettle = $("input[name='cashOutflowFromInvestingActivitiesSettle']");
|
||||
|
||||
if(cashOutflowFromInvestingActivitiesFormerSettle && cashOutflowFromInvestingActivities){
|
||||
cashOutflowFromInvestingActivitiesSettle.val((parseFloat(cashOutflowFromInvestingActivitiesFormerSettle)+parseFloat(cashOutflowFromInvestingActivities)).toFixed(2));
|
||||
cashOutflowFromInvestingActivitiesSettle.val(f2(parseFloat(cashOutflowFromInvestingActivitiesFormerSettle)+parseFloat(cashOutflowFromInvestingActivities)));
|
||||
}else {
|
||||
cashOutflowFromInvestingActivitiesSettle.val("");
|
||||
}
|
||||
|
|
@ -814,7 +814,7 @@ function calNetCashFromInvestingActivitiesSettle() {
|
|||
var netCashFromInvestingActivitiesSettle = $("input[name='netCashFromInvestingActivitiesSettle']");
|
||||
|
||||
if(netCashFromInvestingActivitiesFormerSettle && netCashFromInvestingActivities){
|
||||
netCashFromInvestingActivitiesSettle.val((parseFloat(netCashFromInvestingActivitiesFormerSettle)+parseFloat(netCashFromInvestingActivities)).toFixed(2));
|
||||
netCashFromInvestingActivitiesSettle.val(f2(parseFloat(netCashFromInvestingActivitiesFormerSettle)+parseFloat(netCashFromInvestingActivities)));
|
||||
}else {
|
||||
netCashFromInvestingActivitiesSettle.val("");
|
||||
}
|
||||
|
|
@ -830,7 +830,7 @@ function calFinancingCapitalInflowSettle() {
|
|||
var financingCapitalInflowSettle = $("input[name='financingCapitalInflowSettle']");
|
||||
|
||||
if(financingCapitalInflowFormerSettle && financingCapitalInflow){
|
||||
financingCapitalInflowSettle.val((parseFloat(financingCapitalInflowFormerSettle)+parseFloat(financingCapitalInflow)).toFixed(2));
|
||||
financingCapitalInflowSettle.val(f2(parseFloat(financingCapitalInflowFormerSettle)+parseFloat(financingCapitalInflow)));
|
||||
}else {
|
||||
financingCapitalInflowSettle.val("");
|
||||
}
|
||||
|
|
@ -846,7 +846,7 @@ function calFinancingCapitalOutflowSettle() {
|
|||
var financingCapitalOutflowSettle = $("input[name='financingCapitalOutflowSettle']");
|
||||
|
||||
if(financingCapitalOutflowFormerSettle && financingCapitalOutflow){
|
||||
financingCapitalOutflowSettle.val((parseFloat(financingCapitalOutflowFormerSettle)+parseFloat(financingCapitalOutflow)).toFixed(2));
|
||||
financingCapitalOutflowSettle.val(f2(parseFloat(financingCapitalOutflowFormerSettle)+parseFloat(financingCapitalOutflow)));
|
||||
}else {
|
||||
financingCapitalOutflowSettle.val("");
|
||||
}
|
||||
|
|
@ -862,7 +862,7 @@ function calFinancingCapitalCashflowSettle() {
|
|||
var financingCapitalCashflowSettle = $("input[name='financingCapitalCashflowSettle']");
|
||||
|
||||
if(financingCapitalCashflowFormerSettle && financingCapitalCashflow){
|
||||
financingCapitalCashflowSettle.val((parseFloat(financingCapitalCashflowFormerSettle)+parseFloat(financingCapitalCashflow)).toFixed(2));
|
||||
financingCapitalCashflowSettle.val(f2(parseFloat(financingCapitalCashflowFormerSettle)+parseFloat(financingCapitalCashflow)));
|
||||
}else {
|
||||
financingCapitalCashflowSettle.val("");
|
||||
}
|
||||
|
|
@ -878,7 +878,7 @@ function calNetIncreaseMonetaryFundsSettle() {
|
|||
var netIncreaseMonetaryFundsSettle = $("input[name='netIncreaseMonetaryFundsSettle']");
|
||||
|
||||
if(netIncreaseMonetaryFundsFormerSettle && netIncreaseMonetaryFunds){
|
||||
netIncreaseMonetaryFundsSettle.val((parseFloat(netIncreaseMonetaryFundsFormerSettle)+parseFloat(netIncreaseMonetaryFunds)).toFixed(2));
|
||||
netIncreaseMonetaryFundsSettle.val(f2(parseFloat(netIncreaseMonetaryFundsFormerSettle)+parseFloat(netIncreaseMonetaryFunds)));
|
||||
}else {
|
||||
netIncreaseMonetaryFundsSettle.val("");
|
||||
}
|
||||
|
|
@ -899,8 +899,8 @@ function calNetCashFlow() {
|
|||
|
||||
if(saleIncomeCash && taxReturn && earnestMoneyIncome &&
|
||||
purchaseCost && taxCost && earnestMoneyCost) {
|
||||
netCashFlow.val((parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)-
|
||||
parseFloat(purchaseCost)-parseFloat(taxCost)-parseFloat(earnestMoneyCost)).toFixed(2));
|
||||
netCashFlow.val(f2(parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)-
|
||||
parseFloat(purchaseCost)-parseFloat(taxCost)-parseFloat(earnestMoneyCost)));
|
||||
}else {
|
||||
netCashFlow.val("");
|
||||
}
|
||||
|
|
@ -916,7 +916,7 @@ function calNetCashFromInvestingActivities() {
|
|||
var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']");
|
||||
|
||||
if(cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities){
|
||||
netCashFromInvestingActivities.val((parseFloat(cashInflowFromInvestingActivities)-parseFloat(cashOutflowFromInvestingActivities)).toFixed(2));
|
||||
netCashFromInvestingActivities.val(f2(parseFloat(cashInflowFromInvestingActivities)-parseFloat(cashOutflowFromInvestingActivities)));
|
||||
}else {
|
||||
netCashFromInvestingActivities.val("");
|
||||
}
|
||||
|
|
@ -932,7 +932,7 @@ function calFinancingCapitalCashflow() {
|
|||
var financingCapitalCashflow = $("input[name='financingCapitalCashflow']");
|
||||
|
||||
if(financingCapitalInflow && financingCapitalOutflow){
|
||||
financingCapitalCashflow.val((parseFloat(financingCapitalInflow)-parseFloat(financingCapitalOutflow)).toFixed(2));
|
||||
financingCapitalCashflow.val(f2(parseFloat(financingCapitalInflow)-parseFloat(financingCapitalOutflow)));
|
||||
}else {
|
||||
financingCapitalCashflow.val("");
|
||||
}
|
||||
|
|
@ -949,7 +949,7 @@ function calNetIncreaseMonetaryFunds() {
|
|||
var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']");
|
||||
|
||||
if(netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow){
|
||||
netIncreaseMonetaryFunds.val((parseFloat(netCashFlow)+parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalCashflow)).toFixed(2));
|
||||
netIncreaseMonetaryFunds.val(f2(parseFloat(netCashFlow)+parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalCashflow)));
|
||||
}else {
|
||||
netIncreaseMonetaryFunds.val("");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@
|
|||
</div>
|
||||
|
||||
<form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave">
|
||||
<input type="hidden" id="keywords" name="keywords" value='${keywords!""}'/>
|
||||
<!--选项卡（tabs）begin-->
|
||||
<div class="am-tabs am-margin" data-am-tabs>
|
||||
<ul class="am-tabs-nav am-nav am-nav-tabs">
|
||||
|
|
@ -341,7 +342,7 @@
|
|||
<td>成本</td>
|
||||
<td>项目管理成本</td>
|
||||
<td>项目管理成本</td>
|
||||
<td><#--<input name="costProjectManageTaxInclude" value="${estimateBean.costProjectManageTaxInclude}" required>-->/</td>
|
||||
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
|
||||
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -643,7 +644,7 @@
|
|||
<div class="am-u-sm-10">
|
||||
<div class="am-form am-form-inline">
|
||||
<div class="am-form-group am-form-icon">
|
||||
<input type="text" id="time" name="time" autocomplete="off" data-am-datepicker readonly value="${time!}">
|
||||
<input type="text" id="time" name="time" autocomplete="off" readonly value="${time!}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1381,7 +1382,7 @@
|
|||
<#list incomeDetails as incomeDetail>
|
||||
<tr>
|
||||
<td>
|
||||
<select style="width: auto" readonly
|
||||
<#--<select style="width: auto" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-income">
|
||||
<option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类
|
||||
</option>
|
||||
|
|
@ -1389,7 +1390,14 @@
|
|||
</option>
|
||||
<option value="3" <#if incomeDetail.type == 3>selected</#if>>服务类
|
||||
</option>
|
||||
</select>
|
||||
</select>-->
|
||||
<#if incomeDetail.type ==1 >
|
||||
设备类
|
||||
<#elseif incomeDetail.type ==2>
|
||||
工程类
|
||||
<#elseif incomeDetail.type ==3>
|
||||
服务类
|
||||
</#if>
|
||||
</td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-income"
|
||||
|
|
@ -1460,7 +1468,7 @@
|
|||
<#list costDetails as costDetail>
|
||||
<tr>
|
||||
<td>
|
||||
<select style="width: auto" readonly
|
||||
<#--<select style="width: auto" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
|
||||
<option value="1" <#if costDetail.type == 1>selected</#if>>设备
|
||||
</option>
|
||||
|
|
@ -1470,10 +1478,19 @@
|
|||
</option>
|
||||
<option value="4" <#if costDetail.type == 4>selected</#if>>其他
|
||||
</option>
|
||||
</select>
|
||||
</select>-->
|
||||
<#if costDetail.type ==1 >
|
||||
设备
|
||||
<#elseif costDetail.type ==2>
|
||||
施工
|
||||
<#elseif costDetail.type ==3>
|
||||
服务
|
||||
<#elseif costDetail.type ==4>
|
||||
其他
|
||||
</#if>
|
||||
</td>
|
||||
<td>
|
||||
<select style="width: auto" readonly
|
||||
<#--<select style="width: auto" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
|
||||
<option value="1" <#if costDetail.category == 1>selected</#if>>
|
||||
华智产品
|
||||
|
|
@ -1498,7 +1515,24 @@
|
|||
</option>
|
||||
<option value="8" <#if costDetail.category == 8>selected</#if>>其他
|
||||
</option>
|
||||
</select>
|
||||
</select>-->
|
||||
<#if costDetail.category ==1 >
|
||||
华智产品
|
||||
<#elseif costDetail.category ==2>
|
||||
紫光其他产品
|
||||
<#elseif costDetail.category ==3>
|
||||
外购产品
|
||||
<#elseif costDetail.category ==4>
|
||||
外购工程
|
||||
<#elseif costDetail.category ==5>
|
||||
华智服务
|
||||
<#elseif costDetail.category ==6>
|
||||
紫光其他服务
|
||||
<#elseif costDetail.category ==7>
|
||||
外购服务
|
||||
<#elseif costDetail.category ==8>
|
||||
其他
|
||||
</#if>
|
||||
</td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost"
|
||||
|
|
@ -1570,7 +1604,7 @@
|
|||
<#list costProjectManageDetails as costProjectManageDetail>
|
||||
<tr>
|
||||
<td>
|
||||
<select style="width: auto"
|
||||
<#--<select style="width: auto"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
|
||||
<#if costProjectManageDetail.deletable==0>readonly</#if>>
|
||||
<option value="1"
|
||||
|
|
@ -1582,7 +1616,14 @@
|
|||
<option value="3"
|
||||
<#if costProjectManageDetail.type == 3>selected</#if>>其他费用
|
||||
</option>
|
||||
</select>
|
||||
</select>-->
|
||||
<#if costProjectManageDetail.type ==1 >
|
||||
人工成本
|
||||
<#elseif costProjectManageDetail.type ==2>
|
||||
业务费用
|
||||
<#elseif costProjectManageDetail.type ==3>
|
||||
其他费用
|
||||
</#if>
|
||||
</td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
|
||||
|
|
@ -1663,8 +1704,8 @@
|
|||
<#-- <td>操作</td>-->
|
||||
</tr>
|
||||
<tr>
|
||||
<td><input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
|
||||
value="${projectBudgetPlanDetailTotal.month}" readonly/></td>
|
||||
<td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
|
||||
value="${projectBudgetPlanDetailTotal.month}" readonly/>-->${projectBudgetPlanDetailTotal.month}</td>
|
||||
<td><input type="number"
|
||||
class="am-modal-prompt-input input-total-device-cost-budget-plan"
|
||||
value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}"
|
||||
|
|
@ -1719,9 +1760,9 @@
|
|||
<#if projectBudgetPlanDetails??>
|
||||
<#list projectBudgetPlanDetails as projectBudgetPlanDetail>
|
||||
<tr>
|
||||
<td><input type="text" readonly
|
||||
<td><#--<input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
|
||||
value="${projectBudgetPlanDetail.month!}"></td>
|
||||
value="${projectBudgetPlanDetail.month!}">-->${projectBudgetPlanDetail.month!}</td>
|
||||
<td><input type="number" min="0.00" max="99999999.99" step="0.01" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
|
||||
value="${Utils.format(projectBudgetPlanDetail.deviceCost)}"></td>
|
||||
|
|
@ -1889,6 +1930,7 @@
|
|||
<script src="${base}/assets/js/project_budget_cost.js"></script>
|
||||
<script src="${base}/assets/js/project_budget_cost_project_manage.js"></script>
|
||||
<script src="${base}/assets/js/project_budget_plan.js"></script>
|
||||
<script src="${base}/layui/layui.js"></script>
|
||||
</@defaultLayout.layout>
|
||||
|
||||
<script>
|
||||
|
|
@ -1926,6 +1968,7 @@
|
|||
type: 'post',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
$("#marqueeLi", parent.document).addClass("am-hide");
|
||||
if (data.status == 0) {
|
||||
alert(data.msg);
|
||||
window.location.href = window.location.href;
|
||||
|
|
@ -1935,4 +1978,37 @@
|
|||
}
|
||||
});
|
||||
}
|
||||
|
||||
layui.use('laydate', function(){
|
||||
var laydate = layui.laydate;
|
||||
|
||||
laydate.render({
|
||||
elem: '#time',
|
||||
type: 'month',
|
||||
btns: ['confirm'],
|
||||
trigger: 'click',
|
||||
ready: function(){
|
||||
console.log($(this.elem).val());
|
||||
},
|
||||
done: function() {
|
||||
var time = $(this.elem).val();
|
||||
console.log("time:" + time)
|
||||
setKeywords(time);
|
||||
$("#pmsForm").attr("action","${base}/project/approve?listFrom=list&id=${project.id}");
|
||||
$("#pmsForm").submit();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function setKeywords(time) {
|
||||
var keywordsObj = {};
|
||||
keywordsObj.time = time;
|
||||
var keywords = "";
|
||||
if (!$.isEmptyObject(keywordsObj)) {
|
||||
keywords = JSON.stringify(keywordsObj);
|
||||
}
|
||||
console.log("keywords = " + keywords);
|
||||
|
||||
$("#keywords").val(keywords);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资利息"
|
||||
name="advanceInterestAmount" placeholder="单位（元）" maxlength="20"
|
||||
name="advanceInterestAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01"
|
||||
value="" required />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资峰值"
|
||||
name="advancePeakAmount" placeholder="单位（元）" maxlength="20"
|
||||
name="advancePeakAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01"
|
||||
value="" required />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validate-async data-validation-message="请输入合同金额"
|
||||
name="contractAmount" placeholder="单位（元）" maxlength="20"
|
||||
name="contractAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01"
|
||||
value="" required />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
|
|
@ -149,7 +149,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validation-message="华智产品金额"
|
||||
name="huazhiProductAmount" placeholder="单位（元）" maxlength="14" value="" />
|
||||
name="huazhiProductAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01" value="" />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right">紫光其他产品金额</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validation-message="请输入紫光其他产品金额"
|
||||
name="ziguangOtherAmount" placeholder="单位（元）" maxlength="14" value="" />
|
||||
name="ziguangOtherAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01" value="" />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资利息"
|
||||
name="advanceInterestAmount" placeholder="单位（元）" maxlength="20"
|
||||
name="advanceInterestAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01"
|
||||
value="${Utils.format(project.advanceInterestAmount)}" required />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资峰值"
|
||||
name="advancePeakAmount" placeholder="单位（元）" maxlength="20"
|
||||
name="advancePeakAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01"
|
||||
value="${Utils.format(project.advancePeakAmount)}" required />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validate-async data-validation-message="请输入合同金额"
|
||||
name="contractAmount" placeholder="单位（元）" maxlength="20"
|
||||
name="contractAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01"
|
||||
value="${Utils.format(project.contractAmount)}" required />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->华智产品金额</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validation-message="华智产品金额"
|
||||
name="huazhiProductAmount" placeholder="单位（元）" maxlength="14" value="${Utils.format(project.huazhiProductAmount)}" />
|
||||
name="huazhiProductAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01" value="${Utils.format(project.huazhiProductAmount)}" />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->紫光其他产品金额</div>
|
||||
<div class="am-u-sm-6 am-u-md-6">
|
||||
<input type="number" class="am-input" data-validation-message="请输入紫光其他产品金额"
|
||||
name="ziguangOtherAmount" placeholder="单位（元）" maxlength="14" value="${Utils.format(project.ziguangOtherAmount)}" />
|
||||
name="ziguangOtherAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01" value="${Utils.format(project.ziguangOtherAmount)}" />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
<li id="marqueeLi" style="margin-top: -10px">
|
||||
<marquee align="left" behavior="scroll" direction="left" height="20" width="200" hspace="50" vspace="20" loop="-1" scrollamount="10" scrolldelay="100" onMouseOut="this.start()" onMouseOver="this.stop()">
|
||||
<a onclick="return removeMarquee()" href="${base}/project/listApprove" target="mainFrame">${hasApproveProjectsMessage!""}</a>
|
||||
<a href="${base}/project/listApprove" target="mainFrame">${hasApproveProjectsMessage!""}</a>
|
||||
</marquee>
|
||||
</li>
|
||||
|
||||
|
|
@ -43,9 +43,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</header>
|
||||
<script>
|
||||
var removeMarquee = function () {
|
||||
$("#marqueeLi").addClass("am-hide");
|
||||
return true;
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue