Skip to content

Cursor/daily profit statistics columns order dev#47

Merged
topfunplusnew merged 1 commit intoorder-devfrom
cursor/daily-profit-statistics-columns-order-dev
Jan 22, 2026
Merged

Cursor/daily profit statistics columns order dev#47
topfunplusnew merged 1 commit intoorder-devfrom
cursor/daily-profit-statistics-columns-order-dev

Conversation

@topfunplusnew
Copy link
Owner

@topfunplusnew topfunplusnew commented Jan 22, 2026

Note

Major finance and orders updates with API, metrics, and UI improvements.

  • Add borrowedMoneyAudit and getRepaymentHistory APIs; Borrowed Money page shows repaid/unrepaid/interest columns, audit toggle with permission, and a new history dialog; calculations use mathjs
  • Goods Order: new adjust-order mode rendering with standard el-table, computed column set, row highlight classes, and CSS; passes current pagination to QuerySearchBar
  • QuerySearchBar preserves current pagination on query/reset; ElTableOrder forwards pageNum/pageSize
  • Statements: Daily Profit Statistics restructured with explicit day/month/year fields (profit, actual received rebate, new inventory, balance accounts, totals); Order System Data uses mathjs and adds actual received rebate and totals; fleet freight summary simplifies to single-date flow
  • Commissions: add columns (sales manager, otherCommission, factory rebate/discount, balance profit); reindex visibility config
  • Payments: Treat isPayment as bad debt flow in ApplyPayment (button label, validation, payload); several cash deposit/recover dialogs redesigned and clear validation on selection
  • Order Day Info table expands columns (customer, plate) and widths; Sidebar submenu adds show-timeout
  • Gift In/Out/Inventory tables show quantity summaries; input/validation tweaks for amount auto-calc
  • Order Freight: rename column to sourceType; search/reset keep pagination; minor export/query fixes across pages
  • Social Insurance: add maternityInsurance, show summary totals, and compute company/self sums via mathjs
  • Misc: fix fund flow expenditure display (absolute), oil card alignment, company search adds salesManager

Written by Cursor Bugbot for commit 82c8764. This will update automatically on new commits. Configure here.

@topfunplusnew topfunplusnew changed the base branch from front-dev to order-dev January 22, 2026 07:12
根据 OrderSystemDataMultiDimensionVo 类重构 OrderSystemData.vue:

1. 新增字段:
   - systemNewInventory(当日新增入库)
   - systemBalanceAccounts(平账)
   - systemProfit(订单系统利润,后端计算)

2. 调整表格字段顺序:
   - 加:当日新增入库
   - 加:订单系统玻璃收入
   - 减:订单系统玻璃成本
   - 减:订单系统应付运费
   - 加:订单系统票点收入
   - 减:订单系统票点成本
   - 减:订单系统管理费用
   - 订单系统利润
   - 实收返利金额
   - 平账(客户平账 - 供应商平账)
   - 合计(利润 + 实收返利 - 平账)

3. 移除前端利润计算逻辑,使用后端返回的 systemProfit

Co-authored-by: ming10655 <ming10655@gmail.com>
@cursor cursor bot force-pushed the cursor/daily-profit-statistics-columns-order-dev branch from 82c8764 to ab7cb6c Compare January 22, 2026 07:23
@topfunplusnew topfunplusnew merged commit ab7cb6c into order-dev Jan 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants