S2 结算验收页(用户感知断层补正): views/settle 四 Tab(消耗汇总+回补/订单创建-确认-驳回/账单生成-重算-确认-结账-导出-明细抽屉/阶梯增删)+api/settle.ts 12 端点(带 token 文件流下载)+路由点亮 settle 挂点+seed_settle_demo.sql(s2demo 登录账号/demo-cust/价格时间线月中调价/近5天消耗 19550/待确认订单幂等种子)+Playwright 预走查脚本;前端四件全绿(eslint0/vue-tsc0/vitest 138/build 9.7s);Playwright 真库闭环:订单确认余额 5000→6000/账单 SC202611-2=19550条×1955.00 元与价格时间线分毫不差/6 截图;留痕 casbin 策略启动载内存 SQL 直插 g 需重启生效(403 排查实录);用户页面走查指引入 s2-frontend-preview.md
This commit is contained in:
@@ -2,6 +2,13 @@
|
||||
|
||||
> 本仓 CHANGELOG 自重建起记(POC 明细见归档仓 /data/poc-archive/repos/go-sms.git 的 CHANGELOG.md,已冻结)。
|
||||
|
||||
## 2026-11-14(深夜②)· S2 结算验收页(用户感知断层补正:前端人工验收面)
|
||||
|
||||
- **动因**:用户裁决「需要人工前端页面验收」——S2 后端 D1~D4 不可见,评审者零感知;以最小可视化验收面补正(S3 结算页面族在此精修)。
|
||||
- **交付**:views/settle/index.vue 四 Tab(消耗汇总+回补/订单创建-确认-驳回/账单生成-重算-确认-结账-导出-明细抽屉/阶梯增删)+api/settle.ts(12 端点+带 token 文件流下载)+路由点亮 settle 挂点+seed_settle_demo.sql(s2demo 登录账号/demo-cust/价格时间线月中调价/近 5 天消耗 19550 成功/待确认订单)+Playwright 预走查脚本。
|
||||
- **门禁**:eslint 0/vue-tsc 0/vitest 138 全过/build 9.7s。
|
||||
- **Playwright 真库闭环**:订单确认余额 5000→6000;账单 SC202611-2=19550 条×1955.00 元与价格时间线分毫不差;6 截图入 shots/。**留痕:casbin 策略启动时载内存,SQL 直插 g 规则需重启 gateway 生效**(403 排查实录);验收指引见 `docs/acceptance/s2-frontend-preview.md`。
|
||||
|
||||
## 2026-11-14(深夜)· S2-D4 出账引擎+阶梯(S2 显式验收项落地)
|
||||
|
||||
- **settle/price.go(R1/R6 唯一换算点)**:PriceAtAccount(业务线×时间线回溯)/PriceAtChannel/LadderPrice(月量落档)。D4-0 六口径(Q1 无价 0 元入账/Q2 阶梯整月覆写/Q3 all=submit/Q4 当前 upstream 归并/Q5 全业务合并/Q6 状态机)经方案批准生效。
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
# S2 结算验收页(前端预验收面) 交付单(2026-11-14 深夜)
|
||||
|
||||
> 动因:用户裁决「需要人工前端页面验收,否则对项目进度完全没有感知」——S2 后端 D1~D4
|
||||
> 已完成但全部不可见,本单以最小可视化验收面补正(评审者感知断层),S3 结算页面族在此基础精修。
|
||||
|
||||
## 一、交付物
|
||||
|
||||
| # | 文件 | 内容 |
|
||||
|---|---|---|
|
||||
| 1 | `web/src/views/settle/index.vue` | 结算管理页 4 Tab:消耗日汇总(查询+手动回补)/充值订单(创建+确认/驳回二次确认)/月度结算单(生成/重算+确认/结账/导出 XLSX+明细抽屉)/阶梯价(增删);页头「S2 验收版·S3 精修」 |
|
||||
| 2 | `web/src/api/settle.ts` | 12 端点封装(TS 类型)+downloadBill(fetch+blob 带 token 文件流下载) |
|
||||
| 3 | `web/src/router/routes.ts` | settle 项 ComingSoon → 真页面(roles admin/ops 不变) |
|
||||
| 4 | `scripts/seed_settle_demo.sql` | 演示种子:s2demo 登录账号(admin,不动内置 admin)/demo-cust 客户/价格时间线(11-01 0.10、11-15 0.15 月中调价)/近 5 天消耗(19550 成功)/待确认订单;幂等 |
|
||||
| 5 | `web/s2-acceptance.mjs` | Playwright 预走查脚本(登录→四 Tab→订单确认实操作→生成账单→明细抽屉→6 截图) |
|
||||
|
||||
## 二、门禁(前端四件)
|
||||
|
||||
| 项 | 结果 |
|
||||
|---|---|
|
||||
| eslint(max-warnings 0) | ✅ 0 |
|
||||
| vue-tsc --noEmit | ✅ 0 |
|
||||
| vitest 全量 | ✅ **138/138**(既有零破坏) |
|
||||
| npm run build | ✅ 9.74s(chunk 警告=既有已知项,S3 性能门) |
|
||||
|
||||
## 三、Playwright 预走查(真库闭环,2026-11-14 22:1x)
|
||||
|
||||
1. 登录 s2demo → /home ✓;菜单进入 /settle ✓;
|
||||
2. Tab1 消耗汇总 5 行(种子数据)展示 ✓;
|
||||
3. **订单确认实操作**:页面按钮→MessageBox→API→**账号 2 余额 5000→6000 真实落账** ✓;
|
||||
4. **生成账单**:SC202611-2 = 19550 条 × **1955.00 元**——与价格时间线分毫不差(11-10~11-14 全部落在 0.10 档,11-15 调价档留走查验证) ✓;
|
||||
5. 明细抽屉(按天行)✓;Tab4 阶梯 ✓;6 张截图 `web/shots/s2-settle-*.png`。
|
||||
|
||||
**过程留痕(casbin 热加载缺口)**:SQL 直插 casbin_rule 在 gateway 运行中不生效(策略启动时载入内存)→ 写操作 403;重启 gateway 后全通。种子脚本已注释该约束(正规路径=走开户 API 自动同步 enforcer)。
|
||||
|
||||
## 四、用户走查指引(3 分钟)
|
||||
|
||||
```bash
|
||||
# 1. 种子(已种可跳过;幂等)——注意:gateway 运行中种后需重启使其 casbin 生效
|
||||
sg docker -c 'docker exec -i go-sms-mysql mysql -uroot -proot123 gosms' < scripts/seed_settle_demo.sql
|
||||
# 2. 确保服务在跑:make gw-start(8080) / make web-dev(5173)
|
||||
# 3. 浏览器 http://127.0.0.1:5173 → 登录 s2demo / S2demo@2026
|
||||
# 菜单「统计结算 → 结算管理」四 Tab 走查:
|
||||
# - 订单:确认到账看余额 / 驳回不涉余额
|
||||
# - 账单:生成 2026-11 → 金额 1955;配阶梯(账号2,0 档 0.08)→ 重算 → 1564;
|
||||
# 确认 → 结账(SettleRecord)→ 导出 XLSX
|
||||
# - 阶梯:增/删即时生效于重算
|
||||
```
|
||||
|
||||
## 五、边界
|
||||
|
||||
- mock 模式不覆盖(msw settle handler 留 S3 结算页面族一起做);页面为验收版,S3 按设计规范精修(ProTable 化/权限走查/LCP);
|
||||
- 上家账单/利润 Tab 未含(后端 D5 未实现),S3/D5 后点亮。
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
- **仓库**:main 已推 Gitea;每日 bundle+push 双轨。
|
||||
- **S2 进度 4/5**:D1 表设计+v20+契约 / D2 消耗日汇总(滚动重刷)/ D3 充值审核流 / **D4 ✅ 出账引擎+阶梯**——price.go(R1/R6 唯一换算:业务线×时间线回溯+阶梯月量落档)+bill.go(下家/上家生成-确认-结账+SettleRecord+ladder CRUD)+export.go XLSX 双导出+15 端点;**阶梯结算单测全绿(S2 显式验收项)**+上家 billing_mode 三口径+状态机终态幂等;真机出账全链(时间线 10→阶梯覆写 5→结账快照→真 XLSX 5637B)。D4-0 六口径(Q1~Q6)经方案批准生效。
|
||||
- **⚠️ 流程补正在途**:七件套「本人走查」项——走查脚本已备 `docs/acceptance/scripts/s2-walkthrough.sh`(D2/D3 全覆盖+D4 出账链),**待用户执行后回填 s2-d2/d3/d4 验收单**;D5 收官时一并完成 S2 域级用户验收。
|
||||
- **⚠️ 流程补正在途**:七件套「本人走查」项——**结算验收页已上线**(浏览器 :5173 登录 s2demo/S2demo@2026 → 统计结算/结算管理,Playwright 预走查真库闭环已过:余额+1000/账单 1955.00 分毫不差),**待用户页面走查后回填**;curl 脚本 `docs/acceptance/scripts/s2-walkthrough.sh` 保留作回归。**casbin 留痕:SQL 直插 g 规则需重启 gateway 生效**。
|
||||
- **24h 稳定性门槛 ✅ 终判通过**(S1 完全闭环,S5 压测前置确认)。
|
||||
- **六项裁决速查**:R1/R6 换算只在 price.go(已落地)/R2 事实源 D2 落账/R3 双通道 D3 落地(ref_id 区分)/R4 rebate_rate(D5 消费)/R5 settle_ladder(D4 落地)。
|
||||
- **下一步=S2-D5 利润/返点/三方对账(S2 收官)**:profit.go(用户利润含下级树 Path 聚合+通道利润+rebate 计算,R4 历史不重算)+reconcile.go(三方=明细直查 vs 日汇总 vs 结算单,diff=0=S2 出口)+cmd/reconcile settle-check 子命令+/stats/profit 双端点;收官=S2 全域用户走查(脚本+D4 出账链)+s2-closeout.md。
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
| S2-D2 消耗日汇总引擎 | settle/consume.go+job.go(**滚动重刷模型**:1h 重刷近 4 天,修正单日 T+1 的 72h 失真)+两端点+config/metrics/装配;sqlite 6 测试;真 MySQL 端到端+收敛实证 | ✅ 2026-11-14 傍晚(验收单 s2-d2.md) |
|
||||
| S2-D3 充值审核流 | recharge.go(创建/confirm 单事务 CAS+余额自增+流水 ref_id=order_no/驳回/列表)+ISC:039 三处同步+四端点(二级权限+平台角色门);测试 7 件含并发 confirm;真机全链冒烟+审计留痕实证 | ✅ 2026-11-14 夜(验收单 s2-d3.md) |
|
||||
| S2-D4 出账+阶梯 | price.go(R1/R6 唯一换算)+bill.go(生成/确认/结账/SettleRecord/ladder)+export.go XLSX+15 端点;**阶梯结算单测(S2 显式验收项)**+上家三口径+状态机;真机出账全链(阶梯覆写/结账/真 XLSX) | ✅ 2026-11-14 深夜(验收单 s2-d4.md;用户走查在途补正) |
|
||||
| S2 前端验收面 | 结算管理页四 Tab+api 12 端点+seed 演示(s2demo)+Playwright 预走查真库闭环(余额+1000/账单 1955.00);前端四件全绿 | ✅ 2026-11-14 深夜②(用户页面走查在途;s2-frontend-preview.md) |
|
||||
| S2-D5 | 利润/返点+三方对账(diff=0=S2 出口)+S2 收官走查 | ⬜ 排期中 |
|
||||
| 观察项 | 24h 稳定性门槛(11-13 17:55 起计;期内 21:33 宿主主动重启=已知事件不判失败)期满核验 11-14 17:55 | ✅ 2026-11-14 18:02 终判通过(dmesg 0/零重启/驻留+md5 一致;S5 压测前置确认,S1 完全闭环) |
|
||||
| S2~S5 | 结算域/前端收尾/C1C2+冷热/基线与灰度 | ⬜ 见《Go-sms-重建计划.md》 |
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
-- seed_settle_demo.sql S2 结算验收页演示数据(2026-11-14)
|
||||
-- 用途:结算管理页(/settle)走查数据——s2demo 登录账号 + 演示客户 + 价格时间线
|
||||
-- (月中调价)+ 近 5 天消耗 + 一笔待确认订单。幂等:DELETE 后重种。
|
||||
-- 用法:sg docker -c 'docker exec -i go-sms-mysql mysql -uroot -proot123 gosms' \
|
||||
-- < scripts/seed_settle_demo.sql
|
||||
-- 登录:s2demo / S2demo@2026(role=admin;不动内置 admin 原密码)
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- ① s2demo 管理账号(id 90001)+ casbin admin 绑定
|
||||
DELETE FROM account_user WHERE id = 90001;
|
||||
INSERT INTO account_user
|
||||
(id, username, password_hash, real_name, role, status, balance, created_at, updated_at)
|
||||
VALUES
|
||||
(90001, 's2demo', '$2a$10$p192BloEINMfHXRRZ9zTTeOQHRAuT1l9LJgritETg1NYKl2FIOUbC',
|
||||
'S2 验收演示', 'admin', 1, 0, NOW(), NOW());
|
||||
DELETE FROM casbin_rule WHERE ptype = 'g' AND v0 = '90001';
|
||||
INSERT INTO casbin_rule (ptype, v0, v1) VALUES ('g', '90001', 'admin');
|
||||
|
||||
-- ② 演示客户 id=2(demo-cust / 同密码;余量 5000 条)
|
||||
DELETE FROM account_user WHERE id = 2;
|
||||
INSERT INTO account_user
|
||||
(id, username, password_hash, real_name, role, status, balance, credit_balance, created_at, updated_at)
|
||||
VALUES
|
||||
(2, 'demo-cust', '$2a$10$p192BloEINMfHXRRZ9zTTeOQHRAuT1l9LJgritETg1NYKl2FIOUbC',
|
||||
'演示客户', 'customer', 1, 5000, 0, NOW(), NOW());
|
||||
DELETE FROM casbin_rule WHERE ptype = 'g' AND v0 = '2';
|
||||
INSERT INTO casbin_rule (ptype, v0, v1) VALUES ('g', '2', 'customer');
|
||||
|
||||
-- ③ 价格时间线(月中调价:11-01 起 0.10 / 11-15 起 0.15——出账按日分档可验)
|
||||
DELETE FROM account_price WHERE account_id = 2;
|
||||
INSERT INTO account_price (account_id, business, price, effective_at, created_at) VALUES
|
||||
(2, 'sms', 0.1000, '2026-11-01', NOW()),
|
||||
(2, 'sms', 0.1500, '2026-11-15', NOW());
|
||||
|
||||
-- ④ 近 5 天消耗行(演示口径:job 滚动重刷只覆盖有明细的日期,直种行不会被抹)
|
||||
DELETE FROM billing_consume_log WHERE account_id = 2;
|
||||
INSERT INTO billing_consume_log
|
||||
(account_id, business, stat_date, submit_count, success_count, fail_count, unknown_count, fee_total, created_at, updated_at) VALUES
|
||||
(2, 'sms', CURDATE() - INTERVAL 4 DAY, 3000, 2850, 100, 50, 3000, NOW(), NOW()),
|
||||
(2, 'sms', CURDATE() - INTERVAL 3 DAY, 4200, 4000, 150, 50, 4200, NOW(), NOW()),
|
||||
(2, 'sms', CURDATE() - INTERVAL 2 DAY, 5100, 4800, 200, 100, 5100, NOW(), NOW()),
|
||||
(2, 'sms', CURDATE() - INTERVAL 1 DAY, 4600, 4400, 150, 50, 4600, NOW(), NOW()),
|
||||
(2, 'sms', CURDATE(), 3800, 3500, 200, 100, 3800, NOW(), NOW());
|
||||
|
||||
-- ⑤ 一笔待确认充值订单(走查「确认到账→余额 +1000」)
|
||||
DELETE FROM billing_order WHERE order_no = 'BDEMO00001';
|
||||
INSERT INTO billing_order
|
||||
(order_no, account_id, count, amount, pay_type, pay_status, operator, remark, created_at)
|
||||
VALUES
|
||||
('BDEMO00001', 2, 1000, 120.00, 'bank', 0, 's2demo', '验收演示单(确认后账号2余额+1000)', NOW());
|
||||
|
||||
SELECT 'seeded' AS result,
|
||||
(SELECT COUNT(*) FROM billing_consume_log WHERE account_id = 2) AS consume_rows,
|
||||
(SELECT COUNT(*) FROM billing_order WHERE order_no = 'BDEMO00001') AS demo_order;
|
||||
@@ -0,0 +1,64 @@
|
||||
// s2-acceptance.mjs S2 结算验收页 Playwright 预走查(临时,验收后可删或留 tests/)。
|
||||
// 登录 s2demo → /settle 四 Tab 截图 + 订单确认/生成账单 实操作 → shots/。
|
||||
import { chromium } from './node_modules/.pnpm/playwright@1.65.0/node_modules/playwright/index.mjs'
|
||||
import { mkdirSync } from 'node:fs'
|
||||
|
||||
const BASE = 'http://127.0.0.1:5173'
|
||||
const OUT = 'shots'
|
||||
mkdirSync(OUT, { recursive: true })
|
||||
|
||||
const browser = await chromium.launch()
|
||||
const page = await browser.newPage({ viewport: { width: 1440, height: 900 } })
|
||||
|
||||
// 登录
|
||||
await page.goto(`${BASE}/login`)
|
||||
await page.fill('input[placeholder*="用户名"], input[type="text"]', 's2demo')
|
||||
await page.fill('input[type="password"]', 'S2demo@2026')
|
||||
await page.click('button:has-text("登")')
|
||||
await page.waitForURL(/home|dashboard|\/$/, { timeout: 10000 })
|
||||
console.log('[1] 登录 OK →', page.url())
|
||||
|
||||
// 结算页
|
||||
await page.goto(`${BASE}/settle`)
|
||||
await page.waitForSelector('.sc-tabs', { timeout: 10000 })
|
||||
await page.waitForTimeout(1200) // 四 Tab onMounted 并发加载
|
||||
await page.screenshot({ path: `${OUT}/s2-settle-tab1-consume.png`, fullPage: true })
|
||||
console.log('[2] Tab1 消耗日汇总截图 OK')
|
||||
|
||||
// Tab2 订单 + 确认到账实操作
|
||||
await page.click('.el-tabs__item:has-text("充值订单")')
|
||||
await page.waitForTimeout(800)
|
||||
await page.screenshot({ path: `${OUT}/s2-settle-tab2-orders.png`, fullPage: true })
|
||||
const confirmBtn = page.locator('button:has-text("确认到账")').first()
|
||||
if (await confirmBtn.count()) {
|
||||
await confirmBtn.click()
|
||||
await page.click('.el-message-box__btns .el-button--primary')
|
||||
await page.waitForTimeout(1000)
|
||||
console.log('[3] 订单确认到账实操作 OK(余额应 +1000)')
|
||||
}
|
||||
await page.screenshot({ path: `${OUT}/s2-settle-tab2-after-confirm.png`, fullPage: true })
|
||||
|
||||
// Tab3 生成账单 + 阶梯重算 + 明细
|
||||
await page.click('.el-tabs__item:has-text("月度结算单")')
|
||||
await page.waitForTimeout(500)
|
||||
await page.click('button:has-text("生成/重算账期")')
|
||||
await page.waitForTimeout(1500)
|
||||
await page.screenshot({ path: `${OUT}/s2-settle-tab3-bills.png`, fullPage: true })
|
||||
console.log('[4] Tab3 生成账单 OK')
|
||||
const detailBtn = page.locator('button:has-text("明细")').first()
|
||||
if (await detailBtn.count()) {
|
||||
await detailBtn.click()
|
||||
await page.waitForTimeout(800)
|
||||
await page.screenshot({ path: `${OUT}/s2-settle-tab3-detail.png`, fullPage: true })
|
||||
await page.keyboard.press('Escape')
|
||||
console.log('[5] 账单明细抽屉 OK')
|
||||
}
|
||||
|
||||
// Tab4 阶梯
|
||||
await page.click('.el-tabs__item:has-text("阶梯价")')
|
||||
await page.waitForTimeout(800)
|
||||
await page.screenshot({ path: `${OUT}/s2-settle-tab4-ladder.png`, fullPage: true })
|
||||
console.log('[6] Tab4 阶梯价截图 OK')
|
||||
|
||||
await browser.close()
|
||||
console.log('DONE → shots/s2-settle-*.png')
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 82 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 70 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 72 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 85 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 92 KiB |
@@ -0,0 +1,114 @@
|
||||
/** 结算域 API(S2 验收版;real 模式直连网关,openapi v1.3.0 契约)。 */
|
||||
import { get, post, put, del } from './request'
|
||||
import { getToken } from '@/utils/auth'
|
||||
|
||||
/** 消耗日汇总行(账号×业务×天;fee_total 单位=条)。 */
|
||||
export interface ConsumeRow {
|
||||
id: number
|
||||
account_id: number
|
||||
business: string
|
||||
stat_date: string
|
||||
submit_count: number
|
||||
success_count: number
|
||||
fail_count: number
|
||||
unknown_count: number
|
||||
fee_total: number
|
||||
}
|
||||
|
||||
/** 充值订单(pay_status: 0待确认 1已到账 2失败;count=条,amount=元)。 */
|
||||
export interface BillingOrder {
|
||||
id: number
|
||||
order_no: string
|
||||
account_id: number
|
||||
amount: number
|
||||
count: number
|
||||
pay_type: string
|
||||
pay_status: number
|
||||
operator: string
|
||||
paid_at: string | null
|
||||
remark: string
|
||||
created_at: string
|
||||
}
|
||||
|
||||
/** 下家月结单(status: 0草稿 1已确认 2已结账;amount 单位=元)。 */
|
||||
export interface SettleCustomerBill {
|
||||
id: number
|
||||
settle_no: string
|
||||
account_id: number
|
||||
period: string
|
||||
success_count: number
|
||||
amount: number
|
||||
status: number
|
||||
created_at: string
|
||||
}
|
||||
|
||||
/** 账单按天明细行。 */
|
||||
export interface BillDayRow {
|
||||
day: string
|
||||
success_count: number
|
||||
amount: number
|
||||
}
|
||||
|
||||
/** 阶梯价档位。 */
|
||||
export interface SettleLadder {
|
||||
id: number
|
||||
owner_type: 'account' | 'upstream'
|
||||
owner_id: number
|
||||
tier_from: number
|
||||
price: number
|
||||
created_at: string
|
||||
}
|
||||
|
||||
/** 生成/重算统计。 */
|
||||
export interface GenerateResult {
|
||||
generated: number
|
||||
recalculated: number
|
||||
skipped: number
|
||||
}
|
||||
|
||||
interface Paged<T> { total: number; list: T[] }
|
||||
|
||||
export const settleApi = {
|
||||
// ---- 消耗日汇总(D2) ----
|
||||
consume: (params: Record<string, unknown>) => get<Paged<ConsumeRow>>('/billing/consume', params),
|
||||
aggregate: (date?: string) => post<{ day: string; account_rows: number; channel_rows: number }>('/ops/settle/aggregate', date ? { date } : {}),
|
||||
|
||||
// ---- 充值订单(D3) ----
|
||||
orders: (params: Record<string, unknown>) => get<Paged<BillingOrder>>('/billing/orders', params),
|
||||
createOrder: (body: { account_id: number; count: number; amount?: number; pay_type?: string; remark?: string }) =>
|
||||
post<BillingOrder>('/billing/orders', body),
|
||||
confirmOrder: (id: number) => post<{ order_no: string; balance: number; count: number }>(`/billing/orders/${id}/confirm`),
|
||||
rejectOrder: (id: number, remark?: string) => post<BillingOrder>(`/billing/orders/${id}/reject`, { remark }),
|
||||
|
||||
// ---- 下家月结(D4) ----
|
||||
customerBills: (params: Record<string, unknown>) => get<Paged<SettleCustomerBill>>('/settle/customer', params),
|
||||
generateCustomer: (period: string) => post<GenerateResult>('/settle/customer/generate', { period }),
|
||||
customerBillDetail: (id: number) => get<{ bill: SettleCustomerBill; days: BillDayRow[] }>(`/settle/customer/${id}`),
|
||||
confirmCustomerBill: (id: number) => post<null>(`/settle/customer/${id}/confirm`),
|
||||
settleCustomerBill: (id: number, pay_type?: string) => post<Record<string, unknown>>(`/settle/customer/${id}/settle`, { pay_type }),
|
||||
exportCustomerBill: (id: number) => `/settle/customer/${id}/export`,
|
||||
|
||||
// ---- 阶梯价(D4) ----
|
||||
ladders: (owner_type?: string, owner_id?: number) =>
|
||||
get<SettleLadder[]>('/settle/ladder', { ...(owner_type ? { owner_type } : {}), ...(owner_id ? { owner_id } : {}) }),
|
||||
createLadder: (body: { owner_type: string; owner_id: number; tier_from: number; price: number }) =>
|
||||
post<SettleLadder>('/settle/ladder', body),
|
||||
deleteLadder: (id: number) => del<null>(`/settle/ladder/${id}`),
|
||||
updateLadder: (id: number, body: { tier_from?: number; price?: number }) => put<null>(`/settle/ladder/${id}`, body),
|
||||
}
|
||||
|
||||
/** 导出下载(文件流需带 Authorization,axios JSON 拦截器不适配,走 fetch+blob)。 */
|
||||
export async function downloadBill(url: string, filename: string): Promise<void> {
|
||||
const base = (import.meta.env.VITE_API_BASE_URL as string) ?? ''
|
||||
const resp = await fetch(base + url, {
|
||||
headers: { Authorization: `Bearer ${getToken() ?? ''}` },
|
||||
})
|
||||
if (!resp.ok) throw new Error(`下载失败 HTTP ${resp.status}`)
|
||||
const blob = await resp.blob()
|
||||
const a = document.createElement('a')
|
||||
a.href = URL.createObjectURL(blob)
|
||||
a.download = filename
|
||||
a.click()
|
||||
URL.revokeObjectURL(a.href)
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ export const asyncRoutes: RouteRecordRaw[] = [
|
||||
|
||||
{ path: 'stats/user', name: 'stats-user', component: () => import('@/views/coming/ComingSoon.vue'), meta: { title: '用户统计', icon: 'DataLine', menu: true, group: '统计结算', roles: ['admin', 'ops', 'service'] } },
|
||||
{ path: 'stats/channel', name: 'stats-channel', component: () => import('@/views/coming/ComingSoon.vue'), meta: { title: '通道统计', icon: 'TrendCharts', menu: true, group: '统计结算', roles: ['admin', 'ops'] } },
|
||||
{ path: 'settle', name: 'settle', component: () => import('@/views/coming/ComingSoon.vue'), meta: { title: '结算管理', icon: 'Wallet', menu: true, group: '统计结算', roles: ['admin', 'ops'] } },
|
||||
{ path: 'settle', name: 'settle', component: () => import('@/views/settle/index.vue'), meta: { title: '结算管理', icon: 'Wallet', menu: true, group: '统计结算', roles: ['admin', 'ops'] } },
|
||||
|
||||
{ path: 'logs', name: 'logs', component: () => import('@/views/coming/ComingSoon.vue'), meta: { title: '日志报表', icon: 'Document', menu: true, group: '系统管理', roles: ['admin', 'ops', 'service'] } },
|
||||
{ path: 'system', name: 'system', component: () => import('@/views/coming/ComingSoon.vue'), meta: { title: '系统配置', icon: 'Setting', menu: true, group: '系统管理', roles: ['admin'] } },
|
||||
|
||||
@@ -0,0 +1,379 @@
|
||||
<template>
|
||||
<div class="page-stack">
|
||||
<section class="card sc-card">
|
||||
<div class="sc-head">
|
||||
<div>
|
||||
<span class="card-head-title">结算管理</span>
|
||||
<el-tag size="small" type="warning" class="sc-badge">S2 验收版 · S3 精修</el-tag>
|
||||
</div>
|
||||
<span class="sc-sub">消耗日汇总(D2)·充值订单审核(D3)·月结出账与阶梯(D4)——真实网关数据</span>
|
||||
</div>
|
||||
|
||||
<el-tabs v-model="tab" class="sc-tabs">
|
||||
<!-- Tab1 消耗日汇总(D2) -->
|
||||
<el-tab-pane label="消耗日汇总" name="consume">
|
||||
<div class="sc-filters">
|
||||
<el-input-number v-model="cq.account_id" :min="0" placeholder="账号ID(0=全部)" :controls="false" style="width: 130px" @change="loadConsume" />
|
||||
<el-date-picker v-model="cq.range" type="daterange" range-separator="至" start-placeholder="开始" end-placeholder="结束"
|
||||
value-format="YYYY-MM-DD" style="width: 260px" @change="loadConsume" />
|
||||
<el-button type="primary" :loading="loading.consume" @click="loadConsume">查询</el-button>
|
||||
<el-date-picker v-model="backfillDate" type="date" placeholder="回补日期(默认昨日)" value-format="YYYY-MM-DD" style="width: 170px" />
|
||||
<el-button :loading="loading.agg" @click="doAggregate">手动回补汇总</el-button>
|
||||
</div>
|
||||
<el-table v-loading="loading.consume" :data="consumeRows" size="small">
|
||||
<el-table-column prop="stat_date" label="日期" width="110" />
|
||||
<el-table-column prop="account_id" label="账号" width="90" />
|
||||
<el-table-column prop="business" label="业务" width="80" />
|
||||
<el-table-column prop="submit_count" label="提交" width="80" />
|
||||
<el-table-column prop="success_count" label="成功" width="80" />
|
||||
<el-table-column prop="fail_count" label="失败" width="80" />
|
||||
<el-table-column prop="unknown_count" label="未知" width="80" />
|
||||
<el-table-column prop="fee_total" label="计费条数(Σfee)" width="130" />
|
||||
<template #empty><el-empty description="无消耗记录(演示数据见种子脚本;或经「充值订单」入账后发送产生)" /></template>
|
||||
</el-table>
|
||||
<el-alert v-if="aggMsg" :title="aggMsg" type="success" :closable="false" class="sc-aggmsg" />
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- Tab2 充值订单(D3) -->
|
||||
<el-tab-pane label="充值订单" name="orders">
|
||||
<div class="sc-filters">
|
||||
<el-input-number v-model="oq.account_id" :min="0" placeholder="账号ID" :controls="false" style="width: 110px" @change="loadOrders" />
|
||||
<el-select v-model="oq.pay_status" placeholder="状态" clearable style="width: 130px" @change="loadOrders">
|
||||
<el-option label="待确认" :value="0" /><el-option label="已到账" :value="1" /><el-option label="已驳回" :value="2" />
|
||||
</el-select>
|
||||
<el-button type="primary" :loading="loading.orders" @click="loadOrders">查询</el-button>
|
||||
<el-button type="success" @click="dlg.order = true">创建订单</el-button>
|
||||
</div>
|
||||
<el-table v-loading="loading.orders" :data="orderRows" size="small">
|
||||
<el-table-column prop="order_no" label="订单号" width="200" />
|
||||
<el-table-column prop="account_id" label="账号" width="80" />
|
||||
<el-table-column prop="count" label="到账条数" width="100" />
|
||||
<el-table-column prop="amount" label="金额(元)" width="100" />
|
||||
<el-table-column label="状态" width="100">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="row.pay_status === 1 ? 'success' : row.pay_status === 2 ? 'danger' : 'warning'">
|
||||
{{ payStatusText(row.pay_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="operator" label="操作人" width="100" />
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="170" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<template v-if="row.pay_status === 0">
|
||||
<el-button size="small" type="success" @click="confirmOrder(row)">确认到账</el-button>
|
||||
<el-button size="small" type="danger" plain @click="rejectOrder(row)">驳回</el-button>
|
||||
</template>
|
||||
<span v-else class="sc-done">{{ row.pay_status === 1 ? '已入账' : '已驳回' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template #empty><el-empty description="暂无订单——点「创建订单」体验审核流(0→1 余额自增/0→2 不涉余额)" /></template>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
<!-- Tab3 月度结算单(D4) -->
|
||||
<el-tab-pane label="月度结算单" name="bills">
|
||||
<div class="sc-filters">
|
||||
<el-input v-model="bq.period" placeholder="账期 YYYY-MM" style="width: 150px" />
|
||||
<el-button type="primary" :loading="loading.bills" @click="loadBills">查询</el-button>
|
||||
<el-button type="success" :loading="loading.gen" @click="doGenerate">生成/重算账期</el-button>
|
||||
</div>
|
||||
<el-alert v-if="genMsg" :title="genMsg" type="success" :closable="false" class="sc-aggmsg" />
|
||||
<el-table v-loading="loading.bills" :data="billRows" size="small">
|
||||
<el-table-column prop="settle_no" label="结算单号" width="180" />
|
||||
<el-table-column prop="account_id" label="账号" width="80" />
|
||||
<el-table-column prop="period" label="账期" width="90" />
|
||||
<el-table-column prop="success_count" label="成功条数" width="100" />
|
||||
<el-table-column prop="amount" label="金额(元)" width="110" />
|
||||
<el-table-column label="状态" width="100">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="row.status === 2 ? 'success' : row.status === 1 ? 'primary' : 'info'">
|
||||
{{ billStatusText(row.status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="created_at" label="生成时间" width="170" />
|
||||
<el-table-column label="操作" width="250" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button size="small" @click="showBillDetail(row)">明细</el-button>
|
||||
<el-button v-if="row.status === 0" size="small" type="primary" @click="confirmBill(row)">确认</el-button>
|
||||
<el-button v-if="row.status === 1" size="small" type="success" @click="settleBill(row)">结账</el-button>
|
||||
<el-button size="small" type="primary" plain @click="exportBill(row)">导出XLSX</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template #empty><el-empty description="暂无账单——输入账期点「生成/重算」(消耗汇总×价格时间线;配阶梯后重算覆写)" /></template>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- Tab4 阶梯价(D4) -->
|
||||
<el-tab-pane label="阶梯价" name="ladder">
|
||||
<div class="sc-filters">
|
||||
<el-select v-model="lq.owner_type" placeholder="归属类型" style="width: 120px" @change="loadLadders">
|
||||
<el-option label="下家账号" value="account" /><el-option label="上家" value="upstream" />
|
||||
</el-select>
|
||||
<el-input-number v-model="lq.owner_id" :min="0" placeholder="归属ID" :controls="false" style="width: 110px" @change="loadLadders" />
|
||||
<el-button type="primary" :loading="loading.ladder" @click="loadLadders">查询</el-button>
|
||||
<el-button type="success" @click="dlg.ladder = true">新增档位</el-button>
|
||||
</div>
|
||||
<el-table v-loading="loading.ladder" :data="ladderRows" size="small">
|
||||
<el-table-column prop="owner_type" label="归属类型" width="100" />
|
||||
<el-table-column prop="owner_id" label="归属ID" width="90" />
|
||||
<el-table-column prop="tier_from" label="档位下限(条/月,含)" width="170" />
|
||||
<el-table-column prop="price" label="该档单价(元/条)" width="140" />
|
||||
<el-table-column prop="created_at" label="创建时间" width="170" />
|
||||
<el-table-column label="操作" width="90">
|
||||
<template #default="{ row }">
|
||||
<el-button size="small" type="danger" plain @click="removeLadder(row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template #empty><el-empty description="未配阶梯(出账按价格时间线);配档后重算即整月单价按落档价覆写" /></template>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</section>
|
||||
<!-- 创建订单对话框 -->
|
||||
<el-dialog v-model="dlg.order" title="创建充值订单(待确认,不动余额)" width="460px">
|
||||
<el-form label-width="90px">
|
||||
<el-form-item label="账号ID"><el-input-number v-model="orderForm.account_id" :min="1" :controls="false" style="width: 100%" /></el-form-item>
|
||||
<el-form-item label="到账条数"><el-input-number v-model="orderForm.count" :min="1" :controls="false" style="width: 100%" /></el-form-item>
|
||||
<el-form-item label="金额(元)"><el-input-number v-model="orderForm.amount" :min="0" :precision="2" :controls="false" style="width: 100%" /></el-form-item>
|
||||
<el-form-item label="付款方式"><el-input v-model="orderForm.pay_type" placeholder="bank/wechat/..." /></el-form-item>
|
||||
<el-form-item label="备注"><el-input v-model="orderForm.remark" /></el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="dlg.order = false">取消</el-button>
|
||||
<el-button type="primary" :loading="loading.orderCreate" @click="createOrder">创建</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 新增档位对话框 -->
|
||||
<el-dialog v-model="dlg.ladder" title="新增阶梯档位" width="460px">
|
||||
<el-form label-width="110px">
|
||||
<el-form-item label="归属类型">
|
||||
<el-select v-model="ladderForm.owner_type" style="width: 100%">
|
||||
<el-option label="下家账号" value="account" /><el-option label="上家" value="upstream" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="归属ID"><el-input-number v-model="ladderForm.owner_id" :min="1" :controls="false" style="width: 100%" /></el-form-item>
|
||||
<el-form-item label="档位下限(条)"><el-input-number v-model="ladderForm.tier_from" :min="0" :controls="false" style="width: 100%" /></el-form-item>
|
||||
<el-form-item label="单价(元/条)"><el-input-number v-model="ladderForm.price" :min="0.0001" :step="0.005" :precision="4" :controls="false" style="width: 100%" /></el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="dlg.ladder = false">取消</el-button>
|
||||
<el-button type="primary" :loading="loading.ladderCreate" @click="createLadder">新增</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 账单明细抽屉 -->
|
||||
<el-drawer v-model="dlg.detail" :title="detailBill?.settle_no ?? '账单明细'" size="480px">
|
||||
<template v-if="detailBill">
|
||||
<el-descriptions :column="2" border size="small" class="sc-detail">
|
||||
<el-descriptions-item label="账号">{{ detailBill.account_id }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账期">{{ detailBill.period }}</el-descriptions-item>
|
||||
<el-descriptions-item label="成功条数">{{ detailBill.success_count }}</el-descriptions-item>
|
||||
<el-descriptions-item label="金额(元)">{{ detailBill.amount }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-table :data="detailDays" size="small" class="sc-detail-table">
|
||||
<el-table-column prop="day" label="日期" width="120" />
|
||||
<el-table-column prop="success_count" label="成功条数" width="100" />
|
||||
<el-table-column prop="amount" label="金额(元)" />
|
||||
</el-table>
|
||||
</template>
|
||||
</el-drawer>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { onMounted, reactive, ref } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import {
|
||||
settleApi, downloadBill,
|
||||
type ConsumeRow, type BillingOrder, type SettleCustomerBill, type SettleLadder, type BillDayRow,
|
||||
} from '@/api/settle'
|
||||
|
||||
const tab = ref('consume')
|
||||
|
||||
// ---- Tab1 消耗日汇总 ----
|
||||
const cq = reactive<{ account_id: number; range: [string, string] | null }>({ account_id: 0, range: null })
|
||||
const consumeRows = ref<ConsumeRow[]>([])
|
||||
const backfillDate = ref('')
|
||||
const aggMsg = ref('')
|
||||
|
||||
// ---- Tab2 充值订单 ----
|
||||
const oq = reactive<{ account_id: number; pay_status: number | null }>({ account_id: 0, pay_status: null })
|
||||
const orderRows = ref<BillingOrder[]>([])
|
||||
const orderForm = reactive({ account_id: 2, count: 1000, amount: 100, pay_type: 'bank', remark: '' })
|
||||
|
||||
// ---- Tab3 月度结算单 ----
|
||||
const bq = reactive({ period: new Date().toISOString().slice(0, 7) })
|
||||
const billRows = ref<SettleCustomerBill[]>([])
|
||||
const genMsg = ref('')
|
||||
const detailBill = ref<SettleCustomerBill | null>(null)
|
||||
const detailDays = ref<BillDayRow[]>([])
|
||||
|
||||
// ---- Tab4 阶梯 ----
|
||||
const lq = reactive<{ owner_type: string; owner_id: number }>({ owner_type: 'account', owner_id: 0 })
|
||||
const ladderRows = ref<SettleLadder[]>([])
|
||||
const ladderForm = reactive({ owner_type: 'account', owner_id: 2, tier_from: 0, price: 0.05 })
|
||||
|
||||
const dlg = reactive({ order: false, ladder: false, detail: false })
|
||||
const loading = reactive({
|
||||
consume: false, agg: false, orders: false, orderCreate: false,
|
||||
bills: false, gen: false, ladder: false, ladderCreate: false,
|
||||
})
|
||||
|
||||
const payStatusText = (s: number) => ({ 0: '待确认', 1: '已到账', 2: '已驳回' })[s] ?? String(s)
|
||||
const billStatusText = (s: number) => ({ 0: '草稿', 1: '已确认', 2: '已结账' })[s] ?? String(s)
|
||||
|
||||
async function loadConsume() {
|
||||
loading.consume = true
|
||||
try {
|
||||
const params: Record<string, unknown> = { page_size: 50 }
|
||||
if (cq.account_id > 0) params.account_id = cq.account_id
|
||||
if (cq.range) { params.date_from = cq.range[0]; params.date_to = cq.range[1] }
|
||||
const res = await settleApi.consume(params)
|
||||
consumeRows.value = res.list ?? []
|
||||
} catch (e) { ElMessage.error((e as Error).message) } finally { loading.consume = false }
|
||||
}
|
||||
|
||||
async function doAggregate() {
|
||||
loading.agg = true
|
||||
try {
|
||||
const r = await settleApi.aggregate(backfillDate.value || undefined)
|
||||
aggMsg.value = `回补 ${r.day}:账号维度落账 ${r.account_rows} 行 / 通道维度 ${r.channel_rows} 行(幂等 UPSERT)`
|
||||
await loadConsume()
|
||||
} catch (e) { ElMessage.error((e as Error).message) } finally { loading.agg = false }
|
||||
}
|
||||
|
||||
async function loadOrders() {
|
||||
loading.orders = true
|
||||
try {
|
||||
const params: Record<string, unknown> = { page_size: 50 }
|
||||
if (oq.account_id > 0) params.account_id = oq.account_id
|
||||
if (oq.pay_status !== null) params.pay_status = oq.pay_status
|
||||
const res = await settleApi.orders(params)
|
||||
orderRows.value = res.list ?? []
|
||||
} catch (e) { ElMessage.error((e as Error).message) } finally { loading.orders = false }
|
||||
}
|
||||
|
||||
async function createOrder() {
|
||||
loading.orderCreate = true
|
||||
try {
|
||||
const o = await settleApi.createOrder({ ...orderForm })
|
||||
ElMessage.success(`订单 ${o.order_no} 已创建(待确认,余额未动)`)
|
||||
dlg.order = false
|
||||
await loadOrders()
|
||||
} catch (e) { ElMessage.error((e as Error).message) } finally { loading.orderCreate = false }
|
||||
}
|
||||
|
||||
async function confirmOrder(row: BillingOrder) {
|
||||
await ElMessageBox.confirm(`确认订单 ${row.order_no} 到账?账号 ${row.account_id} 余额将 +${row.count}(不可撤销)`, '付款审核确认', { type: 'warning' })
|
||||
try {
|
||||
const r = await settleApi.confirmOrder(row.id)
|
||||
ElMessage.success(`已到账,新余额 ${r.balance}`)
|
||||
await loadOrders()
|
||||
} catch (e) { ElMessage.error((e as Error).message) }
|
||||
}
|
||||
|
||||
async function rejectOrder(row: BillingOrder) {
|
||||
await ElMessageBox.confirm(`驳回订单 ${row.order_no}?不涉及余额`, '驳回', { type: 'warning' })
|
||||
try {
|
||||
await settleApi.rejectOrder(row.id, '验收页驳回')
|
||||
ElMessage.success('已驳回')
|
||||
await loadOrders()
|
||||
} catch (e) { ElMessage.error((e as Error).message) }
|
||||
}
|
||||
|
||||
async function loadBills() {
|
||||
loading.bills = true
|
||||
try {
|
||||
const params: Record<string, unknown> = { page_size: 50 }
|
||||
if (bq.period) params.period = bq.period
|
||||
const res = await settleApi.customerBills(params)
|
||||
billRows.value = res.list ?? []
|
||||
} catch (e) { ElMessage.error((e as Error).message) } finally { loading.bills = false }
|
||||
}
|
||||
|
||||
async function doGenerate() {
|
||||
if (!/^\d{4}-\d{2}$/.test(bq.period)) { ElMessage.warning('账期须为 YYYY-MM'); return }
|
||||
loading.gen = true
|
||||
try {
|
||||
const r = await settleApi.generateCustomer(bq.period)
|
||||
genMsg.value = `账期 ${bq.period}:新建 ${r.generated} / 重算 ${r.recalculated} / 已结跳过 ${r.skipped}`
|
||||
await loadBills()
|
||||
} catch (e) { ElMessage.error((e as Error).message) } finally { loading.gen = false }
|
||||
}
|
||||
|
||||
async function showBillDetail(row: SettleCustomerBill) {
|
||||
try {
|
||||
const res = await settleApi.customerBillDetail(row.id)
|
||||
detailBill.value = res.bill
|
||||
detailDays.value = res.days ?? []
|
||||
dlg.detail = true
|
||||
} catch (e) { ElMessage.error((e as Error).message) }
|
||||
}
|
||||
|
||||
async function confirmBill(row: SettleCustomerBill) {
|
||||
await ElMessageBox.confirm(`确认账单 ${row.settle_no}(金额 ${row.amount} 元)?`, '确认账单', { type: 'warning' })
|
||||
try {
|
||||
await settleApi.confirmCustomerBill(row.id)
|
||||
ElMessage.success('已确认')
|
||||
await loadBills()
|
||||
} catch (e) { ElMessage.error((e as Error).message) }
|
||||
}
|
||||
|
||||
async function settleBill(row: SettleCustomerBill) {
|
||||
await ElMessageBox.confirm(`结账 ${row.settle_no}(金额 ${row.amount} 元)?写入结账记录并锁定终态`, '结账', { type: 'warning' })
|
||||
try {
|
||||
await settleApi.settleCustomerBill(row.id, 'bank')
|
||||
ElMessage.success('已结账(SettleRecord 已写入)')
|
||||
await loadBills()
|
||||
} catch (e) { ElMessage.error((e as Error).message) }
|
||||
}
|
||||
|
||||
async function exportBill(row: SettleCustomerBill) {
|
||||
try {
|
||||
await downloadBill(settleApi.exportCustomerBill(row.id), `${row.settle_no}.xlsx`)
|
||||
ElMessage.success('XLSX 已下载')
|
||||
} catch (e) { ElMessage.error((e as Error).message) }
|
||||
}
|
||||
|
||||
async function loadLadders() {
|
||||
loading.ladder = true
|
||||
try {
|
||||
ladderRows.value = await settleApi.ladders(lq.owner_type || undefined, lq.owner_id > 0 ? lq.owner_id : undefined)
|
||||
} catch (e) { ElMessage.error((e as Error).message) } finally { loading.ladder = false }
|
||||
}
|
||||
|
||||
async function createLadder() {
|
||||
loading.ladderCreate = true
|
||||
try {
|
||||
await settleApi.createLadder({ ...ladderForm })
|
||||
ElMessage.success('档位已新增(重算账单即生效)')
|
||||
dlg.ladder = false
|
||||
await loadLadders()
|
||||
} catch (e) { ElMessage.error((e as Error).message) } finally { loading.ladderCreate = false }
|
||||
}
|
||||
|
||||
async function removeLadder(row: SettleLadder) {
|
||||
await ElMessageBox.confirm(`删除档位 ${row.owner_type}#${row.owner_id} tier_from=${row.tier_from}?`, '删除档位', { type: 'warning' })
|
||||
try {
|
||||
await settleApi.deleteLadder(row.id)
|
||||
ElMessage.success('已删除')
|
||||
await loadLadders()
|
||||
} catch (e) { ElMessage.error((e as Error).message) }
|
||||
}
|
||||
|
||||
onMounted(() => { loadConsume(); loadOrders(); loadBills(); loadLadders() })
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.sc-card { padding: 16px 20px; }
|
||||
.sc-head { display: flex; align-items: baseline; justify-content: space-between; gap: 12px; flex-wrap: wrap; margin-bottom: 4px; }
|
||||
.sc-badge { margin-left: 8px; }
|
||||
.sc-sub { color: var(--gosms-text-muted); font-size: var(--gosms-fs-base); }
|
||||
.sc-tabs { margin-top: 8px; }
|
||||
.sc-filters { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin-bottom: 10px; }
|
||||
.sc-aggmsg { margin-top: 10px; }
|
||||
.sc-done { color: var(--gosms-text-muted); font-size: 12px; }
|
||||
.sc-detail { margin-bottom: 12px; }
|
||||
.sc-detail-table { width: 100%; }
|
||||
</style>
|
||||
Reference in New Issue
Block a user