abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

todo:开票金额正则表达式

Browse Source 
开票时选择跟踪添加回款记录
This commit is contained in:
ryoeiken 2021-01-22 17:44:14 +08:00
parent b757912963
commit 159132ee7e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java
View File

@ -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());

2
ruoyi-ui/src/views/fantang/settlement/index.vue
View File

@ -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"
}