feat(erp): 添加排序功能支持
- 定义 OrderItem、OrderField 和 OrderSort 类型及常量 - 为费用模块添加 createdAt、amount 排序字段 - 为应付模块添加 createdAt、amount 排序字段 - 为收汇模块添加 createdAt、entryAmount、receivableFxAmount 排序字段 - 为应收模块添加 createdAt、receivedAmount、receivableAmount、outstandingAmount 排序字段 - 为申请模块添加 createdAt、prepaidAmount、amount、paidAmount、payAt 排序字段 - 在各列表参数结构体中添加 Order 字段支持
This commit is contained in:
@@ -111,3 +111,40 @@ const (
|
|||||||
PaymentTypePurchase PaymentType = 1 // 采购付款单
|
PaymentTypePurchase PaymentType = 1 // 采购付款单
|
||||||
PaymentTypeCost PaymentType = 2 // 费用付款单
|
PaymentTypeCost PaymentType = 2 // 费用付款单
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type OrderItem struct {
|
||||||
|
Field OrderField
|
||||||
|
Sort string
|
||||||
|
}
|
||||||
|
|
||||||
|
type OrderField = string
|
||||||
|
|
||||||
|
const (
|
||||||
|
OrderFieldReceivableCreatedAt OrderField = "createdAt"
|
||||||
|
OrderFieldReceivableReceivedAmount OrderField = "receivedAmount"
|
||||||
|
OrderFieldReceivableReceivableAmount OrderField = "receivableAmount"
|
||||||
|
OrderFieldReceivableOutstandingAmount OrderField = "outstandingAmount"
|
||||||
|
|
||||||
|
OrderFieldReceiptCreatedAt OrderField = "createdAt"
|
||||||
|
OrderFieldReceiptEntryAmount OrderField = "entryAmount"
|
||||||
|
OrderFieldReceiptReceivableFxAmount OrderField = "receivableFxAmount"
|
||||||
|
|
||||||
|
OrderFieldPayableCreatedAt OrderField = "createdAt"
|
||||||
|
OrderFieldPayableAmount OrderField = "amount"
|
||||||
|
|
||||||
|
OrderFieldRequestCreatedAt OrderField = "createdAt"
|
||||||
|
OrderFieldRequestPrepaidAmount OrderField = "prepaidAmount"
|
||||||
|
OrderFieldRequestAmount OrderField = "amount"
|
||||||
|
OrderFieldRequestPaidAmount OrderField = "paidAmount"
|
||||||
|
OrderFieldRequestPayAt OrderField = "payAt"
|
||||||
|
|
||||||
|
OrderFieldExpenseCreatedAt OrderField = "createdAt"
|
||||||
|
OrderFieldExpenseAmount OrderField = "amount"
|
||||||
|
)
|
||||||
|
|
||||||
|
type OrderSort = string
|
||||||
|
|
||||||
|
const (
|
||||||
|
OrderSortAsc OrderSort = "asc"
|
||||||
|
OrderSortDesc OrderSort = "desc"
|
||||||
|
)
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ type expense struct {
|
|||||||
type ArgsExpenseList struct {
|
type ArgsExpenseList struct {
|
||||||
Page bean.Page
|
Page bean.Page
|
||||||
Search ExpenseSearch
|
Search ExpenseSearch
|
||||||
|
Order []OrderItem
|
||||||
}
|
}
|
||||||
type ExpenseSearch struct {
|
type ExpenseSearch struct {
|
||||||
ExpenseSerial string // 报销单号
|
ExpenseSerial string // 报销单号
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ type payable struct {
|
|||||||
type ArgsPayableList struct {
|
type ArgsPayableList struct {
|
||||||
Page bean.Page
|
Page bean.Page
|
||||||
Search PayableSearch
|
Search PayableSearch
|
||||||
|
Order []OrderItem
|
||||||
}
|
}
|
||||||
type PayableSearch struct {
|
type PayableSearch struct {
|
||||||
PayableSerial string // 付款单据号
|
PayableSerial string // 付款单据号
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ type receipt struct {
|
|||||||
type ArgsReceiptList struct {
|
type ArgsReceiptList struct {
|
||||||
Page bean.Page
|
Page bean.Page
|
||||||
Search ReceiptSearch
|
Search ReceiptSearch
|
||||||
|
Order []OrderItem
|
||||||
}
|
}
|
||||||
type ReceiptSearch struct {
|
type ReceiptSearch struct {
|
||||||
ReceiptSerial string // 收汇单号
|
ReceiptSerial string // 收汇单号
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ type receivable struct {
|
|||||||
type ArgsReceivableList struct {
|
type ArgsReceivableList struct {
|
||||||
Page bean.Page
|
Page bean.Page
|
||||||
Search ReceivableSearch
|
Search ReceivableSearch
|
||||||
|
Order []OrderItem
|
||||||
}
|
}
|
||||||
type ReceivableSearch struct {
|
type ReceivableSearch struct {
|
||||||
ReceivableSerial string // 收款单据号
|
ReceivableSerial string // 收款单据号
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ type request struct {
|
|||||||
type ArgsRequestList struct {
|
type ArgsRequestList struct {
|
||||||
Page bean.Page
|
Page bean.Page
|
||||||
Search RequestSearch
|
Search RequestSearch
|
||||||
|
Order []OrderItem
|
||||||
}
|
}
|
||||||
type RequestSearch struct {
|
type RequestSearch struct {
|
||||||
RequestSerial string // 报销单号
|
RequestSerial string // 报销单号
|
||||||
|
|||||||
Reference in New Issue
Block a user