diff --git a/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java b/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java
index 5fdd965..a2859ad 100644
--- a/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java
+++ b/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java
@@ -28,7 +28,7 @@ public class ProcurementDetail {
private String contractParty;
- private int isUnderwritten;
+ private boolean isUnderwritten;
private String isUnderwrittenDesc;
private BigDecimal underwrittenAmount;
@@ -60,8 +60,9 @@ public class ProcurementDetail {
private Integer amountId;
- public void setIsUnderwritten(int isUnderwritten) {
+ public void setIsUnderwritten(boolean isUnderwritten) {
this.isUnderwritten = isUnderwritten;
- this.isUnderwrittenDesc = isUnderwritten == 1 ? "是" : "否";
+ this.isUnderwrittenDesc = isUnderwritten ? "是" : "否";
}
+
}
diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java
index 30c5c41..1ea1034 100644
--- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java
@@ -296,7 +296,7 @@ public class ProjectProcessService {
for (BudgetPurchaseAmount amount : purchaseAmount) {
ProjectBudgetCostDetail costDetail = getCostDetailById(amount.getBudgetCostId());
ProcurementDetail detail = new ProcurementDetail();
- BeanUtils.copyProperties(costDetail, detail);
+ BeanUtils.copyProperties(costDetail, detail, "isUnderwritten");
Integer amountId = amount.getId();
// 找对应 预算采购明细的数量记录 的采购详情
@@ -314,6 +314,7 @@ public class ProjectProcessService {
}
detail.setAmountLeft(allAmount.subtract(amountAlready));
detail.setAmountCurrent(amount.getAmountCurrent());
+ detail.setIsUnderwritten(isProjectPrepaid(projectId));
ret.add(detail);
}
}
@@ -321,7 +322,7 @@ public class ProjectProcessService {
List<ProjectBudgetCostDetail> costDetails = getCostDetails(projectId);
for (ProjectBudgetCostDetail costDetail : costDetails) {
ProcurementDetail detail = new ProcurementDetail();
- BeanUtils.copyProperties(costDetail, detail);
+ BeanUtils.copyProperties(costDetail, detail, "isUnderwritten");
// 可能为 0
BigDecimal amountAlready = getAmountAlready(costDetail.getId());
detail.setAmountAlready(amountAlready);
@@ -333,6 +334,7 @@ public class ProjectProcessService {
// TODO 查询太频繁
detail.setCategory(getCategory(costDetail));
detail.setBudgetCostId(costDetail.getId());
+ detail.setIsUnderwritten(isProjectPrepaid(projectId));
ret.add(detail);
}
}
@@ -500,7 +502,14 @@ public class ProjectProcessService {
* 是否垫资
*/
public boolean isProjectPrepaid(Project project) {
- return BigDecimal.ZERO.equals(getProjectRepaidAmount(project.getId()));
+ return isProjectPrepaid(project.getId());
+ }
+
+ /**
+ * 是否垫资
+ */
+ public boolean isProjectPrepaid(Integer projectId) {
+ return isProjectPrepaid(getProjectRepaidAmount(projectId));
}
/**
diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl
index 6a010fe..7f5a6d7 100644
--- a/src/main/resources/templates/admin/business/process-edit.ftl
+++ b/src/main/resources/templates/admin/business/process-edit.ftl
@@ -185,7 +185,7 @@
</el-form-item>
<el-form-item label="垫资金额" v-if="processForm.isPrepaid!=='否'">
- <span>{{processForm.repaidAmount}}元</span>
+ <span>{{processForm.repaidAmount|numberFormat}}元</span>
</el-form-item>
<el-form-item label="预算毛利率">
@@ -263,7 +263,7 @@
</el-table-column>
<el-table-column prop="totalAmount" label="合计金额" width="160" align="center">
<template slot-scope="scope">
- <el-input-number size="mini" :precision="2" :step="0.1" :max="100" :min="0"
+ <el-input-number size="mini" :precision="2" :step="0.1" :max="100000000000000" :min="0"
v-model="scope.row.totalAmount" controls-position="right"></el-input-number>
</template>
</el-table-column>
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index a53b2df..ee0069c 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -305,7 +305,7 @@
</el-form-item>
<el-form-item label="垫资金额" v-if="processForm.isPrepaid!=='否'">
- <span v-if="projectSelected">{{processForm.repaidAmount}}</span>
+ <span v-if="projectSelected">{{processForm.repaidAmount|numberFormat}}</span>
<span v-else>未选择项目</span>
</el-form-item>
@@ -384,7 +384,7 @@
</el-table-column>
<el-table-column prop="totalAmount" label="合计金额" width="160" align="center">
<template slot-scope="scope">
- <el-input-number size="mini" :precision="2" :step="0.1" :max="100" :min="0"
+ <el-input-number size="mini" :precision="2" :step="0.1" :max="100000000000000" :min="0"
v-model="scope.row.totalAmount"></el-input-number>
</template>
</el-table-column>
@@ -974,7 +974,7 @@
}
}
// @formatter:on
- if (this.projectType === procurementContract) {
+ if (this.processType === procurementContract) {
// 只有 采购合同重置 合同金额 （因为要根据合同清单明细计算）
this.initForm({ ...form, contractAmount: 0 })
}
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
index aa330bc..e875b99 100644
--- a/src/main/resources/templates/admin/business/process-review.ftl
+++ b/src/main/resources/templates/admin/business/process-review.ftl
@@ -409,7 +409,7 @@
switch (value) {
case 'sale_contract':
return "销售合同流程"
- case 'business_procurement':
+ case 'procurement_contract':
return "业务采购流程"
}
}