diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java index bbb41a13f..762cf01e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java @@ -41,6 +41,8 @@ public class FtInvoiceDaoController extends BaseController { private final IFtSettlementDaoService settSettlementDaoService; + private final IFtReturnDaoService ftReturnDaoService; + /** * 查询财务收费开票列表 */ @@ -126,7 +128,7 @@ public class FtInvoiceDaoController extends BaseController { String invoiceName = params.getString("invoiceName"); // 税号 String taxId = params.getString("taxId"); - // 开票类型 + // 跟踪回款 Integer invoiceType = params.getInteger("invoiceType"); // 开票金额 BigDecimal invoiceAmount = params.getBigDecimal("invoiceAmount"); @@ -144,6 +146,16 @@ public class FtInvoiceDaoController extends BaseController { invoiceDao.setInvoiceAmount(invoiceAmount); iFtInvoiceDaoService.save(invoiceDao); + // 跟踪回款 + if (invoiceType == 2) { + FtReturnDao ftReturnDao = new FtReturnDao(); + ftReturnDao.setInvoiceId(invoiceDao.getId()); + ftReturnDao.setReturnAt(new Date()); + ftReturnDao.setReturnFlag(0); + + ftReturnDaoService.save(ftReturnDao); + } + FtSettlementDao settlementDao = new FtSettlementDao(); settlementDao.setSettleId(params.getLong("settleId")); settlementDao.setInvoiceId(invoiceDao.getId()); diff --git a/ruoyi-ui/src/views/fantang/settlement/index.vue b/ruoyi-ui/src/views/fantang/settlement/index.vue index c397c6ff1..35f81af4a 100644 --- a/ruoyi-ui/src/views/fantang/settlement/index.vue +++ b/ruoyi-ui/src/views/fantang/settlement/index.vue @@ -308,7 +308,7 @@ export default { {required: true, message: "开票金额不能为空", trigger: "blur"}, { required: true, - pattern: "/(^0\\.[1-9]\\d?$)|(^0\\.\\d[1-9]?$)|(^[1-9]\\d{0,7}(\\.\\d{0,2})?$)/", + pattern: "", message: "请输入正确的开票金额", trigger: "blur" }