diff --git a/erp/constant.go b/erp/constant.go index 6a5adf8..581ca00 100644 --- a/erp/constant.go +++ b/erp/constant.go @@ -163,3 +163,10 @@ const ( AccountingGenTypeSaleStaff AccountingGenType = 1 // 按销售生成做账单 AccountingGenTypeShipmentStaff AccountingGenType = 2 // 按订舱生成做账单 ) + +type ExpenseType = int64 + +const ( + ExpenseTypeNormal PaymentType = 1 // 普通费用 + ExpenseTypeTrave PaymentType = 2 // 差旅费 +) diff --git a/erp/expense.go b/erp/expense.go index bf058d3..8bf137a 100644 --- a/erp/expense.go +++ b/erp/expense.go @@ -86,6 +86,7 @@ type ArgsExpenseAdd struct { ExpenseAdd } type ExpenseAdd struct { + Type ExpenseType // 报销类型 1=普通报销费用 2=差旅费 Currency string // 币种 CurrencyName string // 币种名称 CurrencySymbol string // 币种符号 @@ -94,6 +95,12 @@ type ExpenseAdd struct { ExpenseStaffId int64 // 报销人 BankAccount string // 银行账号 BankName string // 账号名称 + TravelStaffIds []int64 // 出差员工 + TraveStartAt *time.Time // 出差开始日期 + TravelEndAt *time.Time // 出差结束日期 + TravelLocation string // 地点 + TravelReason string // 出差事由 + TravelInfo string // 差旅费明细 } // Add @TITLE 添加 @@ -109,6 +116,7 @@ func (r *expense) Add(ctx context.Context, args ArgsExpenseAdd) (expenseId int64 type ReplyExpenseInfo struct { Id int64 `json:"id"` ExpenseSerial string `json:"expenseSerial"` + Type int64 `json:"type"` Currency string `json:"currency"` CurrencyName string `json:"currencyName"` CurrencySymbol string `json:"currencySymbol"` @@ -117,6 +125,12 @@ type ReplyExpenseInfo struct { Remarks string `json:"remarks"` BankAccount string `json:"bankAccount"` BankName string `json:"bankName"` + TravelStaffIds []int64 `json:"travelStaffIds"` + TraveStartAt *time.Time `json:"traveStartAt"` + TravelEndAt *time.Time `json:"travelEndAt"` + TravelLocation string `json:"travelLocation"` + TravelReason string `json:"travelReason"` + TravelInfo string `json:"travelInfo"` WorkflowId int64 `json:"workflowId"` WorkflowStatus int64 `json:"workflowStatus"` WorkflowReason string `json:"workflowReason"`