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

预算毛利率 申请人领导

master
Harry Yang 2023-01-04 19:20:48 +08:00
parent bbe63860e5
commit 02b009c3b4
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/palmte/work/controller/backend/ProcessController.java
View File

@ -190,7 +190,7 @@ public class ProcessController {
List<ProcessAttachment> attachments = JSONArray.parseArray(process.getAttachmentUri(), ProcessAttachment.class);
model.addAttribute("attachments", attachments);
model.addAttribute("isPrepaid", isPrepaid(project));
BigDecimal repaidAmount = getRepaidAmount(id);
BigDecimal repaidAmount = getRepaidAmount(process.getProjectId());
model.addAttribute("repaidAmount", repaidAmount);
model.addAttribute("forAudit", forAudit);
@ -349,11 +349,13 @@ public class ProcessController {
detail.setProcessId(id);
detail.setProcess(process);
Project project = projectRepository.findById(process.getProjectId());
BudgetBean budgetBean = projectBudgetService.getBudget(project);
detail.setProject(project);
BigDecimal repaidAmount = getRepaidAmount(id);
BigDecimal repaidAmount = getRepaidAmount(process.getProjectId());
detail.setRepaidAmount(repaidAmount);
detail.setBudgetGrossMargin(budgetBean.getProjectGrossProfitRate());
Object contract = null;
List<SupplierMaterial> supplierMaterials = Collections.emptyList();

4
src/main/java/cn/palmte/work/model/process/ProjectProcess.java
View File

@ -66,10 +66,10 @@ public class ProjectProcess implements Serializable {
// 申请部门ID(逗号分割)
private String applyDeptId;
// 申请部门领导ID
// 申请人部门领导ID
private Integer applyDeptLeaderId;
// 申请部门领导
// 申请人部门领导
private String applyDeptLeaderName;
// 合同编号

1
src/main/java/cn/palmte/work/model/process/ProjectProcessDetail.java
View File

@ -32,6 +32,7 @@ public class ProjectProcessDetail {
private String isPrepaid;
private BigDecimal repaidAmount;
private BigDecimal budgetGrossMargin;
private Object contract;

4
src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java
View File

@ -44,10 +44,10 @@ public class ProcessCreationForm {
// 申请部门ID(逗号分割)
private String applyDeptId;
// 申请部门领导ID
// 申请人部门领导ID
private Integer applyDeptLeaderId;
// 申请部门领导
// 申请人部门领导
private String applyDeptLeaderName;
// 申请人电话

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

@ -61,7 +61,7 @@
<el-descriptions-item label="申请部门">{{process?.applyDept?.split(',').join('/')}}</el-descriptions-item>
<el-descriptions-item label="申请人">{{process.applyPersonName}}</el-descriptions-item>
<el-descriptions-item label="申请部门领导">{{process.applyDeptLeaderName}}</el-descriptions-item>
<el-descriptions-item label="申请人部门领导">{{process.applyDeptLeaderName}}</el-descriptions-item>
<el-descriptions-item label="申请人电话" v-if="isSaleContract">{{contract.applyPersonPhone}}</el-descriptions-item>
<el-descriptions-item label="合同编号">
@ -94,9 +94,9 @@
<el-descriptions-item label="税率">{{process.taxRate}}%</el-descriptions-item>
<el-descriptions-item label="是否垫资">${isPrepaid}</el-descriptions-item>
<el-descriptions-item label="垫资金额" v-if="isPrepaid!=='否'">${repaidAmount}元</el-descriptions-item>
<el-descriptions-item label="垫资金额" v-if="isPrepaid==='是'">${repaidAmount}元</el-descriptions-item>
<el-descriptions-item label="预算毛利率">${project.grossProfitMargin}</el-descriptions-item>
<el-descriptions-item label="预算毛利率">{{budgetGrossMargin}}%</el-descriptions-item>
<el-descriptions-item label="收款条件" v-if="isSaleContract">
<el-popover placement="top-start" title="收款条件" width="400" trigger="hover">
@ -320,6 +320,7 @@
.then(parseJSON)
.then(data => {
const {
budgetGrossMargin,
attachments, processId, isPrepaid, repaidAmount,
incomeDetails, process, projectType, cooperationType,
contract, supplierMaterials, procurementDetails, project
@ -361,6 +362,7 @@
this.processId = processId
this.projectType = projectType
this.cooperationType = cooperationType
this.budgetGrossMargin = budgetGrossMargin
this.supplierMaterials = supplierMaterials && supplierMaterials.map(item => ({
...item, attachment: mapAttachment(item.attachment)
}))