修改bug
OathK1per
parent
e82900a07c
commit
90a8aa621d
|
|
@ -128,7 +128,7 @@ public class ProjectController extends BaseController {
|
|||
Map<String, String> searchInfo = getSearchInfo(keywords);
|
||||
downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream");
|
||||
String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额",
|
||||
"华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "终端客户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "合作对象",
|
||||
"华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "终端客户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "战略合作对象",
|
||||
"项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"};
|
||||
String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound",
|
||||
"huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlan", "customer", "terminalCustomer", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "collaborator",
|
||||
|
|
@ -552,7 +552,7 @@ public class ProjectController extends BaseController {
|
|||
Map<String, String> searchInfo = getSearchInfo(keywords);
|
||||
downloadHeader(httpServletResponse, Utils.generateExcelName("待我审核项目报表"), "application/octet-stream");
|
||||
String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额",
|
||||
"华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "终端客户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "合作对象",
|
||||
"华三产品金额", "其他产品金额", "项目状态", "行业场景应用", "解决方案", "客户名称", "终端客户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "签单方式", "战略合作对象",
|
||||
"项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"};
|
||||
String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound",
|
||||
"huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlan", "customer", "terminalCustomer", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "collaborator",
|
||||
|
|
|
|||
|
|
@ -1134,13 +1134,13 @@ public class ExportExcelUtils {
|
|||
totalCell.setCellValue(costTotalAmount);
|
||||
} else if (i == 8) {
|
||||
totalCell.setCellType(CellType.NUMERIC);
|
||||
totalCell.setCellValue(Utils.format(budgetBean.getCostTotalTaxInclude()));
|
||||
totalCell.setCellValue(Utils.format(budgetBean.getCostPurchaseTotalTaxInclude()));
|
||||
} else if (i == 9) {
|
||||
totalCell.setCellType(CellType.NUMERIC);
|
||||
totalCell.setCellValue(Utils.format(budgetBean.getCostTotalTaxExclude()));
|
||||
totalCell.setCellValue(Utils.format(budgetBean.getCostPurchaseTotalTaxExclude()));
|
||||
} else if (i == 10) {
|
||||
totalCell.setCellType(CellType.NUMERIC);
|
||||
totalCell.setCellValue(Utils.format(budgetBean.getCostTotalTax()));
|
||||
totalCell.setCellValue(Utils.format(budgetBean.getCostPurchaseTotalTax()));
|
||||
} else {
|
||||
totalCell.setCellType(CellType.STRING);
|
||||
totalCell.setCellValue("");
|
||||
|
|
|
|||
|
|
@ -1811,7 +1811,7 @@
|
|||
<tr class="am-text-lg">
|
||||
<td>类别</td>
|
||||
<td>费用</td>
|
||||
<td>概算总额（元）</td>
|
||||
<#-- <td>概算总额（元）</td>-->
|
||||
<td>预算总额（元）</td>
|
||||
<td>结算总额（元）</td>
|
||||
<td>决算总额（元）</td>
|
||||
|
|
@ -1819,7 +1819,7 @@
|
|||
<tr>
|
||||
<td>收入</td>
|
||||
<td>设备类</td>
|
||||
<td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>
|
||||
<#-- <td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类概算总额"></td>-->
|
||||
<td><input name="incomeDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类预算总额"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0.00')}" required readonly title="设备类结算总额"></td>
|
||||
<td><input name="incomeDeviceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0.00')}" required readonly title="设备类决算总额"></td>
|
||||
|
|
@ -1827,7 +1827,7 @@
|
|||
<tr>
|
||||
<td>收入</td>
|
||||
<td>工程类</td>
|
||||
<td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>
|
||||
<#-- <td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类概算总额"></td>-->
|
||||
<td><input name="incomeEngineerTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类预算总额"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0.00')}" required readonly title="工程类结算总额"></td>
|
||||
<td><input name="incomeEngineerFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0.00')}" required readonly title="工程类决算总额"></td>
|
||||
|
|
@ -1835,7 +1835,7 @@
|
|||
<tr>
|
||||
<td>收入</td>
|
||||
<td>服务类</td>
|
||||
<td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>
|
||||
<#-- <td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类概算总额"></td>-->
|
||||
<td><input name="incomeServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类预算总额"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0.00')}" required readonly title="服务类结算总额"></td>
|
||||
<td><input name="incomeServiceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0.00')}" required readonly title="服务类决算总额"></td>
|
||||
|
|
@ -1843,7 +1843,7 @@
|
|||
<tr>
|
||||
<td>合计</td>
|
||||
<td></td>
|
||||
<td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
|
||||
<#-- <td><input name="estimateIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>-->
|
||||
<td><input name="budgetIncomeTotalTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0.00')}" readonly required title="此列累计"></td>
|
||||
<td><input name="incomeFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getIncomeTotal(),'0.00')}" readonly required title="此列累计"></td>
|
||||
|
|
@ -1857,7 +1857,7 @@
|
|||
<td>类别</td>
|
||||
<td>费用</td>
|
||||
<td>费用项目</td>
|
||||
<td>概算总额（元）</td>
|
||||
<#-- <td>概算总额（元）</td>-->
|
||||
<td>预算总额（元）</td>
|
||||
<td>结算总额（元）</td>
|
||||
<td>决算总额（元）</td>
|
||||
|
|
@ -1866,7 +1866,7 @@
|
|||
<td>成本</td>
|
||||
<td>采购成本</td>
|
||||
<td>设备</td>
|
||||
<td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>
|
||||
<#-- <td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备概算总额"></td>-->
|
||||
<td><input name="costPurchaseDeviceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备预算总额"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0.00')}" readonly required title="购买设备结算总额"></td>
|
||||
<td><input name="costPurchaseDeviceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0.00')}" readonly required title="购买设备决算总额"></td>
|
||||
|
|
@ -1875,7 +1875,7 @@
|
|||
<td>成本</td>
|
||||
<td>采购成本</td>
|
||||
<td>施工</td>
|
||||
<td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>
|
||||
<#-- <td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本概算总额"></td>-->
|
||||
<td><input name="costPurchaseBuildTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本预算总额"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0.00')}" readonly required title="施工采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseBuildFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0.00')}" required readonly title="施工采购成本决算总额"></td>
|
||||
|
|
@ -1884,7 +1884,7 @@
|
|||
<td>成本</td>
|
||||
<td>采购成本</td>
|
||||
<td>服务</td>
|
||||
<td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>
|
||||
<#-- <td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本概算总额"></td>-->
|
||||
<td><input name="costPurchaseServiceTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本预算总额"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0.00')}" readonly required title="服务采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseServiceFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0.00')}" required readonly title="服务采购成本决算总额"></td>
|
||||
|
|
@ -1893,7 +1893,7 @@
|
|||
<td>成本</td>
|
||||
<td>采购成本</td>
|
||||
<td>其他</td>
|
||||
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>
|
||||
<#-- <td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本概算总额"></td>-->
|
||||
<td><input name="costPurchaseOtherTaxInclude" type="text" class="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0.00')}" readonly required title="其他采购成本预算总额"></td>
|
||||
<td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0.00')}" type="text" class="number" readonly required title="其他采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0.00')}" required readonly title="其他采购成本决算总额"></td>
|
||||
|
|
@ -1902,7 +1902,7 @@
|
|||
<td>成本</td>
|
||||
<td>项目管理成本</td>
|
||||
<td>项目管理成本</td>
|
||||
<td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>
|
||||
<#-- <td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本概算总额"></td>-->
|
||||
<td><input name="costProjectManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0.00')}" readonly required title="项目管理成本预算总额"></td>
|
||||
<td><input name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0.00')}" type="text" class="number" readonly required title="项目管理成本结算总额"></td>
|
||||
<td><input name="costProjectManageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0.00')}" required readonly title="项目管理成本决算总额"></td>
|
||||
|
|
@ -1911,7 +1911,7 @@
|
|||
<td>成本</td>
|
||||
<td>其他</td>
|
||||
<td style="width: 200px" class="huanhang">${project.otherName!}</td>
|
||||
<td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本概算总额"></td>
|
||||
<#-- <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本概算总额"></td>-->
|
||||
<td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly required title="其他成本预算总额"></td>
|
||||
<td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly required title="其他成本结算总额"></td>
|
||||
<td><input name="costOtherFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0.00')}" required readonly title="其他成本决算总额"></td>
|
||||
|
|
@ -1920,7 +1920,7 @@
|
|||
<td>合计</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
|
||||
<#-- <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
|
||||
<td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
|
||||
<td><input name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
|
||||
<td><input name="costFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostTotal(),'0.00')}" readonly required title="此列累计"></td>
|
||||
|
|
@ -1933,7 +1933,7 @@
|
|||
<tr class="am-text-lg">
|
||||
<td>类别</td>
|
||||
<td>费用项目</td>
|
||||
<td>概算总额（元）</td>
|
||||
<#-- <td>概算总额（元）</td>-->
|
||||
<td>预算总额（元）</td>
|
||||
<td>结算总额（元）</td>
|
||||
<td>决算总额（元）</td>
|
||||
|
|
@ -1941,7 +1941,7 @@
|
|||
<tr>
|
||||
<td>财务费用</td>
|
||||
<td>资金占用成本</td>
|
||||
<td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>
|
||||
<#-- <td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本概算总额"></td>-->
|
||||
<td><input name="costExpropriationTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本预算总额"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.costExpropriationTaxExclude,'0.00')}" required readonly title="资金占用成本结算总额"></td>
|
||||
<td><input name="costExpropriationFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0.00')}" required readonly title="资金占用成本决算总额"></td>
|
||||
|
|
@ -1949,7 +1949,7 @@
|
|||
<tr>
|
||||
<td>公司管理费用</td>
|
||||
<td></td>
|
||||
<td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>
|
||||
<#-- <td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用概算总额"></td>-->
|
||||
<td><input name="costCompanyManageTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用预算总额"></td>
|
||||
<td><input type="text" class="number" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0.00')}" required readonly title="公司管理费用结算总额"></td>
|
||||
<td><input name="costCompanyManageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0.00')}" required readonly title="公司管理费用决算总额"></td>
|
||||
|
|
@ -1957,7 +1957,7 @@
|
|||
<tr>
|
||||
<td>所得税费用</td>
|
||||
<td></td>
|
||||
<td>/</td>
|
||||
<#-- <td>/</td>-->
|
||||
<td>/</td>
|
||||
<td><input name="costIncomeTaxSettleTotal" value="${Utils.format(currentBean.costIncomeTax,'0.00')}" type="text" class="number" required readonly title="所得税费用结算总额"></td>
|
||||
<td><input name="costIncomeTaxFinalTotal" type="text" class="number" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0.00')}" required readonly title="所得税费用决算总额"></td>
|
||||
|
|
@ -1965,7 +1965,7 @@
|
|||
<tr>
|
||||
<td>合计</td>
|
||||
<td></td>
|
||||
<td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
|
||||
<#-- <td><input name="manageEstimateTotal" value="${Utils.format(estimateBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>-->
|
||||
<td><input name="manageBudgetTotal" value="${Utils.format(budgetBean.getCostManageExclude(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
|
||||
<td><input name="manageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0.00')}" type="text" class="number" readonly required title="此列累计"></td>
|
||||
<td><input name="manageFinalTotal" type="text" class="number" value="${Utils.format(finalBean.getCostManageTotal(),'0.00')}" readonly required title="此列累计"></td>
|
||||
|
|
@ -1978,7 +1978,7 @@
|
|||
<tbody>
|
||||
<tr class="am-text-lg">
|
||||
<td>类别</td>
|
||||
<td>概算总额（元）</td>
|
||||
<#-- <td>概算总额（元）</td>-->
|
||||
<td>预算总额（元）</td>
|
||||
<td>结算总额（元）</td>
|
||||
<td>决算总额（元）</td>
|
||||
|
|
@ -1986,7 +1986,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>项目毛利</td>
|
||||
<td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利概算总额"></td>
|
||||
<#-- <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利概算总额"></td>-->
|
||||
<td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0.00')}" readonly required title="项目毛利预算总额"></td>
|
||||
<td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0.00')}" readonly required title="项目毛利结算总额"></td>
|
||||
<td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0.00')}" required readonly title="项目毛利决算总额"></td>
|
||||
|
|
@ -1994,7 +1994,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>项目贡献利润</td>
|
||||
<td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润概算总额"></td>
|
||||
<#-- <td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润概算总额"></td>-->
|
||||
<td><input name="projectContributionProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0.00')}" readonly required title="项目贡献利润预算总额"></td>
|
||||
<td><input name="contributionMarginSettleTotal" type="text" class="number" value="${Utils.format(currentBean.contributionProfit,'0.00')}" readonly required title="项目贡献利润结算总额"></td>
|
||||
<td><input name="contributionMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.contributionMarginFinalTotal,'0.00')}" required readonly title="项目贡献利润决算总额"></td>
|
||||
|
|
@ -2002,7 +2002,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>项目净利润</td>
|
||||
<td>/</td>
|
||||
<#-- <td>/</td>-->
|
||||
<td><#--<input name="netMarginBudgetTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0.00')}" readonly required title="项目净利润预算总额">-->/</td>
|
||||
<td><input name="netMarginSettleTotal" type="text" class="number" value="${Utils.format(currentBean.netProfit,'0.00')}" readonly required title="项目净利润结算总额"></td>
|
||||
<td><input name="netMarginFinalTotal" type="text" class="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0.00')}" required readonly title="项目净利润决算总额"></td>
|
||||
|
|
|
|||
Loading…
Reference in New Issue