初始化项目

web-api/src/main/java/com/jeesite/modules/apps/Service/erpFlowService.java

@@ -0,0 +1,162 @@
+package com.jeesite.modules.apps.Service;
+
+import com.jeesite.modules.erp.entity.*;
+import com.jeesite.modules.erp.service.ErpAccountService;
+import com.jeesite.modules.erp.service.ErpCategoryService;
+import com.jeesite.modules.erp.service.ErpDebtsService;
+import com.jeesite.modules.erp.service.ErpTransactionFlowService;
+import com.jeesite.modules.utils.BigDecimalUtils;
+import com.jeesite.modules.utils.DateUtils;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Service
+public class erpFlowService {
+
+
+    @Resource
+    private ErpDebtsService erpDebtsService;
+
+    @Resource
+    private ErpAccountService erpAccountService;
+
+    @Resource
+    private ErpCategoryService erpCategoryService;
+
+    @Resource
+    private ErpTransactionFlowService erpTransactionFlowService;
+
+
+    /**
+     * 支出新增
+     */
+    public void addExpense(ErpExpense erpExpense) {
+        ErpAccount account = erpAccountService.get(erpExpense.getAccountId());
+        ErpCategory category = erpCategoryService.get(erpExpense.getCategoryId());
+        account.setUpdateTime(new Date());
+        account.setCurrentBalance(BigDecimalUtils.subtract(account.getCurrentBalance(), erpExpense.getAmount()));
+        erpAccountService.save(account);
+        addFlow(
+                erpExpense.getExpenseName(),        // 交易名称
+                category.getCategoryType(),          // 交易类型
+                erpExpense.getAmount(),             // 交易金额
+                erpExpense.getAccountId(),          // 账户ID
+                erpExpense.getCategoryId(),         // 分类ID
+                erpExpense.getRemark(),             // 备注
+                erpExpense.getExpenseId(),          // 业务ID
+                DateUtils.getCurrentYear(),         // 年份
+                DateUtils.getCurrentMonth()         // 月份
+        );
+    }
+
+
+    /**
+     * 收入新增
+     */
+    public void addIncome(ErpIncome erpIncome) {
+        ErpAccount account = erpAccountService.get(erpIncome.getAccountId());
+        ErpCategory category = erpCategoryService.get(erpIncome.getCategoryId());
+        account.setUpdateTime(new Date());
+        account.setCurrentBalance(BigDecimalUtils.add(account.getCurrentBalance(), erpIncome.getAmount()));
+        erpAccountService.save(account);
+        addFlow(
+                erpIncome.getIncomeName(),           // 流水名称
+                category.getCategoryType(),          // 流水类型
+                erpIncome.getAmount(),               // 金额
+                erpIncome.getAccountId(),            // 账户ID
+                erpIncome.getCategoryId(),           // 分类ID
+                erpIncome.getRemark(),               // 备注
+                erpIncome.getIncomeId(),             // 业务ID
+                com.jeesite.modules.utils.DateUtils.getCurrentYear(),   // 年
+                com.jeesite.modules.utils.DateUtils.getCurrentMonth()   // 月
+        );
+    }
+
+    /**
+     * 还款支出
+     */
+    public void addDebt(ErpDebtRecords erpDebtRecords) {
+        ErpDebts debts = erpDebtsService.get(erpDebtRecords.getDebtId());
+        ErpAccount account = erpAccountService.get(erpDebtRecords.getAccountId());
+        ErpCategory category = erpCategoryService.get(erpDebtRecords.getCategoryId());
+        debts.setRemaining(BigDecimalUtils.add(debts.getRemaining(),erpDebtRecords.getRepayAmount()));
+        erpDebtsService.save(debts);
+
+        account.setUpdateTime(new Date());
+        account.setCurrentBalance(BigDecimalUtils.subtract(account.getCurrentBalance(), erpDebtRecords.getRepayAmount()));
+        erpAccountService.save(account);
+        addFlow(
+                erpDebtRecords.getDebtName(),        // 交易名称
+                category.getCategoryType(),          // 交易类型
+                erpDebtRecords.getRepayAmount(),             // 交易金额
+                erpDebtRecords.getAccountId(),          // 账户ID
+                erpDebtRecords.getCategoryId(),         // 分类ID
+                erpDebtRecords.getRemark(),             // 备注
+                erpDebtRecords.getDebtId(),          // 业务ID
+                DateUtils.getCurrentYear(),         // 年份
+                DateUtils.getCurrentMonth()         // 月份
+        );
+    }
+
+    /**
+     * 账户转账
+     */
+    public void accountTran(ErpAccountTransfer erpAccountTransfer) {
+        // 转入
+        ErpAccount inAccount = erpAccountService.get(erpAccountTransfer.getInAccountId());
+        inAccount.setCurrentBalance(BigDecimalUtils.add(inAccount.getCurrentBalance(), erpAccountTransfer.getTransferAmount()));
+        erpAccountService.save(inAccount);
+        //转出
+        ErpAccount outAccount = erpAccountService.get(erpAccountTransfer.getOutAccountId());
+        outAccount.setCurrentBalance(BigDecimalUtils.subtract(outAccount.getCurrentBalance(), erpAccountTransfer.getTransferAmount()));
+        erpAccountService.save(outAccount);
+        //分类
+        ErpCategory category = erpCategoryService.get(erpAccountTransfer.getCategoryId());
+        addFlow(
+                erpAccountTransfer.getTransferName(),
+                category.getCategoryType(),
+                erpAccountTransfer.getTransferAmount(),
+                erpAccountTransfer.getInAccountId(),
+                erpAccountTransfer.getCategoryId(),
+                erpAccountTransfer.getRemark(),
+                erpAccountTransfer.getTransferId(),
+                DateUtils.getCurrentYear(),
+                DateUtils.getCurrentMonth()
+        );
+
+        addFlow(
+                erpAccountTransfer.getTransferName(),
+                category.getCategoryType(),
+                erpAccountTransfer.getTransferAmount(),
+                erpAccountTransfer.getOutAccountId(),
+                erpAccountTransfer.getCategoryId(),
+                erpAccountTransfer.getRemark(),
+                erpAccountTransfer.getTransferId(),
+                DateUtils.getCurrentYear(),
+                DateUtils.getCurrentMonth()
+        );
+    }
+
+    /**
+     * 流水新增
+     */
+    public void addFlow(String flowName, String flowType, BigDecimal amount,
+                        String accountId, String categoryId, String remark, String businessId, String yearDate, String monthDate) {
+        ErpTransactionFlow flow = new ErpTransactionFlow();
+        flow.setFlowName(flowName);          // 交易名称
+        flow.setFlowType(flowType);          // 交易类型
+        flow.setAmount(amount);              // 交易金额
+        flow.setTradeTime(new Date());       // 交易时间
+        flow.setAccountId(accountId);        // 交易账户
+        flow.setCategoryId(categoryId);      // 交易分类
+        flow.setRemark(remark);              // 交易备注
+        flow.setUpdateTime(new Date());      // 更新时间
+        flow.setBusinessId(businessId);      // 业务标识
+        flow.setYearDate(yearDate);          // 年份
+        flow.setMonthDate(monthDate);        // 月份
+        erpTransactionFlowService.save(flow);
+    }
+}

web-api/src/main/java/com/jeesite/modules/erp/entity/ErpBudgets.java

@@ -38,6 +38,13 @@ import java.io.Serial;
         @Column(name = "used_ratio", attrName = "usedRatio", label = "预算占比", isQuery = false),
         @Column(name = "over_amount", attrName = "overAmount", label = "超支金额", isQuery = false),
         @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
