Cursor/daily profit statistics columns order dev#47
Merged
topfunplusnew merged 1 commit intoorder-devfrom Jan 22, 2026
Merged
Conversation
根据 OrderSystemDataMultiDimensionVo 类重构 OrderSystemData.vue: 1. 新增字段: - systemNewInventory(当日新增入库) - systemBalanceAccounts(平账) - systemProfit(订单系统利润,后端计算) 2. 调整表格字段顺序: - 加:当日新增入库 - 加:订单系统玻璃收入 - 减:订单系统玻璃成本 - 减:订单系统应付运费 - 加:订单系统票点收入 - 减:订单系统票点成本 - 减:订单系统管理费用 - 订单系统利润 - 实收返利金额 - 平账(客户平账 - 供应商平账) - 合计(利润 + 实收返利 - 平账) 3. 移除前端利润计算逻辑,使用后端返回的 systemProfit Co-authored-by: ming10655 <ming10655@gmail.com>
82c8764 to
ab7cb6c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
Major finance and orders updates with API, metrics, and UI improvements.
borrowedMoneyAuditandgetRepaymentHistoryAPIs; Borrowed Money page shows repaid/unrepaid/interest columns, audit toggle with permission, and a new history dialog; calculations usemathjsel-table, computed column set, row highlight classes, and CSS; passes current pagination toQuerySearchBarQuerySearchBarpreserves current pagination on query/reset;ElTableOrderforwardspageNum/pageSizemathjsand adds actual received rebate and totals; fleet freight summary simplifies to single-date flowApplyPayment(button label, validation, payload); several cash deposit/recover dialogs redesigned and clear validation on selectionshow-timeoutsourceType; search/reset keep pagination; minor export/query fixes across pagesmaternityInsurance, show summary totals, and compute company/self sums viamathjsWritten by Cursor Bugbot for commit 82c8764. This will update automatically on new commits. Configure here.