销售合同

master
Harry Yang 2022-12-21 18:12:06 +08:00
parent 84e04276ce
commit 87de30b4eb
4 changed files with 10 additions and 1 deletions

View File

@ -202,6 +202,10 @@ public class ProcessController {
entity.setSealTypes(SealTypeArray.of(form.getSealTypes())); entity.setSealTypes(SealTypeArray.of(form.getSealTypes()));
entity.setApplyDept(String.join(",", form.getApplyDept())); entity.setApplyDept(String.join(",", form.getApplyDept()));
if (entity.getStatus() == null) {
entity.setStatus(ProcessStatus.to_be_audit);
}
entityManager.persist(entity); entityManager.persist(entity);
SaleContract saleContract = new SaleContract(); SaleContract saleContract = new SaleContract();

View File

@ -41,7 +41,7 @@ public class ProjectProcess {
// 项目编号 // 项目编号
private String projectNo; private String projectNo;
@JsonFormat(pattern="yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applyDate; private LocalDate applyDate;
// 项目标题 // 项目标题
@ -84,6 +84,7 @@ public class ProjectProcess {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createAt; private LocalDateTime createAt;
@Enumerated(EnumType.STRING)
private ProcessType processType; private ProcessType processType;
private String remark; private String remark;

View File

@ -6,6 +6,7 @@ import java.util.List;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import cn.palmte.work.model.enums.ProcessStatus; import cn.palmte.work.model.enums.ProcessStatus;
import cn.palmte.work.model.enums.ProcessType;
import lombok.Data; import lombok.Data;
/** /**
@ -66,6 +67,8 @@ public class SaleContractProcessForm {
private ProcessStatus status; private ProcessStatus status;
private ProcessType processType;
private List<SaleContractDetailForm> incomeDetails; private List<SaleContractDetailForm> incomeDetails;
} }

View File

@ -741,6 +741,7 @@
const form = { const form = {
...this.processForm, ...this.processForm,
processType: 'sale_contract',
projectTitle: this.projectTitle, projectTitle: this.projectTitle,
incomeDetails: this.incomeDetails.map(detail => ({ incomeDetails: this.incomeDetails.map(detail => ({
id: detail.id, expirationDate: detail.expirationDate id: detail.id, expirationDate: detail.expirationDate