+}, joinTable = {
+        @JoinTable(type = Type.LEFT_JOIN, entity = ErpCategory.class, alias = "b",
+                on = "a.category_id = b.category_id", attrName = "this",
+                columns = {
+                        @Column(name = "parent_name", attrName = "parentName", label = "父级名称"),
+                        @Column(name = "category_name", attrName = "categoryName", label = "分类名称"),
+                }),
 }, orderBy = "a.budget_id DESC"
 )
 @Data
@@ -55,10 +62,16 @@ public class ErpBudgets extends DataEntity<ErpBudgets> implements Serializable {
     private Double overAmount;        // 超支金额
     private Date updateTime;        // 更新时间
 
+    private String parentName;
+
+    private String categoryName;
+
+
     @ExcelFields({
             @ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),
             @ExcelField(title = "唯一主键", attrName = "budgetId", align = Align.CENTER, sort = 20),
-            @ExcelField(title = "分类标识", attrName = "categoryId", align = Align.CENTER, sort = 30),
+            @ExcelField(title = "父级分类", attrName = "parentName", align = Align.CENTER, sort = 30),
+            @ExcelField(title = "分类名称", attrName = "categoryName", align = Align.CENTER, sort = 35),
             @ExcelField(title = "预算年月", attrName = "budgetMonth", align = Align.CENTER, sort = 40),
             @ExcelField(title = "预算金额", attrName = "budgetAmount", align = Align.CENTER, sort = 50),
             @ExcelField(title = "使用金额", attrName = "usedAmount", align = Align.CENTER, sort = 60),

web-api/src/main/java/com/jeesite/modules/erp/entity/ErpDebtRecords.java

@@ -37,7 +37,26 @@ import java.io.Serial;
         @Column(name = "account_id", attrName = "accountId", label = "账户标识"),
         @Column(name = "repay_amount", attrName = "repayAmount", label = "还款金额", isQuery = false),
         @Column(name = "repay_time", attrName = "repayTime", label = "还款时间", isQuery = false, isUpdateForce = true),
+        @Column(name = "category_id", attrName = "categoryId", label = "分类标识"),
         @Column(name = "remark", attrName = "remark", label = "备注说明", queryType = QueryType.LIKE),
+        @Column(name = "is_recorded", attrName = "isRecorded", label = "是否记账"),
+}, joinTable = {
+        @JoinTable(type = Type.LEFT_JOIN, entity = ErpAccount.class, alias = "b",
+                on = "a.account_id = b.account_id", attrName = "this",
+                columns = {
+                        @Column(name = "account_name", attrName = "accountName", label = "账户名称"),
+                }),
+        @JoinTable(type = Type.LEFT_JOIN, entity = ErpDebts.class, alias = "c",
+                on = "a.debt_id = c.debt_id", attrName = "this",
+                columns = {
+                        @Column(name = "debt_name", attrName = "debtName", label = "对方名称"),
+                }),
+        @JoinTable(type = Type.LEFT_JOIN, entity = ErpCategory.class, alias = "d",
+                on = "a.category_id = d.category_id", attrName = "this",
+                columns = {
+                        @Column(name = "parent_name", attrName = "parentName", label = "父级名称"),
+                        @Column(name = "category_name", attrName = "categoryName", label = "分类名称"),
+                }),
 }, orderBy = "a.record_id DESC"
 )
 @Data
@@ -51,13 +70,22 @@ public class ErpDebtRecords extends DataEntity<ErpDebtRecords> implements Serial
     private String accountId;        // 账户标识
     private BigDecimal repayAmount;        // 还款金额
     private Date repayTime;        // 还款时间
+    private String categoryId;
     private String remark;        // 备注说明
+    private String isRecorded;
+
+    private String accountName;
+    private String debtName;
+
+    private String parentName;
+
+    private String categoryName;
 
     @ExcelFields({
             @ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),
             @ExcelField(title = "唯一标识", attrName = "recordId", align = Align.CENTER, sort = 20),
-            @ExcelField(title = "负债标识", attrName = "debtId", align = Align.CENTER, sort = 30),
+            @ExcelField(title = "负债名称", attrName = "debtName", align = Align.CENTER, sort = 30),
-            @ExcelField(title = "账户标识", attrName = "accountId", align = Align.CENTER, sort = 40),
+            @ExcelField(title = "账户名称", attrName = "accountName", align = Align.CENTER, sort = 40),
             @ExcelField(title = "还款金额", attrName = "repayAmount", align = Align.CENTER, sort = 50),
             @ExcelField(title = "还款时间", attrName = "repayTime", align = Align.CENTER, sort = 60, dataFormat = "yyyy-MM-dd hh:mm"),
             @ExcelField(title = "备注说明", attrName = "remark", align = Align.CENTER, sort = 70),

web-api/src/main/java/com/jeesite/modules/erp/entity/ErpDebts.java

@@ -39,6 +39,7 @@ import java.io.Serial;
         @Column(name = "remaining", attrName = "remaining", label = "未还金额", isQuery = false, isUpdateForce = true),
         @Column(name = "end_time", attrName = "endTime", label = "结清时间", isQuery = false, isUpdateForce = true),
         @Column(name = "ustatus", attrName = "ustatus", label = "状态"),
+        @Column(name = "remark", attrName = "remark", label = "交易备注", isQuery = false),
 }, orderBy = "a.create_time DESC"
 )
 @Data
