diff --git a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/command/dto/SupplementCmd.java b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/command/dto/SupplementCmd.java index 719a894b3b05af086e5968e25cf52ad8b92bcbee..55929443e9bb5b9e770e54eec3774dbfe2cf6543 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/command/dto/SupplementCmd.java +++ b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/command/dto/SupplementCmd.java @@ -45,4 +45,5 @@ public class SupplementCmd { public BigDecimal salaryCompensation; @ApiModelProperty(value = "閭鍦板潃") public String emailAddress; + } diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/InvoiceAssembler.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/InvoiceAssembler.java index 241e68fd317831b93c8857e1904d66697475858b..996999a63f6ae683e2620d33f50e8708d7291d04 100644 --- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/InvoiceAssembler.java +++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/assembler/InvoiceAssembler.java @@ -47,7 +47,7 @@ public class InvoiceAssembler { cmd.getSellerName(),cmd.getSellerCode(),cmd.getRemark(), cmd.getInvoiceCode(),cmd.getInvoiceNo(), cmd.getInvoiceDate(),cmd.getVoucherCode(),cmd.getVoucherDate(), - cmd.getAcceptCode(),cmd.getAcceptCode(),cmd.getBillType(),cmd.getInvoiceType(),cmd.getEmailAddress()); + cmd.getAcceptCode(),cmd.getApplyOrgName(),cmd.getBillType(),cmd.getInvoiceType(),cmd.getEmailAddress()); } public static InvoiceAggergate toInvoiceAggergate(PreInvoiceCmd cmd) { diff --git a/WebSite/src/views/srincomesupplement/components/incomesupplement.vue b/WebSite/src/views/srincomesupplement/components/incomesupplement.vue index 87a56d1b58b7befb8c606390f0cf427bd4a2b677..240b056b9ae4af40896142facf3c307af6979f70 100644 --- a/WebSite/src/views/srincomesupplement/components/incomesupplement.vue +++ b/WebSite/src/views/srincomesupplement/components/incomesupplement.vue @@ -794,6 +794,7 @@ export default { return ElNotification.warning(rs.description); } if (rs.data.length != 0) { + debugger; data.isInvoice = true; data.saveIncomeInvoiceCmd.acceptCode = rs.data[0].acceptCode; data.saveIncomeInvoiceCmd.applyOrgName = rs.data[0].applyOrgName;