diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java index 9eaed44..3c8764d 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -150,6 +150,7 @@ public class ProcessController { model.addAttribute("cooperationType", Enumerable.of(CooperationType.class, project.getCooperateType()).getDescription()); List attachments = JSONArray.parseArray(process.getAttachmentUri(), ProcessAttachment.class); model.addAttribute("attachments", attachments); + model.addAttribute("isPrepaid", isPrepaid(project)); if (process.getProcessType() != null) { switch (process.getProcessType()) { @@ -216,13 +217,13 @@ public class ProcessController { // FIXME 垫资 // 是否垫资 - public final String isPrepaid = "是"; + public String isPrepaid; // 垫资金额 public final String repaidAmount = "50000元"; // 预算毛利率 - public final String budgetGrossMargin = "3.9%"; + public BigDecimal budgetGrossMargin; } @ResponseBody @@ -234,9 +235,11 @@ public class ProcessController { // 可以在对应表数据查询 是否存在再启用 List incomeDetails = projectBudgetService.getBudgetIncomeDetail(project); return ProjectReturnValue.builder() + .isPrepaid(isPrepaid(project)) .projectId(project.getId()) .incomeDetails(incomeDetails) .projectName(project.getName()) + .budgetGrossMargin(project.getGrossProfitMargin()) .projectNo(project.getProjectNo()) .applyPersonName(admin.getRealName()) .contractAmount(project.getContractAmount()) @@ -246,6 +249,10 @@ public class ProcessController { .build(); } + private static String isPrepaid(Project project) { + return project.getUnderwrittenMode() == 2 || project.getUnderwrittenMode() == 3 ? "是" : "否"; + } + // 销售合同流程 @ResponseBody diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl index 2fc5f78..20aff40 100644 --- a/src/main/resources/templates/admin/business/process-detail.ftl +++ b/src/main/resources/templates/admin/business/process-detail.ftl @@ -131,38 +131,32 @@
- ${process.taxRate} + ${process.taxRate}% - ${process.isPrepaid} + ${isPrepaid} - ${process.repaidAmount} + ${project.repaidAmount} - ${process.budgetGrossMargin} + ${project.grossProfitMargin}
- - ${process.paymentTerms} - +
${contract.paymentTerms}
- - ${process.remark} - +
${process.remark}
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index 9092b3c..e9a9450 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -36,6 +36,9 @@ .el-upload-list__item-name [class^="el-icon"] { height: unset; } + .el-checkbox{ + margin-right: 10px; + }