@@ -54,6 +55,7 @@ public class ErpDebts extends DataEntity<ErpDebts> implements Serializable {
     private BigDecimal remaining;        // 未还金额
     private Date endTime;        // 结清时间
     private String ustatus;        // 状态
+    private String remark;
 
     @ExcelFields({
             @ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),

web-api/src/main/java/com/jeesite/modules/erp/entity/ErpExpense.java

@@ -34,6 +34,8 @@ import java.io.Serial;
         @Column(name = "category_id", attrName = "categoryId", label = "支出分类"),
         @Column(name = "amount", attrName = "amount", label = "交易金额", isQuery = false),
         @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
+        @Column(name = "is_recorded", attrName = "isRecorded", label = "是否记账"),
+        @Column(name = "remark", attrName = "remark", label = "交易备注", isQuery = false),
 }, joinTable = {
         @JoinTable(type = Type.LEFT_JOIN, entity = ErpAccount.class, alias = "b",
                 on = "a.account_id = b.account_id", attrName = "this",
@@ -60,6 +62,8 @@ public class ErpExpense extends DataEntity<ErpExpense> implements Serializable {
     private String categoryId;        // 支出分类
     private BigDecimal amount;        // 交易金额
     private Date updateTime;        // 更新时间
+    private String isRecorded;
+    private String remark;
 
     private String accountName;
 

web-api/src/main/java/com/jeesite/modules/erp/entity/ErpIncome.java

@@ -39,6 +39,8 @@ import java.io.Serial;
         @Column(name = "category_id", attrName = "categoryId", label = "收入分类"),
         @Column(name = "amount", attrName = "amount", label = "交易金额", isQuery = false),
         @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
+        @Column(name = "is_recorded", attrName = "isRecorded", label = "是否记账"),
+        @Column(name = "remark", attrName = "remark", label = "交易备注", isQuery = false),
 }, joinTable = {
         @JoinTable(type = Type.LEFT_JOIN, entity = ErpAccount.class, alias = "b",
                 on = "a.account_id = b.account_id", attrName = "this",
@@ -65,6 +67,8 @@ public class ErpIncome extends DataEntity<ErpIncome> implements Serializable {
     private String categoryId;        // 收入分类
     private BigDecimal amount;        // 交易金额
     private Date updateTime;        // 更新时间
+    private String isRecorded;
+    private String remark;
 
     private String accountName;
 

web-api/src/main/java/com/jeesite/modules/erp/entity/ErpTransactionFlow.java

@@ -42,6 +42,8 @@ import java.io.Serial;
         @Column(name = "remark", attrName = "remark", label = "交易备注", isQuery = false),
         @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
         @Column(name = "business_id", attrName = "businessId", label = "业务标识"),
+        @Column(name = "year_date", attrName = "yearDate", label = "业务标识"),
+        @Column(name = "month_date", attrName = "monthDate", label = "业务标识"),
 }, joinTable = {
         @JoinTable(type = Type.LEFT_JOIN, entity = ErpAccount.class, alias = "b",
                 on = "a.account_id = b.account_id", attrName = "this",
@@ -72,6 +74,8 @@ public class ErpTransactionFlow extends DataEntity<ErpTransactionFlow> implement
     private String remark;        // 交易备注
     private Date updateTime;        // 更新时间
     private String businessId;        // 业务标识
+    private String yearDate;
+    private String monthDate;
 
     private String accountName;
 

web-api/src/main/java/com/jeesite/modules/erp/web/ErpAccountTransferController.java

@@ -1,6 +1,11 @@
 package com.jeesite.modules.erp.web;
 
+
 import java.util.List;
+
+import com.jeesite.modules.apps.Service.erpFlowService;
+import com.jeesite.modules.erp.entity.*;
+import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -21,11 +26,11 @@ import com.jeesite.common.utils.excel.ExcelExport;
 import com.jeesite.common.utils.excel.annotation.ExcelField.Type;
 import org.springframework.web.multipart.MultipartFile;
 import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.erp.entity.ErpAccountTransfer;
 import com.jeesite.modules.erp.service.ErpAccountTransferService;
 
 /**
  * 转账明细表 Controller
+ *
  * @author gaoxq
  * @version 2026-03-22
  */
@@ -33,6 +38,9 @@ import com.jeesite.modules.erp.service.ErpAccountTransferService;
 @RequestMapping(value = "${adminPath}/erp/accountTransfer")
 public class ErpAccountTransferController extends BaseController {
 
+	@Resource
+	private erpFlowService flowService;
+
     private final ErpAccountTransferService erpAccountTransferService;
 
     public ErpAccountTransferController(ErpAccountTransferService erpAccountTransferService) {
@@ -143,4 +151,18 @@ public class ErpAccountTransferController extends BaseController {
         return renderResult(Global.TRUE, text("删除转账成功！"));
     }
 
+
+    /**
+     * 记账数据
+     */
+    @RequestMapping(value = "recorded")
+    @ResponseBody
+    public String recorded(ErpAccountTransfer erpAccountTransfer) {
+        ErpAccountTransfer accountTransfer = erpAccountTransferService.get(erpAccountTransfer);
+        accountTransfer.setTransferStatus("1");
+        erpAccountTransferService.save(accountTransfer);
+		flowService.accountTran(accountTransfer);
+        return renderResult(Global.TRUE, text("记账转账成功！"));
+    }
+
 }

web-api/src/main/java/com/jeesite/modules/erp/web/ErpDebtRecordsController.java

@@ -1,6 +1,10 @@
 package com.jeesite.modules.erp.web;
 
 import java.util.List;
+
+import com.jeesite.modules.apps.Service.erpFlowService;
+import com.jeesite.modules.erp.entity.ErpExpense;
+import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -33,6 +37,9 @@ import com.jeesite.modules.erp.service.ErpDebtRecordsService;
 @RequestMapping(value = "${adminPath}/erp/debtRecords")
 public class ErpDebtRecordsController extends BaseController {
 
+	@Resource
+	private erpFlowService flowService;
+
 	private final ErpDebtRecordsService erpDebtRecordsService;
 
 	public ErpDebtRecordsController(ErpDebtRecordsService erpDebtRecordsService) {
@@ -143,4 +150,17 @@ public class ErpDebtRecordsController extends BaseController {
 		return renderResult(Global.TRUE, text("删除借贷明细成功！"));
 	}
 
+
+	/**
+	 * 记账数据
+	 */
+	@RequestMapping(value = "recorded")
+	@ResponseBody
+	public String recorded(ErpDebtRecords erpDebtRecords) {
+		ErpDebtRecords debtRecords = erpDebtRecordsService.get(erpDebtRecords);
+		debtRecords.setIsRecorded("1");
+		erpDebtRecordsService.save(debtRecords);
+		flowService.addDebt(debtRecords);
+		return renderResult(Global.TRUE, text("记账支出成功！"));
+	}
 }

web-api/src/main/java/com/jeesite/modules/erp/web/ErpExpenseController.java

@@ -1,6 +1,11 @@
 package com.jeesite.modules.erp.web;
 
 import java.util.List;
+
+
+import com.jeesite.modules.apps.Service.erpFlowService;
+import com.jeesite.modules.erp.entity.*;
+import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -15,17 +20,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.jeesite.common.config.Global;
 import com.jeesite.common.collect.ListUtils;
-import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.DateUtils;
+import com.jeesite.common.entity.Page;
 import com.jeesite.common.utils.excel.ExcelExport;
 import com.jeesite.common.utils.excel.annotation.ExcelField.Type;
 import org.springframework.web.multipart.MultipartFile;
 import com.jeesite.common.web.BaseController;
-import com.jeesite.modules.erp.entity.ErpExpense;
 import com.jeesite.modules.erp.service.ErpExpenseService;
 
 /**
  * 支出明细表 Controller
+ *
  * @author gaoxq
  * @version 2026-03-22
  */
@@ -33,6 +38,9 @@ import com.jeesite.modules.erp.service.ErpExpenseService;
 @RequestMapping(value = "${adminPath}/erp/expense")
 public class ErpExpenseController extends BaseController {
 
+	@Resource
+    private erpFlowService flowService;
+
     private final ErpExpenseService erpExpenseService;
 
     public ErpExpenseController(ErpExpenseService erpExpenseService) {
@@ -143,4 +151,16 @@ public class ErpExpenseController extends BaseController {
         return renderResult(Global.TRUE, text("删除支出成功！"));
     }
 
+    /**
+     * 记账数据
+     */
+    @RequestMapping(value = "recorded")
+    @ResponseBody
+    public String recorded(ErpExpense erpExpense) {
+        ErpExpense expense = erpExpenseService.get(erpExpense);
+        expense.setIsRecorded("1");
+        erpExpenseService.save(expense);
+        flowService.addExpense(expense);
+        return renderResult(Global.TRUE, text("记账支出成功！"));
+    }
 }

web-api/src/main/java/com/jeesite/modules/erp/web/ErpIncomeController.java

@@ -1,6 +1,9 @@
 package com.jeesite.modules.erp.web;
 
 import java.util.List;
+
+import com.jeesite.modules.apps.Service.erpFlowService;
+import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -26,6 +29,7 @@ import com.jeesite.modules.erp.service.ErpIncomeService;
 
 /**
  * 收入明细表 Controller
+ *
  * @author gaoxq
  * @version 2026-03-22
  */
@@ -33,6 +37,9 @@ import com.jeesite.modules.erp.service.ErpIncomeService;
 @RequestMapping(value = "${adminPath}/erp/income")
 public class ErpIncomeController extends BaseController {
 
+    @Resource
+    private erpFlowService flowService;
+
     private final ErpIncomeService erpIncomeService;
 
     public ErpIncomeController(ErpIncomeService erpIncomeService) {
@@ -143,4 +150,16 @@ public class ErpIncomeController extends BaseController {
         return renderResult(Global.TRUE, text("删除收入成功！"));
     }
 
+    /**
+     * 记账数据
+     */
+    @RequestMapping(value = "recorded")
+    @ResponseBody
+    public String recorded(ErpIncome erpIncome) {
+        ErpIncome income = erpIncomeService.get(erpIncome);
+		income.setIsRecorded("1");
+		erpIncomeService.save(income);
+        flowService.addIncome(income);
+        return renderResult(Global.TRUE, text("记账收入成功！"));
+    }
 }

web-api/src/main/java/com/jeesite/modules/utils/BigDecimalUtils.java

@@ -0,0 +1,54 @@
+package com.jeesite.modules.utils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+public class BigDecimalUtils {
+
+    private static final int SCALE = 2;
+    private static final RoundingMode ROUND_MODE = RoundingMode.HALF_UP;
+
+    /**
+     * 加
+     */
+    public static BigDecimal add(BigDecimal num1, BigDecimal num2) {
+        num1 = defaultIfNull(num1);
+        num2 = defaultIfNull(num2);
+        return num1.add(num2);
+    }
+
+    /**
+     * 减
+     */
+    public static BigDecimal subtract(BigDecimal num1, BigDecimal num2) {
+        num1 = defaultIfNull(num1);
+        num2 = defaultIfNull(num2);
+        return num1.subtract(num2);
+    }
+
+    /**
+     * 乘
+     */
+    public static BigDecimal multiply(BigDecimal num1, BigDecimal num2) {
+        num1 = defaultIfNull(num1);
+        num2 = defaultIfNull(num2);
+        return num1.multiply(num2).setScale(SCALE, ROUND_MODE);
+    }
+
+    /**
+     * 除
+     */
+    public static BigDecimal divide(BigDecimal num1, BigDecimal num2) {
+        num1 = defaultIfNull(num1);
+        num2 = defaultIfNull(num2);
+
+        if (num2.compareTo(BigDecimal.ZERO) == 0) {
+            return BigDecimal.ZERO;
+        }
+        return num1.divide(num2, SCALE, ROUND_MODE);
+    }
+
+    private static BigDecimal defaultIfNull(BigDecimal num) {
+        return num == null ? BigDecimal.ZERO : num;
+    }
+}

web-api/src/main/java/com/jeesite/modules/utils/DateUtils.java

@@ -1,7 +1,10 @@
 package com.jeesite.modules.utils;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 
 public class DateUtils {
     private static final DateTimeFormatter MONTH_FORMATTER = DateTimeFormatter.ofPattern("MM");
@@ -12,7 +15,6 @@ public class DateUtils {
     private static final DateTimeFormatter SHORT_YEAR_MONTH_CN_FORMATTER = DateTimeFormatter.ofPattern("yy年MM月");
 
 
-
     public static String dsValue() {
         LocalDate currentDate = LocalDate.now();
         return currentDate.format(DATE_FORMATTER);
@@ -50,4 +52,20 @@ public class DateUtils {
     public static String getMonth(LocalDate date) {
         return date.format(MONTH_FORMATTER);
     }
+
+    public static String getYear(Date date) {
+        return getYear(dateToLocalDate(date));
+    }
+
+    public static String getMonth(Date date) {
+        return getMonth(dateToLocalDate(date));
+    }
+
+    public static String getDate(String pattern) {
+        return new SimpleDateFormat(pattern).format(new Date());
+    }
+
+    public static LocalDate dateToLocalDate(Date date) {
+        return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+    }
 }

web-vue/packages/core/components/ListSelect/src/selectType/erpDebtSelect.ts

@@ -1,6 +1,6 @@
 import { useI18n } from '@jeesite/core/hooks/web/useI18n';
 import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { erpDebtsListData } from '@jeesite/erp/api/erp/debts';
+import { ErpDebts, erpDebtsListData } from '@jeesite/erp/api/erp/debts';
 
 const { t } = useI18n('erp.debts');
 
@@ -13,19 +13,27 @@ const searchForm: FormProps<ErpDebts> = {
   labelWidth: 90,
   schemas: [
 	{
-      label: t('负债类型'),
+	  label: t('借贷名称'),
-      field: 'debtType',
-      component: 'Input',
-    },
-    {
-      label: t('对方名称'),
 	  field: 'debtName',
 	  component: 'Input',
 	},
     {
-      label: t('状态'),
+      label: t('负债类型'),
+      field: 'debtType',
+		component: 'Select',
+		componentProps: {
+		  dictType: 'debt_type',
+		  allowClear: true,
+		},
+    },
+    {
+      label: t('借贷状态'),
       field: 'ustatus',
-      component: 'Input',
+		component: 'Select',
+		componentProps: {
+		  dictType: 'debt_status',
+		  allowClear: true,
+		},
     },
   ],
 };
@@ -36,9 +44,9 @@ const tableColumns: BasicColumn<ErpDebts>[] = [
     dataIndex: 'createTime',
     key: 'a.create_time',
     sorter: true,
-    width: 230,
+    width: 150,
-    align: 'left',
+    align: 'center',
-    slot: 'firstColumn',
+    fixed: 'left',
   },
   {
     title: t('负债类型'),
@@ -47,9 +55,10 @@ const tableColumns: BasicColumn<ErpDebts>[] = [
     sorter: true,
     width: 130,
     align: 'left',
+	dictType: 'debt_type',
   },
   {
-    title: t('对方名称'),
+    title: t('借贷名称'),
     dataIndex: 'debtName',
     key: 'a.debt_name',
     sorter: true,
@@ -72,14 +81,6 @@ const tableColumns: BasicColumn<ErpDebts>[] = [
     width: 130,
     align: 'right',
   },
-  {
-    title: t('结清时间'),
-    dataIndex: 'endTime',
-    key: 'a.end_time',
-    sorter: true,
-    width: 130,
-    align: 'center',
-  },
   {
     title: t('状态'),
     dataIndex: 'ustatus',
@@ -87,6 +88,7 @@ const tableColumns: BasicColumn<ErpDebts>[] = [
     sorter: true,
     width: 130,
     align: 'left',
+	dictType: 'debt_status',
   },
 ];
 
@@ -105,6 +107,6 @@ export default {
   modalProps,
   tableProps,
   itemCode: 'debtId',
-  itemName: 'debtId',
+  itemName: 'debtName',
-  isShowCode: false,
+  isShowCode: true,
 };

web-vue/packages/erp/api/erp/accountTransfer.ts

@@ -50,3 +50,7 @@ export const erpAccountTransferImportData = (
 
 export const erpAccountTransferDelete = (params?: ErpAccountTransfer | any) =>
   defHttp.get<ErpAccountTransfer>({ url: adminPath + '/erp/accountTransfer/delete', params });
+
+export const erpAccountTransferRecorded = (params?: ErpAccountTransfer | any) =>
+  defHttp.get<ErpAccountTransfer>({ url: adminPath + '/erp/accountTransfer/recorded', params });
+

web-vue/packages/erp/api/erp/debtRecords.ts

@@ -19,6 +19,7 @@ export interface ErpDebtRecords extends BasicModel<ErpDebtRecords> {
   accountId: string; // 账户标识
   repayAmount: number; // 还款金额
   repayTime?: string; // 还款时间
+  categoryId?: string; // 分类标识
   remark?: string; // 备注说明
 }
 
@@ -48,3 +49,7 @@ export const erpDebtRecordsImportData = (
 
 export const erpDebtRecordsDelete = (params?: ErpDebtRecords | any) =>
   defHttp.get<ErpDebtRecords>({ url: adminPath + '/erp/debtRecords/delete', params });
+
+export const erpDebtRecordsRecorded = (params?: ErpDebtRecords | any) =>
+  defHttp.get<ErpDebtRecords>({ url: adminPath + '/erp/debtRecords/recorded', params });
+

web-vue/packages/erp/api/erp/debts.ts

@@ -18,9 +18,10 @@ export interface ErpDebts extends BasicModel<ErpDebts> {
   debtType: string; // 负债类型
   debtName: string; // 对方名称
   debtAmount: number; // 借贷金额
-  remaining?: number; // 未还金额
+  remaining?: number; // 已还金额
   endTime?: string; // 结清时间
   ustatus: string; // 状态
+  remark?: string; // 交易备注
 }
 
 export const erpDebtsList = (params?: ErpDebts | any) =>

web-vue/packages/erp/api/erp/expense.ts

@@ -20,6 +20,7 @@ export interface ErpExpense extends BasicModel<ErpExpense> {
   categoryId: string; // 支出分类
   amount: number; // 交易金额
   updateTime?: string; // 更新时间
+  remark?: string; // 交易备注
 }
 
 export const erpExpenseList = (params?: ErpExpense | any) =>
@@ -48,3 +49,6 @@ export const erpExpenseImportData = (
 
 export const erpExpenseDelete = (params?: ErpExpense | any) =>
   defHttp.get<ErpExpense>({ url: adminPath + '/erp/expense/delete', params });
+
+export const erpExpenseRecorded = (params?: ErpExpense | any) =>
+  defHttp.get<ErpExpense>({ url: adminPath + '/erp/expense/recorded', params });

web-vue/packages/erp/api/erp/income.ts

@@ -20,6 +20,7 @@ export interface ErpIncome extends BasicModel<ErpIncome> {
   categoryId: string; // 收入分类
   amount: number; // 交易金额
   updateTime?: string; // 更新时间
+  remark?: string; // 交易备注
 }
 
 export const erpIncomeList = (params?: ErpIncome | any) =>
@@ -48,3 +49,6 @@ export const erpIncomeImportData = (
 
 export const erpIncomeDelete = (params?: ErpIncome | any) =>
   defHttp.get<ErpIncome>({ url: adminPath + '/erp/income/delete', params });
+
+export const erpIncomeRecorded = (params?: ErpIncome | any) =>
+  defHttp.get<ErpIncome>({ url: adminPath + '/erp/income/recorded', params });

web-vue/packages/erp/views/erp/account/list.vue

@@ -178,6 +178,7 @@
           confirm: handleDelete.bind(this, record),
         },
         auth: 'erp:account:edit',
+		ifShow: record.isActive == '0'
       },
     ],
   };

web-vue/packages/erp/views/erp/accountTransfer/list.vue

@@ -38,7 +38,7 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
   import { ErpAccountTransfer, erpAccountTransferList } from '@jeesite/erp/api/erp/accountTransfer';
-  import { erpAccountTransferDelete, erpAccountTransferListData } from '@jeesite/erp/api/erp/accountTransfer';
+  import { erpAccountTransferDelete, erpAccountTransferRecorded, erpAccountTransferListData } from '@jeesite/erp/api/erp/accountTransfer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -206,6 +206,7 @@
         title: t('编辑'),
         onClick: handleForm.bind(this, { transferId: record.transferId }),
         auth: 'erp:accountTransfer:edit',
+		ifShow: record.transferStatus == '0'
       },
       {
         icon: 'i-ant-design:delete-outlined',
@@ -216,6 +217,18 @@
           confirm: handleDelete.bind(this, record),
         },
         auth: 'erp:accountTransfer:edit',
+		ifShow: record.transferStatus == '0'
+      },
+	  {
+	    icon: 'ant-design:check-outlined',
+	    color: 'warning',
+	    title: t('记账'),
+	    popConfirm: {
+	      title: t('是否确认记账?'),
+	      confirm: handleRecorded.bind(this, record),
+	    },
+	    auth: 'erp:income:edit',
+	  	ifShow: record.transferStatus == '0'
 	  },
     ],
   };
@@ -262,6 +275,13 @@
     await handleSuccess(record);
   }
   
+  async function handleRecorded(record: Recordable) {
+    const params = { transferId: record.transferId };
+    const res = await erpAccountTransferRecorded(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }
+
   async function handleSuccess(record: Recordable) {
     await reload({ record });
   }

web-vue/packages/erp/views/erp/budgets/form.vue

@@ -1,149 +0,0 @@
-<!--
- * Copyright (c) 2013-Now https://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * @author gaoxq
--->
-<template>
-  <BasicDrawer
-    v-bind="$attrs"
-    :showFooter="true"
-    :okAuth="'erp:budgets:edit'"
-    @register="registerDrawer"
-    @ok="handleSubmit"
-    width="70%"
-  >
-    <template #title>
-      <Icon :icon="getTitle.icon" class="m-1 pr-1" />
-      <span> {{ getTitle.value }} </span>
-    </template>
-    <BasicForm @register="registerForm" />
-  </BasicDrawer>
-</template>
-<script lang="ts" setup name="ViewsErpBudgetsForm">
-  import { ref, unref, computed } from 'vue';
-  import { useI18n } from '@jeesite/core/hooks/web/useI18n';
-  import { useMessage } from '@jeesite/core/hooks/web/useMessage';
-  import { router } from '@jeesite/core/router';
-  import { Icon } from '@jeesite/core/components/Icon';
-  import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
-  import { ErpBudgets, erpBudgetsSave, erpBudgetsForm } from '@jeesite/erp/api/erp/budgets';
-  import { formatToDateTime } from '@jeesite/core/utils/dateUtil';
-
-  const emit = defineEmits(['success', 'register']);
-
-  const { t } = useI18n('erp.budgets');
-  const { showMessage } = useMessage();
-  const { meta } = unref(router.currentRoute);
-  const record = ref<ErpBudgets>({} as ErpBudgets);
-
-  const getTitle = computed(() => ({
-    icon: meta.icon || 'i-ant-design:book-outlined',
-    value: record.value.isNewRecord ? t('新增预算') : t('编辑预算'),
-  }));
-
-  const inputFormSchemas: FormSchema<ErpBudgets>[] = [
-    {
-      label: t('基本信息'),
-      field: 'basicInfo',
-      component: 'FormGroup',
-      colProps: { md: 24, lg: 24 },
-    },
-    {
-      label: t('分类标识'),
-      field: 'categoryId',
-      component: 'Input',
-      componentProps: {
-        maxlength: 52,
-      },
-      required: true,
-    },
-    {
-      label: t('预算年月'),
-      field: 'budgetMonth',
-      component: 'Input',
-      componentProps: {
-        maxlength: 10,
-      },
-      required: true,
-    },
-    {
-      label: t('预算金额'),
-      field: 'budgetAmount',
-      component: 'Input',
-      componentProps: {
-        maxlength: 18,
-      },
-      required: true,
-    },
-    {
-      label: t('使用金额'),
-      field: 'usedAmount',
-      component: 'Input',
-      componentProps: {
-        maxlength: 18,
-      },
-      required: true,
-    },
-    {
-      label: t('预算占比'),
-      field: 'usedRatio',
-      component: 'Input',
-      componentProps: {
-        maxlength: 8,
-      },
-      required: true,
-    },
-    {
-      label: t('超支金额'),
-      field: 'overAmount',
-      component: 'Input',
-      componentProps: {
-        maxlength: 18,
-      },
-      required: true,
-    },
-  ];
-
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpBudgets>({
-    labelWidth: 120,
-    schemas: inputFormSchemas,
-    baseColProps: { md: 24, lg: 12 },
-  });
-
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
-    await resetFields();
-    const res = await erpBudgetsForm(data);
-    record.value = (res.erpBudgets || {}) as ErpBudgets;
-    record.value.__t = new Date().getTime();
-    await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
-  });
-
-  async function handleSubmit() {
-    try {
-      const data = await validate();
-      setDrawerProps({ confirmLoading: true });
-      const params: any = {
-        isNewRecord: record.value.isNewRecord,
-        budgetId: record.value.budgetId || data.budgetId,
-      };
-	  
-	  data[record.value.isNewRecord ? 'createTime' : 'updateTime'] = formatToDateTime(new Date());
-	  
-      // console.log('submit', params, data, record);
-      const res = await erpBudgetsSave(params, data);
-      showMessage(res.message);
-      setTimeout(closeDrawer);
-      emit('success', data);
-    } catch (error: any) {
-      if (error && error.errorFields) {
-        showMessage(error.message || t('common.validateError'));
-      }
-      console.log('error', error);
-    } finally {
-      setDrawerProps({ confirmLoading: false });
-    }
-  }
-</script>

web-vue/packages/erp/views/erp/budgets/list.vue

@@ -14,17 +14,9 @@
         <a-button type="default" :loading="loading" @click="handleExport()">
           <Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
         </a-button>
-        <a-button type="primary" @click="handleForm({})" v-auth="'erp:budgets:edit'">
-          <Icon icon="i-fluent:add-12-filled" /> {{ t('新增') }}
-        </a-button>
-      </template>
-      <template #bizScopeKey="{ record, text, value }">
-        <a @click="handleForm({ budgetId: record.budgetId })" :title="value">
-          {{ text }}
-        </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts" setup name="ViewsErpBudgetsList">
@@ -37,11 +29,10 @@
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpBudgets, erpBudgetsList } from '@jeesite/erp/api/erp/budgets';
+  import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
   import { erpBudgetsDelete, erpBudgetsListData } from '@jeesite/erp/api/erp/budgets';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
-  import InputForm from './form.vue';
 
   const { t } = useI18n('erp.budgets');
   const { showMessage } = useMessage();
@@ -59,27 +50,30 @@
     labelWidth: 90,
     schemas: [
       {
-        label: t('记录时间起'),
+        label: t('预算年月'),
-        field: 'createTime_gte',
+        field: 'budgetMonth',
-        component: 'DatePicker',
+        component: 'MonthPicker',
         componentProps: {
-          format: 'YYYY-MM-DD HH:mm',
+          format: 'YYYY-MM',
-          showTime: { format: 'HH:mm' },
+          valueFormat: 'YYYY-MM',
         },
       },
       {
-        label: t('记录时间止'),
+        label: t('预算金额'),
-        field: 'createTime_lte',
+        field: 'budgetAmount',
-        component: 'DatePicker',
+        component: 'InputNumber',
-        componentProps: {
-          format: 'YYYY-MM-DD HH:mm',
-          showTime: { format: 'HH:mm' },
-        },
       },
       {
-        label: t('分类标识'),
+        label: t('分类名称'),
         field: 'categoryId',
-        component: 'Input',
+		component: 'Select',
+		componentProps: {
+			api: erpCategoryListAll,
+			params: {
+				categoryType: '1'
+			},
+			fieldNames: { label: 'categoryName', value: 'categoryId' },
+		},
       },
     ],
   };
@@ -90,18 +84,25 @@
       dataIndex: 'createTime',
       key: 'a.create_time',
       sorter: true,
-      width: 230,
+      width: 150,
-      align: 'left',
+      align: 'center',
-      slot: 'firstColumn',
+	  fixed: 'left',
     },
     {
-      title: t('分类标识'),
+      title: t('父级分类'),
-      dataIndex: 'categoryId',
+      dataIndex: 'parentName',
-      key: 'a.category_id',
+      key: 'b.parent_name',
+      sorter: true,
+      width: 130,
+      align: 'left',
+    },
+	{
+	  title: t('分类名称'),
+	  dataIndex: 'categoryName',
+	  key: 'b.category_name',
 	  sorter: true,
 	  width: 130,
 	  align: 'left',
-	  slot: 'bizScopeKey',
 	},
     {
       title: t('预算年月'),
@@ -148,20 +149,15 @@
       dataIndex: 'updateTime',
       key: 'a.update_time',
       sorter: true,
-      width: 130,
+      width: 150,
       align: 'center',
     },
   ];
 
   const actionColumn: BasicColumn<ErpBudgets> = {
-    width: 160,
+    width: 120,
+	align: 'center',
     actions: (record: ErpBudgets) => [
-      {
-        icon: 'i-clarity:note-edit-line',
-        title: t('编辑'),
-        onClick: handleForm.bind(this, { budgetId: record.budgetId }),
-        auth: 'erp:budgets:edit',
-      },
       {
         icon: 'i-ant-design:delete-outlined',
         color: 'error',
@@ -194,12 +190,6 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
-
-  function handleForm(record: Recordable) {
-    openDrawer(true, record);
-  }
-
   async function handleExport() {
     loading.value = true;
     const { ctxAdminPath } = useGlobSetting();

web-vue/packages/erp/views/erp/category/list.vue

@@ -165,6 +165,7 @@
           confirm: handleDelete.bind(this, record),
         },
         auth: 'erp:category:edit',
+		ifShow: record.isActive == '0'
       },
     ],
   };

web-vue/packages/erp/views/erp/debtRecords/form.vue

@@ -4,11 +4,11 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'erp:debtRecords:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
     width="70%"
   >
@@ -17,7 +17,7 @@
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsErpDebtRecordsForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,8 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
+  import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
   import { ErpDebtRecords, erpDebtRecordsSave, erpDebtRecordsForm } from '@jeesite/erp/api/erp/debtRecords';
   import { formatToDateTime } from '@jeesite/core/utils/dateUtil';
 
@@ -50,27 +51,42 @@
       colProps: { md: 24, lg: 24 },
     },
     {
-      label: t('负债标识'),
+      label: t('负债名称'),
       field: 'debtId',
-      component: 'Input',
+	  fieldLabel: 'debtName',
+	  component: 'ListSelect',
 	  componentProps: {
-        maxlength: 52,
+	    selectType: 'erpDebtSelect',
 	  },
       required: true,
     },
     {
       label: t('账户标识'),
       field: 'accountId',
-      component: 'Input',
+	  fieldLabel: 'accountName',
+	  component: 'ListSelect',
 	  componentProps: {
-        maxlength: 52,
+	    selectType: 'erpAccountSelect',
+	  },
+      required: true,
+    },
+	{
+	  label: t('还款分类'),
+	  field: 'categoryId',
+	  component: 'Select',
+	  componentProps: {
+	  	api: erpCategoryListAll,
+	  	params: {
+	  		categoryType: '1'
+	  	},
+	  	fieldNames: { label: 'categoryName', value: 'categoryId' },
 	  },
 	  required: true,
 	},
     {
       label: t('还款金额'),
       field: 'repayAmount',
-      component: 'Input',
+      component: 'InputNumber',
       componentProps: {
         maxlength: 10,
       },
@@ -79,10 +95,11 @@
 	{
 	  label: t('备注说明'),
 	  field: 'remark',
-      component: 'Input',
+	  component: 'InputTextArea',
 	  componentProps: {
 	    maxlength: 200,
 	  },
+	  colProps: { md: 24, lg: 24 },
 	},
   ];
 
@@ -92,31 +109,31 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    setDrawerProps({ loading: true });
+    setModalProps({ loading: true });
     await resetFields();
     const res = await erpDebtRecordsForm(data);
     record.value = (res.erpDebtRecords || {}) as ErpDebtRecords;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         recordId: record.value.recordId || data.recordId,
       };
 	  
-	  data[record.value.isNewRecord ? 'createTime' : 'updateTime'] = formatToDateTime(new Date());
+	  data[record.value.isNewRecord ? 'createTime' : 'repayTime'] = formatToDateTime(new Date());
 	  
       // console.log('submit', params, data, record);
       const res = await erpDebtRecordsSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -124,7 +141,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>

web-vue/packages/erp/views/erp/debtRecords/list.vue

@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts" setup name="ViewsErpDebtRecordsList">
@@ -37,8 +37,7 @@
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpDebtRecords, erpDebtRecordsList } from '@jeesite/erp/api/erp/debtRecords';
-  import { erpDebtRecordsDelete, erpDebtRecordsListData } from '@jeesite/erp/api/erp/debtRecords';
+  import { erpDebtRecordsDelete, erpDebtRecordsRecorded, erpDebtRecordsListData } from '@jeesite/erp/api/erp/debtRecords';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -59,14 +58,22 @@
     labelWidth: 90,
     schemas: [
       {
-        label: t('负债标识'),
+        label: t('负债名称'),
         field: 'debtId',
-        component: 'Input',
+		fieldLabel: 'debtName',
+		component: 'ListSelect',
+		componentProps: {
+		  selectType: 'erpDebtSelect',
+		},
       },
       {
         label: t('账户标识'),
         field: 'accountId',
-        component: 'Input',
+		fieldLabel: 'accountName',
+		component: 'ListSelect',
+		componentProps: {
+		  selectType: 'erpAccountSelect',
+		},
       },
       {
         label: t('备注说明'),
@@ -82,23 +89,38 @@
       dataIndex: 'createTime',
       key: 'a.create_time',
       sorter: true,
-      width: 230,
+      width: 150,
-      align: 'left',
+      align: 'center',
-      slot: 'firstColumn',
+      fixed: 'left',
     },
     {
-      title: t('负债标识'),
+      title: t('账户名称'),
-      dataIndex: 'debtId',
+      dataIndex: 'accountName',
-      key: 'a.debt_id',
+      key: 'b.account_name',
       sorter: true,
       width: 130,
       align: 'left',
-	  slot: 'bizScopeKey',
     },
 	{
-      title: t('账户标识'),
+	  title: t('负债名称'),
-      dataIndex: 'accountId',
+	  dataIndex: 'debtName',
-      key: 'a.account_id',
+	  key: 'c.debt_name',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
+	{
+	  title: t('父级分类'),
+	  dataIndex: 'parentName',
+	  key: 'd.parent_name',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
+	{
+	  title: t('还款分类'),
+	  dataIndex: 'categoryName',
+	  key: 'd.category_name',
 	  sorter: true,
 	  width: 130,
 	  align: 'left',
@@ -116,27 +138,38 @@
       dataIndex: 'repayTime',
       key: 'a.repay_time',
       sorter: true,
-      width: 130,
+      width: 150,
       align: 'center',
     },
     {
-      title: t('备注说明'),
+      title: t('还款说明'),
       dataIndex: 'remark',
       key: 'a.remark',
       sorter: true,
       width: 130,
       align: 'left',
     },
+	{
+	  title: t('是否记账'),
+	  dataIndex: 'isRecorded',
+	  key: 'a.is_recorded',
+	  sorter: true,
+	  width: 120,
+	  align: 'right',
+	  dictType: 'is_recorded',
+	},
   ];
 
   const actionColumn: BasicColumn<ErpDebtRecords> = {
     width: 160,
+	align: 'center',
     actions: (record: ErpDebtRecords) => [
       {
         icon: 'i-clarity:note-edit-line',
         title: t('编辑'),
         onClick: handleForm.bind(this, { recordId: record.recordId }),
         auth: 'erp:debtRecords:edit',
+		ifShow: record.isRecorded == '0'
       },
       {
         icon: 'i-ant-design:delete-outlined',
@@ -147,6 +180,17 @@
           confirm: handleDelete.bind(this, record),
         },
         auth: 'erp:debtRecords:edit',
+		ifShow: record.isRecorded == '0'
+      },
+	  {
+	    icon: 'ant-design:check-outlined',
+	    color: 'warning',
+	    title: t('记账'),
+	    popConfirm: {
+	      title: t('是否确认记账?'),
+	      confirm: handleRecorded.bind(this, record),
+	    },
+	  	ifShow: record.isRecorded == '0'
 	  },
     ],
   };
@@ -170,10 +214,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
@@ -193,6 +237,13 @@
     await handleSuccess(record);
   }
   
+  async function handleRecorded(record: Recordable) {
+    const params = { recordId: record.recordId };
+    const res = await erpDebtRecordsRecorded(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }
+  
   async function handleSuccess(record: Recordable) {
     await reload({ record });
   }

web-vue/packages/erp/views/erp/debts/form.vue

@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'erp:debts:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsErpDebtsForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { ErpDebts, erpDebtsSave, erpDebtsForm } from '@jeesite/erp/api/erp/debts';
   import { formatToDateTime } from '@jeesite/core/utils/dateUtil';
 
@@ -50,16 +50,7 @@
       colProps: { md: 24, lg: 24 },
     },
 	{
-      label: t('负债类型'),
+	  label: t('借贷名称'),
-      field: 'debtType',
-      component: 'Input',
-      componentProps: {
-        maxlength: 12,
-      },
-      required: true,
-    },
-    {
-      label: t('对方名称'),
 	  field: 'debtName',
 	  component: 'Input',
 	  componentProps: {
@@ -67,24 +58,41 @@
 	  },
 	  required: true,
 	},
+    {
+      label: t('负债类型'),
+      field: 'debtType',
+	  component: 'Select',
+	  componentProps: {
+	    dictType: 'debt_type',
+	    allowClear: true,
+	  },
+      required: true,
+    },
     {
       label: t('借贷金额'),
       field: 'debtAmount',
-      component: 'Input',
+      component: 'InputNumber',
       componentProps: {
         maxlength: 10,
       },
       required: true,
     },
     {
-      label: t('状态'),
+      label: t('借贷状态'),
       field: 'ustatus',
-      component: 'Input',
+	  component: 'Select',
 	  componentProps: {
-        maxlength: 12,
+	    dictType: 'debt_status',
+	    allowClear: true,
 	  },
       required: true,
     },
+	{
+	  label: t('交易说明'),
+	  field: 'remark',
+	  component: 'InputTextArea',
+	  colProps: { md: 24, lg: 24 },
+	},
   ];
 
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpDebts>({
@@ -93,20 +101,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    setDrawerProps({ loading: true });
+    setModalProps({ loading: true });
     await resetFields();
     const res = await erpDebtsForm(data);
     record.value = (res.erpDebts || {}) as ErpDebts;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         debtId: record.value.debtId || data.debtId,
@@ -114,10 +122,10 @@
 	  
 	  data[record.value.isNewRecord ? 'createTime' : 'updateTime'] = formatToDateTime(new Date());
 	  
-      // console.log('submit', params, data, record);
+      console.log('submit', params, data, record);
       const res = await erpDebtsSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -125,7 +133,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>

web-vue/packages/erp/views/erp/debts/list.vue

@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts" setup name="ViewsErpDebtsList">
@@ -38,7 +38,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpDebts, erpDebtsList } from '@jeesite/erp/api/erp/debts';
   import { erpDebtsDelete, erpDebtsListData } from '@jeesite/erp/api/erp/debts';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -59,19 +58,27 @@
     labelWidth: 90,
     schemas: [
 	  {
-        label: t('负债类型'),
+	    label: t('借贷名称'),
-        field: 'debtType',
-        component: 'Input',
-      },
-      {
-        label: t('对方名称'),
 	    field: 'debtName',
 	    component: 'Input',
 	  },
       {
-        label: t('状态'),
+        label: t('负债类型'),
+        field: 'debtType',
+		component: 'Select',
+		componentProps: {
+		  dictType: 'debt_type',
+		  allowClear: true,
+		},
+      },
+      {
+        label: t('借贷状态'),
         field: 'ustatus',
-        component: 'Input',
+		component: 'Select',
+		componentProps: {
+		  dictType: 'debt_status',
+		  allowClear: true,
+		},
       },
     ],
   };
@@ -82,9 +89,9 @@
       dataIndex: 'createTime',
       key: 'a.create_time',
       sorter: true,
-      width: 230,
+      width: 150,
-      align: 'left',
+      align: 'center',
-      slot: 'firstColumn',
+	  fixed: 'left',
     },
     {
       title: t('负债类型'),
@@ -93,9 +100,10 @@
       sorter: true,
       width: 130,
       align: 'left',
+	  dictType: 'debt_type',
     },
     {
-      title: t('对方名称'),
+      title: t('借贷名称'),
       dataIndex: 'debtName',
       key: 'a.debt_name',
       sorter: true,
@@ -112,7 +120,7 @@
       align: 'right',
     },
     {
-      title: t('未还金额'),
+      title: t('已还金额'),
       dataIndex: 'remaining',
       key: 'a.remaining',
       sorter: true,
@@ -124,7 +132,7 @@
       dataIndex: 'endTime',
       key: 'a.end_time',
       sorter: true,
-      width: 130,
+      width: 150,
       align: 'center',
     },
     {
@@ -134,11 +142,13 @@
       sorter: true,
       width: 130,
       align: 'left',
+	  dictType: 'debt_status',
     },
   ];
 
   const actionColumn: BasicColumn<ErpDebts> = {
     width: 160,
+	align: 'center',
     actions: (record: ErpDebts) => [
       {
         icon: 'i-clarity:note-edit-line',
@@ -178,10 +188,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {

web-vue/packages/erp/views/erp/expense/form.vue

@@ -91,6 +91,12 @@
       },
       required: true,
     },
+	{
+	  label: t('交易说明'),
+	  field: 'remark',
+	  component: 'InputTextArea',
+	  colProps: { md: 24, lg: 24 },
+	},
   ];
 
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpExpense>({

web-vue/packages/erp/views/erp/expense/list.vue

@@ -38,7 +38,7 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpExpense, erpExpenseList } from '@jeesite/erp/api/erp/expense';
   import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
-  import { erpExpenseDelete, erpExpenseListData } from '@jeesite/erp/api/erp/expense';
+  import { erpExpenseDelete, erpExpenseRecorded, erpExpenseListData } from '@jeesite/erp/api/erp/expense';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -146,6 +146,23 @@
       width: 150,
       align: 'center',
     },
+	{
+	  title: t('交易说明'),
+	  dataIndex: 'remark',
+	  key: 'a.remark',
+	  sorter: true,
+	  width: 130,
+	  align: 'right',
+	},
+	{
+	  title: t('是否记账'),
+	  dataIndex: 'isRecorded',
+	  key: 'a.is_recorded',
+	  sorter: true,
+	  width: 120,
+	  align: 'right',
+	  dictType: 'is_recorded',
+	},
   ];
 
   const actionColumn: BasicColumn<ErpExpense> = {
@@ -157,6 +174,7 @@
         title: t('编辑'),
         onClick: handleForm.bind(this, { expenseId: record.expenseId }),
         auth: 'erp:expense:edit',
+		ifShow: record.isRecorded == '0'
       },
       {
         icon: 'i-ant-design:delete-outlined',
@@ -167,6 +185,17 @@
           confirm: handleDelete.bind(this, record),
         },
         auth: 'erp:expense:edit',
