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

序号绑定删除按钮

master
OathK1per 2022-01-13 15:51:34 +08:00
parent a0eb41ea6a
commit 211a306d67
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cn/palmte/work/service/ProjectFinalSevice.java
View File

@ -9,7 +9,6 @@ import org.springframework.transaction.annotation.Transactional;
import top.jfunc.common.utils.CollectionUtil;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
@ -61,14 +60,14 @@ public class ProjectFinalSevice {
@Transactional
public void save(Project project, FinalBean finalBean) {
clearAndSave(project, finalBean);
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT);
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT, project.getOtherName());
}
@Transactional
public void saveAndApprove(Project project, FinalBean finalBean) throws Exception {
clearAndSave(project, finalBean);
//更新项目和审批状态
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING);
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING, project.getOtherName());
//发起流程
projectInstanceService.startFinalProcessInstance(project.getId(), InterfaceUtil.getAdmin());
}

3
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -215,10 +215,11 @@ public class ProjectService {
/**
* 更新项目状态和审批状态
*/
public void updateStatusAndApproveStatus(int projectId, StatusEnum statusEnum, ApproveStatusEnum approveStatusEnum) {
public void updateStatusAndApproveStatus(int projectId, StatusEnum statusEnum, ApproveStatusEnum approveStatusEnum, String otherName) {
Project one = projectRepository.findOne(projectId);
one.setStatus(statusEnum.getStatus());
one.setStatusDesc(statusEnum.getStatusDesc());
one.setOtherName(otherName);
int approveStatus = approveStatusEnum.getApproveStatus();
switch (statusEnum) {

5
src/main/java/cn/palmte/work/service/ProjectSettleService.java
View File

@ -11,7 +11,6 @@ import top.jfunc.common.utils.CollectionUtil;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@ -47,13 +46,13 @@ public class ProjectSettleService {
public void save(Project project, SettleBean settleBean, BudgetSettleBean budgetBean, EstimateSettleBean estimateBean, String time) {
step(project, settleBean, budgetBean, estimateBean, time);
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT);
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT, project.getOtherName());
}
public void saveAndApprove(Project project, SettleBean settleBean, BudgetSettleBean budgetBean, EstimateSettleBean estimateBean, String time) throws Exception{
step(project, settleBean, budgetBean, estimateBean, time);
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING);
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.SETTLE_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING, project.getOtherName());
//发起结算流程
projectInstanceService.startSettleProcessInstance(project, InterfaceUtil.getAdmin());

1
src/main/resources/static/assets/js/project_budget.js
View File

@ -369,6 +369,7 @@ function bindDeleteBtn() {
$(".am-modal-line-delete").click(function () {
//删除自己对应的tr
$(this).parent().parent().remove();
bindNum();
});
}

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

@ -449,7 +449,7 @@
<#if incomeDetails??>
<#list incomeDetails as incomeDetail>
<tr>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-budget-num" value="${(incomeDetail_index+1)!}" readonly></td>
<td>${(incomeDetail_index+1)!}</td>
<td>
<#--<select style="width: auto" readonly
class="am-modal-prompt-input am-modal-prompt-input-income">
@ -523,7 +523,7 @@
<#if costDetails??>
<#list costDetails as costDetail>
<tr>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" value="${(costDetail_index+1)!}" readonly></td>
<td>${(costDetail_index+1)!}</td>
<td>
<#--<select style="width: auto" readonly
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
@ -607,7 +607,7 @@
<#if costProjectManageDetails??>
<#list costProjectManageDetails as costProjectManageDetail>
<tr>
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-budget-num" value="${(costProjectManageDetail_index+1)!}" readonly></td>
<td>${(costProjectManageDetail_index+1)!}</td>
<td>
<#--<select style="width: auto"
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"