Bladeren bron

feat: 在交易管理中增加收款对账页面和差异明细

yonge 1 uur geleden
bovenliggende
commit
c6881979c8

+ 18 - 0
src/api/receiptReconcile.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+function scopedRequest(action, method, billDate, allowDispatch) {
+  return request({ url: '/api-web/receiptReconcile/' + action, method, params: { billDate },
+    transformRequest(data, headers) {
+      if (!allowDispatch(headers.tenantId)) throw new Error('机构或查询条件已变化,请重新确认。')
+      return data
+    }
+  })
+}
+
+export function getReceiptResult(billDate, allowDispatch) {
+  return scopedRequest('result', 'get', billDate, allowDispatch)
+}
+
+export function runReceiptReconcile(billDate, allowDispatch) {
+  return scopedRequest('run', 'post', billDate, allowDispatch)
+}

+ 1 - 0
src/layout/components/Navbar.vue

@@ -647,6 +647,7 @@ export default {
               "tenantConfig",
               JSON.stringify(tenantConfig)
             );
+            this.$bus.$emit("tenant-changed");
             this.$router.push({
               path: "/redirect",
               query: this.$route.fullPath

+ 1 - 0
src/layout/components/Sidebar/SidebarItem.vue

@@ -128,6 +128,7 @@ export default {
       // When there is only one child router, the child router is displayed by default
 
       if (showingChildren.length === 1) {
+        if (parent.meta && parent.meta.keepReceiptHierarchy) return false;
         let filterRouter = ['/commentManagerWrap', 'teamMananger', '/vipManager', '/accompanyManager']
         let tempOnlyChild = this.onlyOneChild
         // 如果包含上面几个菜单,并且只有一个

+ 2 - 0
src/router/index.js

@@ -200,6 +200,8 @@ export const asyncRoutes = {
   studentDetail: () => import("@/views/studentManager/index"),
   // 订单管理
   orderList: () => import("@/views/businessManager/orderManager/index"),
+  receiptReconcileGroup: { name: "receiptReconcileGroup", render: createElement => createElement("router-view") },
+  receiptReconcile: () => import("@/views/businessManager/orderManager/receiptReconcile"),
   // 订单列表
   income: () => import("@/views/businessManager/orderManager/income"),
   incomeOne: () => import("@/views/businessManager/orderManager/incomeOne"),

+ 7 - 0
src/store/modules/permission.js

@@ -22,6 +22,13 @@ function generateAsyncRouter(asyncRoutes, data) {
     if (item.children && item.children.length > 0) {
       generateAsyncRouter(asyncRoutes, item.children);
     }
+    if (item.name === "receiptReconcileGroup") {
+      const leaf = (item.children || []).find(child => child.name === "receiptReconcile" && !child.hidden);
+      item.redirect = leaf ? (checkPathUrl(leaf.path) ? leaf.path : { name: leaf.name }) : "/403";
+      if (leaf) item.meta.keepReceiptHierarchy = true;
+    } else if (item.children && item.children.some(child => !child.hidden && child.meta.keepReceiptHierarchy)) {
+      item.meta.keepReceiptHierarchy = true;
+    }
   });
   return data;
 }

+ 236 - 0
src/views/businessManager/orderManager/receiptReconcile.vue

@@ -0,0 +1,236 @@
+<template>
+  <main class="receipt-page">
+    <header><h1>收款对账</h1><el-tag v-if="result" :type="statusColor">{{ labels[result.status] }}</el-tag></header>
+    <p class="muted">按当前机构核对汇付、支付宝和微信的成功收款,不含退款。</p>
+    <div class="toolbar">
+      <span>当前机构:<strong>{{ tenantName || '未选择' }}</strong></span>
+      <label>账单日期 <el-date-picker v-model="billDate" type="date" value-format="yyyy-MM-dd" :clearable="false" :editable="false" size="small" /></label>
+      <el-button v-if="scopeBlocked" size="small" @click="refreshTenant">重新确认机构</el-button>
+      <el-button v-else size="small" :disabled="!canRequest || !!busy" @click="load(false)">查询已存结果</el-button>
+      <el-button size="small" type="primary" :disabled="!canRequest || !!busy" @click="load(true)">重新取账并核对</el-button>
+    </div>
+    <p v-if="!result" class="notice" role="status">{{ notice }}</p>
+    <template v-else>
+      <section class="panel">
+        <div class="metrics">
+          <div><span>系统成功收款</span><strong>{{ money(result.systemAmount) }}</strong><small>{{ count(result.systemCount) }}</small></div>
+          <div><span>第三方实际收款</span><strong>{{ money(complete ? result.thirdAmount : null) }}</strong><small>{{ complete ? count(result.thirdCount) : '账单未齐,不展示合计' }}</small></div>
+          <div><span>差异组数</span><strong>{{ complete && result.differenceCount != null ? result.differenceCount + ' 组' : '—' }}</strong><small>同组多条记录只计一次</small></div>
+        </div>
+        <div class="summary" role="status">{{ labels[result.status] }} · 最近核对:{{ result.checkedAt || '—' }}</div>
+      </section>
+      <section class="panel">
+        <h2>渠道核对</h2>
+        <div class="scroll"><table><thead><tr><th>渠道</th><th>取账状态</th><th>系统成功收款</th><th>第三方实际收款</th><th>可提现余额 / 快照时间</th><th>核查</th></tr></thead>
+          <tbody><tr v-for="row in result.channels" :key="row.channel">
+            <th>{{ labels[row.channel] }}</th><td>{{ channelStatuses[row.status] }}<small v-if="row.message">{{ row.message }}</small></td>
+            <td>{{ money(row.systemAmount) }}<small>{{ count(row.systemCount) }}</small></td>
+            <td>{{ money(row.status === 'READY' ? row.thirdAmount : null) }}<small>{{ count(row.status === 'READY' ? row.thirdCount : null) }}</small></td>
+            <td>{{ money(row.availableBalance) }}<small>{{ row.balanceTime || '—' }}</small></td>
+            <td><el-button v-if="result.differences.some(item => involves(item, row.channel))" type="text" @click="showChannel(row.channel)">查看差异</el-button><span v-else>{{ row.status === 'READY' && complete ? '无差异' : '待核对' }}</span></td>
+          </tr></tbody>
+        </table></div>
+      </section>
+      <section ref="details" class="panel">
+        <h2>差异明细</h2>
+        <div class="filters"><el-select v-model="channel" size="small" aria-label="筛选渠道"><el-option label="全部渠道" value="" /><el-option v-for="key in channelKeys" :key="key" :label="labels[key]" :value="key" /></el-select>
+          <el-input v-model.trim="search" size="small" clearable placeholder="搜索订单号或流水号" />
+        </div>
+        <div class="scroll"><table><thead><tr><th>商户订单号</th><th>差异类型</th><th>系统渠道 / 金额</th><th>三方渠道 / 金额</th><th>操作</th></tr></thead>
+          <tbody><tr v-for="(row, index) in pagedDifferences" :key="index">
+            <td>{{ orderLabel(row) }}</td><td>{{ labels[row.type] }}</td>
+            <td v-for="side in sides" :key="side.key">{{ sideLabel(entries(row, side.key)) }}</td>
+            <td><el-button type="text" @click="detail = row">详情</el-button></td>
+          </tr><tr v-if="!filtered.length"><td colspan="5" class="empty">{{ channel || search ? '当前筛选下没有差异记录' : complete ? '没有待核查的差异' : '取账未完成,暂无可展示的差异' }}</td></tr></tbody>
+        </table></div>
+        <el-pagination v-if="filtered.length > pageSize" :current-page.sync="pageNumber" :page-size="pageSize" :total="filtered.length" layout="prev, pager, next" />
+      </section>
+      <el-dialog v-if="detail" title="差异详情" :visible="true" width="min(720px, 94%)" @close="detail = null">
+        <p>{{ tenantName }} · {{ billDate }} · {{ labels[detail.type] }}</p>
+        <div class="columns"><div v-for="side in sides" :key="side.key"><h3>{{ side.title }}</h3>
+          <dl v-for="(entry, index) in entries(detail, side.key)" :key="index"><template v-for="field in fields"><dt :key="field.key + 'Label'">{{ field.title }}</dt><dd :key="field.key">{{ entryValue(entry, field.key) }}</dd></template></dl>
+          <p v-if="!entries(detail, side.key).length" class="muted">无对应记录</p>
+        </div></div><p class="summary">差异原因:{{ detail.reason || '—' }}</p>
+      </el-dialog>
+    </template>
+  </main>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+import { getTenantId } from '@/utils/auth'
+import { getReceiptResult, runReceiptReconcile } from '@/api/receiptReconcile'
+
+const labels = {
+  MATCHED: '已对平', DIFFERENT: '有差异', INCOMPLETE: '取账未完成', HUIFU: '汇付', ALIPAY: '支付宝', WECHAT: '微信',
+  UNKNOWN: '未知渠道', SYSTEM_ONLY: '仅系统有', THIRD_ONLY: '仅第三方有',
+  AMOUNT: '金额不一致', CHANNEL: '渠道不一致', AMBIGUOUS: '匹配不唯一'
+}
+
+function readScope() {
+  try {
+    const config = JSON.parse(sessionStorage.getItem('tenantConfig') || '{}')
+    const id = String(config.tenantId || 0)
+    if (id !== String(getTenantId() || 0) || !/^(0|[1-9]\d*)$/.test(id)) return null
+    return { id, name: id === '0' ? '' : config.tenantName || '机构 ' + id }
+  } catch (error) {
+    return null
+  }
+}
+
+export default {
+  name: 'receiptReconcile',
+  data() {
+    return {
+      labels, channelStatuses: { READY: '已取得', NOT_READY: '未就绪', ERROR: '取账失败', UNKNOWN: '无法判定渠道' },
+      sides: [{ key: 'system', title: '系统成功订单' }, { key: 'third', title: '第三方交易记录' }],
+      fields: [{ key: 'id', title: '记录编号' }, { key: 'orderNo', title: '商户订单号' }, { key: 'tradeNo', title: '交易流水号' }, { key: 'channel', title: '渠道' }, { key: 'time', title: '收款时间' }, { key: 'description', title: '项目说明' }, { key: 'amount', title: '金额' }],
+      billDate: dayjs().subtract(1, 'day').format('YYYY-MM-DD'), tenantId: null, tenantName: '', sequence: 0,
+      result: null, busy: '', error: '', scopeBlocked: false, channel: '', search: '', detail: null, pageNumber: 1, pageSize: 20
+    }
+  },
+  computed: {
+    channelKeys() {
+      const keys = ['HUIFU', 'ALIPAY', 'WECHAT']
+      if (this.result && (this.result.channels.some(row => row.channel === 'UNKNOWN') ||
+        this.result.differences.some(row => this.involves(row, 'UNKNOWN')))) keys.push('UNKNOWN')
+      return keys
+    },
+    canRequest() { return Number(this.tenantId) > 0 && !!this.billDate },
+    complete() { return this.result && this.result.status !== 'INCOMPLETE' },
+    statusColor() { return { MATCHED: 'success', DIFFERENT: 'danger', INCOMPLETE: 'warning' }[this.result.status] },
+    notice() {
+      if (this.scopeBlocked) return '当前管理机构信息不一致,已停止对账并清空结果。请完成机构切换后点击“重新确认机构”。'
+      if (!this.canRequest) return '请先选择当前管理机构和账单日期。'
+      return this.busy || this.error || '该日期尚未运行对账。可点击“重新取账并核对”获取结果。'
+    },
+    filtered() {
+      if (!this.result) return []
+      const term = this.search.toLowerCase()
+      return this.result.differences.filter(row => (!this.channel || this.involves(row, this.channel)) &&
+        (!term || this.allEntries(row).some(entry => [entry.orderNo, entry.tradeNo].some(value => String(value || '').toLowerCase().includes(term)))))
+    },
+    pagedDifferences() {
+      const start = (this.pageNumber - 1) * this.pageSize
+      return this.filtered.slice(start, start + this.pageSize)
+    }
+  },
+  watch: {
+    billDate() { this.load(false) },
+    channel() { this.pageNumber = 1 },
+    search() { this.pageNumber = 1 }
+  },
+  created() {
+    this.$bus.$on('tenant-changed', this.refreshTenant)
+    this.refreshTenant()
+  },
+  beforeDestroy() {
+    this.sequence++
+    this.$bus.$off('tenant-changed', this.refreshTenant)
+  },
+  methods: {
+    money(value) { return value == null || value === '' || !Number.isFinite(Number(value)) ? '—' : '¥' + Number(value).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }) },
+    count(value) { return value == null ? '—' : value + ' 笔' },
+    entryValue(entry, key) {
+      if (key === 'amount') return this.money(entry.amount)
+      if (key === 'channel') return labels[entry.channel] || '—'
+      return entry[key] == null || entry[key] === '' ? '—' : entry[key]
+    },
+    entries(row, side) {
+      const group = row[side + 'Entries']
+      return Array.isArray(group) && group.length ? group : row[side] ? [row[side]] : []
+    },
+    allEntries(row) { return this.entries(row, 'system').concat(this.entries(row, 'third')) },
+    orderLabel(row) {
+      const orders = [...new Set(this.allEntries(row).map(entry => entry.orderNo).filter(Boolean))]
+      return orders.length > 1 ? orders[0] + ' 等 ' + orders.length + ' 个单号' : orders[0] || '—'
+    },
+    sideLabel(entries) {
+      if (entries.length > 1) return entries.length + ' 条候选记录'
+      return entries.length ? (labels[entries[0].channel] || '—') + ' / ' + this.money(entries[0].amount) : '—'
+    },
+    involves(row, channel) { return this.allEntries(row).some(entry => entry.channel === channel) },
+    showChannel(channel) {
+      this.pageNumber = 1
+      this.channel = channel
+      this.search = ''
+      this.$refs.details.scrollIntoView({ block: 'start' })
+    },
+    clearResults() {
+      this.sequence++
+      this.result = null
+      this.detail = null
+      this.pageNumber = 1
+      this.channel = this.search = this.error = this.busy = ''
+    },
+    blockScope() {
+      this.clearResults()
+      this.scopeBlocked = true
+      this.tenantId = null
+      this.tenantName = ''
+    },
+    refreshTenant() {
+      const scope = readScope()
+      if (!scope) return this.blockScope()
+      this.scopeBlocked = false
+      this.tenantId = scope.id
+      this.tenantName = scope.name
+      return this.load(false)
+    },
+    async load(run) {
+      if (this.scopeBlocked) return
+      const scope = readScope()
+      if (!scope || scope.id !== this.tenantId) return this.blockScope()
+      if (run && this.busy) return
+      this.clearResults()
+      if (!this.canRequest) return
+      const sequence = this.sequence, date = this.billDate, tenant = scope.id
+      this.busy = run ? '正在取账并核对…' : '正在查询已保存结果…'
+      const current = () => {
+        if (sequence !== this.sequence || date !== this.billDate) return false
+        const active = readScope()
+        if (active && active.id === tenant) return true
+        this.blockScope()
+        return false
+      }
+      const allowDispatch = headerTenant => {
+        if (!current()) return false
+        if (String(headerTenant) === tenant) return true
+        this.blockScope()
+        return false
+      }
+      try {
+        const response = await (run ? runReceiptReconcile : getReceiptResult)(date, allowDispatch)
+        if (!current()) return
+        if (!response || Number(response.code) !== 200) throw new Error()
+        const data = response.data
+        if (!run && data === null) return
+        if (!data || String(data.tenantId) !== tenant || data.billDate !== date || !['MATCHED', 'DIFFERENT', 'INCOMPLETE'].includes(data.status) || !Array.isArray(data.channels) || !Array.isArray(data.differences)) throw new Error()
+        this.result = data
+      } catch (error) {
+        if (current()) this.error = run ? '本次对账未取得有效结果,请查询已存结果或重试。' : '未能读取该机构该日期的结果,请重新查询。'
+      } finally {
+        if (sequence === this.sequence) this.busy = ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.receipt-page { padding: 24px; color: #263746; background: #f5f7fa; min-height: 100%; font-size: 14px; }
+header, .toolbar, .filters { display: flex; align-items: center; flex-wrap: wrap; gap: 12px; }
+h1 { margin: 0; font-size: 24px; } h2 { margin: 0 0 16px; font-size: 17px; } h3 { font-size: 15px; }
+.muted, small, dt { color: #586b79; } .toolbar { margin: 22px 0; } .toolbar .el-button { margin: 0; }
+.panel, .notice { background: white; padding: 20px; margin: 14px 0; border: 1px solid #dfe5eb; border-radius: 6px; }
+.metrics, .columns { display: grid; grid-template-columns: repeat(3, 1fr); gap: 18px; }
+.metrics strong { display: block; font-size: 24px; margin: 8px 0; font-variant-numeric: tabular-nums; }
+.summary { background: #f0f5f8; margin: 16px 0 0; padding: 10px 14px; line-height: 1.6; }
+.scroll { overflow-x: auto; } table { width: 100%; border-collapse: collapse; font-variant-numeric: tabular-nums; }
+td, th { padding: 12px 10px; border-bottom: 1px solid #e7ebef; text-align: left; overflow-wrap: anywhere; min-width: 90px; }
+thead { background: #f6f8fa; } small { display: block; margin-top: 4px; } .empty { text-align: center; color: #586b79; }
+.filters { margin-bottom: 12px; } .filters .el-input { max-width: 260px; } .columns { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+dl { display: grid; grid-template-columns: auto 1fr; gap: 8px; } dd { margin: 0; overflow-wrap: anywhere; }
+dl + dl { padding-top: 12px; border-top: 1px solid #dfe5eb; }
+@media (max-width: 700px) { .receipt-page { padding: 12px; } .metrics, .columns { grid-template-columns: 1fr; } }
+</style>

+ 231 - 0
tests/unit/components/receiptReconcile.spec.js

@@ -0,0 +1,231 @@
+import Vue from 'vue'
+import { createLocalVue, mount } from '@vue/test-utils'
+import ElementUI from 'element-ui'
+import axios from 'axios'
+import { getTenantId } from '@/utils/auth'
+import request from '@/utils/request'
+import Page from '@/views/businessManager/orderManager/receiptReconcile.vue'
+import { asyncRoutes } from '@/router'
+
+jest.mock('@/utils/request', () => jest.fn())
+jest.mock('@/utils/auth', () => ({ getTenantId: jest.fn() }))
+jest.mock('@/layout', () => ({}))
+
+const localVue = createLocalVue()
+localVue.use(ElementUI)
+const flush = () => new Promise(resolve => setTimeout(resolve, 0))
+const tenant = id => sessionStorage.setItem('tenantConfig', JSON.stringify({ tenantId: id, tenantName: '机构' + id }))
+const response = data => ({ code: 200, data })
+const result = (billDate, overrides = {}) => ({ billDate, tenantId: 1, checkedAt: '18:00', status: 'MATCHED', systemCount: 0, systemAmount: 0, thirdCount: 0, thirdAmount: 0, differenceCount: 0, channels: [], differences: [], ...overrides })
+const pending = () => {
+  let resolve, reject
+  const promise = new Promise((done, fail) => { resolve = done; reject = fail })
+  return { resolve, reject, promise }
+}
+let wrapper, bus
+function open() {
+  bus = new Vue()
+  wrapper = mount(Page, { localVue, mocks: { $bus: bus }, stubs: { 'el-date-picker': true, transition: false } })
+  return wrapper.vm
+}
+beforeEach(() => { request.mockReset(); getTenantId.mockReset().mockImplementation(jest.requireActual('@/utils/auth').getTenantId); tenant(1) })
+afterEach(() => { if (wrapper) wrapper.destroy(); wrapper = null; sessionStorage.clear() })
+
+test('menu group renders only the child route outlet and the child key resolves to the receipt page', async() => {
+  const createElement = jest.fn()
+  asyncRoutes.receiptReconcileGroup.render(createElement)
+  expect(createElement.mock.calls).toEqual([['router-view']])
+  expect((await asyncRoutes.receiptReconcile()).default).toBe(Page)
+})
+
+test('reads saved results without running, runs with only billDate and prevents duplicate submissions', async() => {
+  request.mockResolvedValueOnce(response(null))
+  const page = open()
+  await flush()
+  expect(wrapper.text()).toContain('尚未运行')
+  const deferred = pending()
+  request.mockReturnValueOnce(deferred.promise)
+  wrapper.findAll('button').wrappers.find(button => button.text() === '重新取账并核对').trigger('click')
+  page.load(true)
+  expect(request.mock.calls.map(([config]) => [config.method, config.url, config.params, config.data, config.headers])).toEqual([
+    ['get', '/api-web/receiptReconcile/result', { billDate: page.billDate }, undefined, undefined],
+    ['post', '/api-web/receiptReconcile/run', { billDate: page.billDate }, undefined, undefined]
+  ])
+  deferred.resolve(response(result(page.billDate)))
+  await flush()
+  expect(wrapper.text()).toContain('已对平')
+  expect(wrapper.text()).toContain('¥0.00')
+})
+
+test('incomplete totals, failed bills and unknown balances do not render as zero', async() => {
+  request.mockImplementation(({ params }) => Promise.resolve(response(result(params.billDate, { status: 'INCOMPLETE', thirdAmount: null, thirdCount: null, differenceCount: null,
+    channels: [{ channel: 'WECHAT', status: 'ERROR', message: '账单暂不可用', systemCount: 0, systemAmount: 0, thirdCount: 0, thirdAmount: 0, availableBalance: null, balanceTime: null }] }))))
+  open(); await flush()
+  expect(wrapper.find('.metrics').findAll('strong').wrappers.map(item => item.text())).toEqual(['¥0.00', '—', '—'])
+  const cells = wrapper.find('tbody tr').findAll('td')
+  expect(cells.at(0).text()).toContain('账单暂不可用')
+  expect(cells.at(2).text()).not.toMatch(/0/)
+  expect(cells.at(3).text()).not.toMatch(/0/)
+  expect(wrapper.text()).toContain('取账未完成')
+})
+
+test('channel drilldown matches either side; tenant switch clears open details and rejects stale requests', async() => {
+  const entry = { channel: 'HUIFU', orderNo: 'OLD-ORDER', amount: 12 }
+  const row = { type: 'CHANNEL', reason: '双方渠道不同', system: entry, third: { ...entry, channel: 'ALIPAY' } }
+  request.mockImplementationOnce(({ params }) => Promise.resolve(response(result(params.billDate, { status: 'DIFFERENT', differenceCount: 1, differences: [row], channels: [{ channel: 'ALIPAY', status: 'READY' }] }))))
+  const page = open(); await flush()
+  page.$refs.details.scrollIntoView = jest.fn()
+  wrapper.find('tbody button').trigger('click'); await Vue.nextTick()
+  expect(page.channel).toBe('ALIPAY')
+  wrapper.findAll('button').wrappers.find(button => button.text() === '详情').trigger('click'); await Vue.nextTick()
+  expect(wrapper.find('[role="dialog"]').text()).toContain('双方渠道不同')
+  const late = pending()
+  request.mockReturnValueOnce(late.promise)
+  tenant(2); bus.$emit('tenant-changed'); await Vue.nextTick()
+  expect(page.detail).toBeNull()
+  expect(wrapper.text()).not.toContain('OLD-ORDER')
+  request.mockResolvedValueOnce(response(null))
+  tenant(3); bus.$emit('tenant-changed'); await flush()
+  late.resolve(response(result(page.billDate, { tenantId: 2, differences: [row] }))); await flush()
+  expect(wrapper.text()).toContain('机构3')
+  expect(wrapper.text()).not.toContain('OLD-ORDER')
+  expect(page.result).toBeNull()
+})
+
+test('changed date discards late results; rejection and wrong-scope responses never look like an empty result', async() => {
+  const late = pending()
+  request.mockReturnValueOnce(late.promise).mockRejectedValueOnce(new Error('network'))
+  const page = open(), oldDate = page.billDate
+  await wrapper.setData({ billDate: '2025-01-01' }); await flush()
+  late.resolve(response(result(oldDate))); await flush()
+  expect(wrapper.text()).toContain('未能读取')
+  for (const invalid of [response(result(oldDate)), response(result(page.billDate, { tenantId: 2 })), { code: 100, data: null }]) {
+    request.mockResolvedValueOnce(invalid)
+    await page.load(false)
+    expect(page.result).toBeNull(); expect(page.notice).toContain('未能读取')
+  }
+})
+
+test('missing management tenant never sends a read or run', async() => {
+  sessionStorage.clear()
+  const page = open(); await page.load(true)
+  expect(request).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('请先选择')
+})
+
+test('persistent tenant disagreement or corrupt storage blocks all reads and runs until explicit recovery', async() => {
+  getTenantId.mockReturnValue(2)
+  const page = open()
+  const confirm = () => wrapper.findAll('button').wrappers.find(button => button.text() === '重新确认机构').trigger('click')
+  expect(page.notice).toContain('机构信息不一致')
+  expect(page.tenantName).toBe('')
+  expect(wrapper.find('.el-button--primary').element.disabled).toBe(true)
+  await page.load(true); await confirm()
+  sessionStorage.setItem('tenantConfig', '{'); bus.$emit('tenant-changed')
+  expect(page.notice).toContain('机构信息不一致')
+  tenant(2); await page.load(true)
+  expect(request).not.toHaveBeenCalled()
+  request.mockResolvedValueOnce(response(null)); await confirm(); await flush()
+  expect(request.mock.calls.map(([config]) => config.method)).toEqual(['get'])
+  expect(wrapper.text()).toContain('机构2'); expect(page.notice).toContain('尚未运行')
+})
+
+test('run after an unannounced switch clears prior result, dialog, filters and tenant instead of running for either tenant', async() => {
+  const row = { type: 'SYSTEM_ONLY', system: { channel: 'ALIPAY', orderNo: 'OLD-ORDER' } }
+  request.mockImplementationOnce(({ params }) => Promise.resolve(response(result(params.billDate, { differences: [row] }))))
+  const page = open(); await flush()
+  await wrapper.setData({ detail: row, channel: 'ALIPAY', search: 'OLD' }); expect(wrapper.find('[role="dialog"]').exists()).toBe(true)
+  tenant(2); await page.load(true); await Vue.nextTick()
+  expect(request).toHaveBeenCalledTimes(1)
+  expect([page.result, page.detail, page.tenantId]).toEqual([null, null, null])
+  expect([page.busy, page.channel, page.search, page.tenantName]).toEqual(['', '', '', ''])
+  expect(wrapper.text()).not.toContain('OLD-ORDER'); expect(page.notice).toContain('机构信息不一致')
+})
+
+test.each(['resolve', 'reject'])('scope drift on %s clears busy without waiting for a tenant event', async settlement => {
+  const late = pending(); request.mockReturnValueOnce(late.promise)
+  const page = open(); getTenantId.mockReturnValue(2)
+  late[settlement](settlement === 'resolve' ? response(result(page.billDate)) : new Error('network')); await flush()
+  expect(page.result).toBeNull(); expect(page.busy).toBe(''); expect(page.notice).toContain('机构信息不一致')
+  expect(request).toHaveBeenCalledTimes(1)
+})
+
+test('A → inconsistent → B → A: late B rejection and first A success cannot replace the newest A result', async() => {
+  const first = pending(), middle = pending()
+  request.mockReturnValueOnce(first.promise).mockReturnValueOnce(middle.promise)
+  const page = open(); getTenantId.mockReturnValue(2); bus.$emit('tenant-changed')
+  expect(page.scopeBlocked).toBe(true)
+  tenant(2); bus.$emit('tenant-changed')
+  const latest = result(page.billDate, { systemAmount: 123 })
+  request.mockResolvedValueOnce(response(latest)); tenant(1); getTenantId.mockReturnValue(1); bus.$emit('tenant-changed'); await flush()
+  first.resolve(response(result(page.billDate))); middle.reject(new Error('old')); await flush()
+  expect(page.result).toEqual(latest); expect(page.error).toBe(''); expect(page.scopeBlocked).toBe(false)
+})
+
+test('axios rejects a queued POST before transport if the interceptor has supplied another tenant header', async() => {
+  request.mockResolvedValueOnce(response(null))
+  const page = open(); await flush()
+  const adapter = jest.fn()
+  request.mockImplementationOnce(config => axios.request({ ...config, adapter, headers: { tenantId: 2 } }))
+  await page.load(true)
+  expect(adapter).not.toHaveBeenCalled(); expect(page.notice).toContain('机构信息不一致'); expect(page.busy).toBe('')
+})
+
+test('paginates filtered groups locally, searches across pages and resets on filter or refresh', async() => {
+  const entry = index => ({ orderNo: 'ORDER-' + index, channel: index === 20 ? 'ALIPAY' : 'WECHAT' })
+  const differences = Array.from({ length: 20 }, (_, index) => ({ type: 'SYSTEM_ONLY', system: entry(index) }))
+  differences.push({ type: 'AMBIGUOUS', systemEntries: [entry(20), entry(21)] })
+  request.mockImplementation(({ params }) => Promise.resolve(response(result(params.billDate, { status: 'DIFFERENT', differenceCount: 21, differences }))))
+  const page = open(); await flush()
+  const rows = () => wrapper.findAll('table').at(1).findAll('tbody tr')
+  expect(rows()).toHaveLength(20); await wrapper.find('.btn-next').trigger('click'); await Vue.nextTick()
+  expect(rows()).toHaveLength(1); expect(rows().at(0).text()).toContain('匹配不唯一')
+  await wrapper.setData({ channel: 'ALIPAY' }); expect(page.pageNumber).toBe(1); expect(rows()).toHaveLength(1)
+  await wrapper.setData({ channel: '' }); await wrapper.find('.btn-next').trigger('click'); await Vue.nextTick()
+  await wrapper.setData({ search: 'ORDER-21' }); expect(page.pageNumber).toBe(1); expect(rows().at(0).text()).toContain('匹配不唯一')
+  expect(wrapper.find('.el-pagination').exists()).toBe(false); expect(request).toHaveBeenCalledTimes(1)
+  await wrapper.setData({ search: '' }); await wrapper.find('.btn-next').trigger('click'); await Vue.nextTick()
+  await page.load(false); await Vue.nextTick(); expect(page.pageNumber).toBe(1); expect(rows()).toHaveLength(20)
+})
+
+test('unknown channel summary gets a distinct status and filter, removed on a subsequent known-only result', async() => {
+  const unknown = { channel: 'UNKNOWN', status: 'UNKNOWN', systemCount: 1, systemAmount: 24, thirdCount: null, thirdAmount: null }
+  request.mockImplementationOnce(({ params }) => Promise.resolve(response(result(params.billDate, { channels: [unknown] }))))
+  const page = open(); await flush()
+  const row = wrapper.find('tbody tr')
+  expect(row.find('th').text()).toBe('未知渠道')
+  expect(row.find('td').text()).toBe('无法判定渠道')
+  expect(row.findAll('td').at(2).text()).not.toMatch(/0/)
+  const options = () => wrapper.findAll({ name: 'ElOption' }).wrappers.map(option => option.props('label'))
+  expect(options()).toContain('未知渠道')
+  await wrapper.setData({ channel: 'UNKNOWN' })
+  request.mockResolvedValueOnce(response(result(page.billDate)))
+  await page.load(false); await Vue.nextTick()
+  expect(options()).not.toContain('未知渠道'); expect(page.channel).toBe('')
+})
+
+test('unknown filter matches individual system records and ambiguous candidates without including known-only groups', async() => {
+  const unknown = { channel: 'UNKNOWN', orderNo: 'U1', amount: 24 }
+  const known = { channel: 'WECHAT', orderNo: 'W1', amount: 12 }
+  const differences = [{ type: 'SYSTEM_ONLY', system: unknown }, { type: 'AMBIGUOUS', systemEntries: [known, unknown] }, { type: 'SYSTEM_ONLY', system: known }]
+  request.mockImplementationOnce(({ params }) => Promise.resolve(response(result(params.billDate, { differences }))))
+  const page = open(); await flush()
+  const option = wrapper.findAll({ name: 'ElOption' }).wrappers.find(option => option.props('value') === 'UNKNOWN')
+  option.trigger('click'); await Vue.nextTick()
+  expect(page.filtered).toEqual(differences.slice(0, 2))
+  expect(wrapper.findAll('table').at(1).text()).toContain('未知渠道 / ¥24.00')
+})
+
+test('ambiguous candidates remain one group and every candidate is searchable and visible in details', async() => {
+  const item = (id, channel) => ({ channel, id, orderNo: 'ORDER-' + id, tradeNo: 'TRADE-' + id, amount: 10 })
+  const systemEntries = [item('S1', 'WECHAT'), item('S2', 'ALIPAY')]
+  const thirdEntries = [item('T1', 'HUIFU'), item('T2', 'ALIPAY')]
+  const group = { type: 'AMBIGUOUS', reason: '多条记录匹配', system: systemEntries[0], third: null, systemEntries, thirdEntries }
+  request.mockImplementationOnce(({ params }) => Promise.resolve(response(result(params.billDate, { status: 'DIFFERENT', differenceCount: 1, differences: [group] }))))
+  const page = open(); await flush()
+  expect(wrapper.find('.metrics').text()).toContain('1 组')
+  await wrapper.setData({ channel: 'ALIPAY', search: 'trade-t2' })
+  expect(page.filtered).toHaveLength(1)
+  wrapper.findAll('button').wrappers.find(button => button.text() === '详情').trigger('click'); await Vue.nextTick()
+  expect(wrapper.findAll('[role="dialog"] dl')).toHaveLength(4)
+  for (const entry of [...systemEntries, ...thirdEntries]) expect(wrapper.find('[role="dialog"]').text()).toContain(entry.tradeNo)
+})

+ 65 - 0
tests/unit/components/receiptReconcileMenu.spec.js

@@ -0,0 +1,65 @@
+import { mount } from '@vue/test-utils'
+import Router from 'vue-router'
+import { getSilder } from '@/api/silder'
+import permission from '@/store/modules/permission'
+import SidebarItem from '@/layout/components/Sidebar/SidebarItem.vue'
+
+jest.mock('@/api/silder', () => ({ getSilder: jest.fn() }))
+jest.mock('@/store', () => ({}))
+jest.mock('@/layout', () => ({}))
+jest.mock('path', () => jest.requireActual('path').posix)
+
+const menu = (component, path, name, sysMenus = [], hid = 0) => ({ component, path, name, sysMenus, hid, type: 0 })
+const receipt = () => menu('receiptReconcile', '/receiptReconcile', '收款对账')
+const group = children => menu('receiptReconcileGroup', '/receiptReconcileGroup', '对账管理', children)
+const parent = children => menu('orderManager', '/trade', '交易管理', children)
+
+async function routesFor(branch) {
+  getSilder.mockResolvedValueOnce({ code: 200, data: [menu('Layout', '/top', '业务', [branch])] })
+  return permission.actions.generateRoutes.call({ dispatch: jest.fn() }, { commit: jest.fn() })
+}
+
+function renderBranch(item) {
+  const router = new Router({ mode: 'abstract' })
+  router.push('/top')
+  return mount(SidebarItem, { router, propsData: { item, basePath: item.path, activeTopMenu: '/top' },
+    stubs: {
+      item: { props: ['title'], template: '<span>{{ title }}</span>' },
+      'app-link': { props: ['to'], template: '<a :href="to"><slot /></a>' },
+      'el-menu-item': { template: '<div><slot /></div>' },
+      'el-submenu': { template: '<section><h2><slot name="title" /></h2><slot /></section>' }
+    } })
+}
+
+test('only visible receipt branch keeps both sidebar levels and the group URL resolves to its granted leaf', async() => {
+  const hidden = menu('income', '/income', '其他收款', [], 1)
+  const routes = await routesFor(parent([hidden, group([receipt()])]))
+  const sidebar = renderBranch(routes[0].children[0])
+  expect(sidebar.findAll('section > h2').wrappers.map(title => title.text())).toEqual(['交易管理', '对账管理'])
+  expect(sidebar.findAll('a')).toHaveLength(1)
+  expect(sidebar.find('a').text()).toBe('收款对账')
+  expect(sidebar.find('a').attributes('href')).toBe('/receiptReconcile')
+  const router = new Router({ mode: 'abstract', routes })
+  const direct = router.resolve('/receiptReconcileGroup?source=menu').route
+  expect(direct.fullPath).toBe('/receiptReconcile?source=menu')
+  expect(direct.matched.slice(-2).map(record => record.name)).toEqual(['receiptReconcileGroup', 'receiptReconcile'])
+  sidebar.destroy()
+})
+
+test('unrelated single-child menus still fold, including siblings of the reconciliation group', async() => {
+  const ordinary = menu('orderList', '/orders', '订单管理', [menu('income', '/income', '订单收入')])
+  const routes = await routesFor(parent([group([receipt()]), ordinary]))
+  const sidebar = renderBranch(routes[0].children[0])
+  expect(sidebar.findAll('section > h2').wrappers.map(title => title.text())).toEqual(['交易管理', '对账管理'])
+  expect(sidebar.find('a[href="/income"]').text()).toBe('订单收入')
+  sidebar.destroy()
+})
+
+test('a group with no granted visible receipt leaf does not redirect to receipts or expand its parent', async() => {
+  for (const children of [[], [{ ...receipt(), hid: 1 }]]) {
+    const routes = await routesFor(parent([group(children)]))
+    const trade = routes[0].children[0]
+    expect(trade.meta.keepReceiptHierarchy).toBeUndefined()
+    expect(new Router({ mode: 'abstract', routes }).resolve('/receiptReconcileGroup').route.path).toBe('/403')
+  }
+})