+		ifShow: record.isRecorded == '0'
+      },
+	  {
+	    icon: 'ant-design:check-outlined',
+	    color: 'warning',
+	    title: t('记账'),
+	    popConfirm: {
+	      title: t('是否确认记账?'),
+	      confirm: handleRecorded.bind(this, record),
+	    },
+	  	ifShow: record.isRecorded == '0'
 	  },
     ],
   };
@@ -213,6 +242,13 @@
     await handleSuccess(record);
   }
   
+  async function handleRecorded(record: Recordable) {
+    const params = { expenseId: record.expenseId };
+    const res = await erpExpenseRecorded(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }
+  
   async function handleSuccess(record: Recordable) {
     await reload({ record });
   }

web-vue/packages/erp/views/erp/income/form.vue

@@ -91,6 +91,12 @@
       },
       required: true,
     },
+	{
+	  label: t('交易说明'),
+	  field: 'remark',
+	  component: 'InputTextArea',
+	  colProps: { md: 24, lg: 24 },
+	},
   ];
 
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<ErpIncome>({

web-vue/packages/erp/views/erp/income/list.vue

@@ -38,7 +38,7 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpIncome, erpIncomeList } from '@jeesite/erp/api/erp/income';
   import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
-  import { erpIncomeDelete, erpIncomeListData } from '@jeesite/erp/api/erp/income';
+  import { erpIncomeDelete, erpIncomeRecorded, erpIncomeListData } from '@jeesite/erp/api/erp/income';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -146,6 +146,23 @@
       width: 150,
       align: 'center',
     },
