mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预算bug修改

master
OathK1per 2022-11-15 11:57:37 +08:00
parent 8e63adf037
commit 66507a3452
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/cn/palmte/work/service/ProjectBudgetService.java
View File

@ -904,6 +904,13 @@ public class ProjectBudgetService {
@Transactional(rollbackFor = RuntimeException.class)
public Project budgetEditSave(Project project, Project p, BudgetBean budgetBean, Admin admin, ApproveStatusEnum approveStatusEnum) {
// Project p = projectService.estimateEditProject(project, projectInDb);
p.setOtherName(project.getOtherName());
p.setPlanStartStr(project.getPlanStartStr());
p.setPlanEndStr(project.getPlanEndStr());
/// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());
p.setLastUpdateTime(new Date());
p.setStatus(StatusEnum.BUDGET_ACCOUNTS.getStatus());
p.setStatusDesc(StatusEnum.BUDGET_ACCOUNTS.getStatusDesc());
p.setApproveStatusBudget(approveStatusEnum.getApproveStatus());

14
src/main/resources/templates/admin/project_approve.ftl
View File

@ -470,7 +470,7 @@
value="${incomeDetail.unit!}"></td>
<td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
value="${incomeDetail.amount!0}"></td>
value="${Utils.format(incomeDetail.amount,'0.00')}"></td>
<td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
value="${Utils.format2(incomeDetail.price,'0.00')}"></td>
@ -502,7 +502,7 @@
<td></td>
<td></td>
<td></td>
<td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-amount-income" value="${incomeTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-amount-income" value="${Utils.format(incomeTotalAmount,'0.00')}" readonly <#--onkeyup="integerNumber(this)"-->></td>
<td></td>
<td></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-include-income" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0.00')}" readonly></td>
@ -649,7 +649,7 @@
value="${costDetail.unit!}"></td>
<td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
value="${costDetail.amount!0}"></td>
value="${Utils.format(costDetail.amount,'0.00')}"></td>
<td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
value="${Utils.format2(costDetail.price,'0.00')}"></td>
@ -711,7 +711,7 @@
<td></td>
<td></td>
<td></td>
<td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-amount-cost" value="${costTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-amount-cost" value="${Utils.format(costTotalAmount,'0.00')}" readonly <#--onkeyup="integerNumber(this)"-->></td>
<td></td>
<td></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-include-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxInclude,'0.00')}" readonly></td>
@ -795,6 +795,8 @@
业务费用
<#elseif costProjectManageDetail.type ==3>
其他费用
<#elseif costProjectManageDetail.type ==4>
保证金
</#if>
</td>
<td><input type="text"
@ -810,7 +812,7 @@
value="${costProjectManageDetail.unit!}"></td>
<td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
value="${costProjectManageDetail.amount!0}"></td>
value="${Utils.format(costProjectManageDetail.amount,'0.00')}"></td>
<td><input type="text" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
value="${Utils.format2(costProjectManageDetail.price,'0.00')}">
@ -847,7 +849,7 @@
<td></td>
<td></td>
<td></td>
<td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-amount-project-manage" value="${costProjectManageTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-amount-project-manage" value="${Utils.format(costProjectManageTotalAmount,'0.00')}" readonly <#--onkeyup="integerNumber(this)"-->></td>
<td></td>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-total-project-manage" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0.00')}" readonly></td>
<td></td>