流程详情展示

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<ProcessAttachment> 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<ProjectBudgetIncomeDetail> 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

src/main/resources/templates/admin/business/process-detail.ftl

@@ -131,38 +131,32 @@
           <div>
 
             <el-form-item label="税率">
-              <span>${process.taxRate}</span>
+              <span>${process.taxRate}%</span>
             </el-form-item>
 
             <el-form-item label="是否垫资">
-              <span>${process.isPrepaid}</span>
+              <span>${isPrepaid}</span>
             </el-form-item>
 
             <el-form-item label="垫资金额">
-              <span>${process.repaidAmount}</span>
+              <span>${project.repaidAmount}</span>
             </el-form-item>
 
             <el-form-item label="预算毛利率">
-              <span>${process.budgetGrossMargin}</span>
+              <span>${project.grossProfitMargin}</span>
             </el-form-item>
 
           </div>
 
           <div>
             <el-form-item label="收款条件">
-              <el-input type="textarea" disabled :autosize="{ minRows: 3, maxRows: 10}" cols="90" maxlength="5000" show-word-limit
-                        placeholder="请输入收款条件（限制5000字）">
-                  ${process.paymentTerms}
-              </el-input>
+              <div>${contract.paymentTerms}</div>
             </el-form-item>
           </div>
 
           <div>
             <el-form-item label="备注">
-              <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}" maxlength="5000" show-word-limit
-                        placeholder="请输入备注（限制5000字）" cols="90">
-                  ${process.remark}
-              </el-input>
+              <div>${process.remark}</div>
             </el-form-item>
           </div>
 

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;
+      }
   </style>
 
   <div class="admin-content" id="app">