+	{
+	  title: t('交易说明'),
+	  dataIndex: 'remark',
+	  key: 'a.remark',
+	  sorter: true,
+	  width: 130,
+	  align: 'right',
+	},
+	{
+	  title: t('是否记账'),
+	  dataIndex: 'isRecorded',
+	  key: 'a.is_recorded',
+	  sorter: true,
+	  width: 120,
+	  align: 'right',
+	  dictType: 'is_recorded',
+	},
   ];
 
   const actionColumn: BasicColumn<ErpIncome> = {
@@ -157,6 +174,7 @@
         title: t('编辑'),
         onClick: handleForm.bind(this, { incomeId: record.incomeId }),
         auth: 'erp:income:edit',
+		ifShow: record.isRecorded == '0'
       },
       {
         icon: 'i-ant-design:delete-outlined',
@@ -167,6 +185,18 @@
           confirm: handleDelete.bind(this, record),
         },
         auth: 'erp:income:edit',
+		ifShow: record.isRecorded == '0'
+      },
+	  {
+	    icon: 'ant-design:check-outlined',
+	    color: 'warning',
+	    title: t('记账'),
+	    popConfirm: {
+	      title: t('是否确认记账?'),
+	      confirm: handleRecorded.bind(this, record),
+	    },
+	    auth: 'erp:income:edit',
+	  	ifShow: record.isRecorded == '0'
 	  },
     ],
   };
@@ -213,6 +243,13 @@
     await handleSuccess(record);
   }
   
+  async function handleRecorded(record: Recordable) {
+    const params = { incomeId: record.incomeId };
+    const res = await erpIncomeRecorded(params);
+    showMessage(res.message);
+    await handleSuccess(record);
+  }
+
   async function handleSuccess(record: Recordable) {
     await reload({ record });
   }

web-vue/packages/erp/views/erp/transactionFlow/list.vue

@@ -179,6 +179,22 @@
       width: 130,
       align: 'left',
     },
+	{
+	  title: t('交易年份'),
+	  dataIndex: 'yearDate',
+	  key: 'a.year_date',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
+	{
+	  title: t('交易月份'),
+	  dataIndex: 'monthDate',
+	  key: 'a.month_date',
+	  sorter: true,
+	  width: 130,
+	  align: 'left',
+	},
     {
       title: t('交易备注'),
       dataIndex: 'remark',