v3.5.6版本迭代

apps/admin-web/src/pages/StoreBillsPage.tsx

@@ -44,6 +44,11 @@ type Row = {
   settlementRate?: number | null;
   payoutCount?: number | null;
   store?: { id: string; name: string; cityName: string; phone?: string | null };
+  bankAccount?: {
+    bankAccountName?: string | null;
+    bankAccountNo?: string | null;
+    bankBranch?: string | null;
+  } | null;
 };
 
 type StoreOption = { id: string; name: string; phone: string };
@@ -55,6 +60,11 @@ const STATUS_COLORS: Record<string, string> = {
   REJECTED: 'red',
 };
 
+function settlementStatusColor(kind: StoreSettlementKind, status: string) {
+  if (status === 'PAID') return kind === 'WITHDRAW' ? 'cyan' : 'green';
+  return STATUS_COLORS[status] || 'default';
+}
+
 const KIND_COLORS: Record<StoreSettlementKind, string> = {
   T1_BILL: 'blue',
   WITHDRAW: 'purple',
@@ -118,14 +128,30 @@ export default function StoreBillsPage() {
   }, []);
 
   function confirmPay(ids: string[], amountHint?: number) {
+    let paymentRef = '';
     Modal.confirm({
       title: '确认打款？',
-      content: `将确认 ${ids.length} 笔 T+1 门店对账单${amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。`,
+      content: (
+        <div>
+          <div>
+            将确认 {ids.length} 笔 T+1 门店对账单
+            {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。
+          </div>
+          <Input
+            placeholder="打款凭证号（可选）"
+            style={{ marginTop: 8 }}
+            onChange={(e) => {
+              paymentRef = e.target.value;
+            }}
+          />
+        </div>
+      ),
       okText: '确认打款',
       cancelText: '取消',
       onOk: async () => {
+        const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
         if (ids.length === 1) {
-          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST' });
+          await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body });
         } else {
           setBatchLoading(true);
           try {
@@ -247,7 +273,9 @@ export default function StoreBillsPage() {
       dataIndex: 'kind',
       width: 100,
       render: (k: StoreSettlementKind) => (
-        <Tag color={KIND_COLORS[k]}>{STORE_SETTLEMENT_KIND_LABELS[k] ?? k}</Tag>
+        <Tag color={KIND_COLORS[k]} style={{ minWidth: 72, textAlign: 'center' }}>
+          {STORE_SETTLEMENT_KIND_LABELS[k] ?? k}
+        </Tag>
       ),
     },
     {
@@ -271,6 +299,20 @@ export default function StoreBillsPage() {
     { title: '门店', dataIndex: ['store', 'name'], width: 140, ellipsis: true },
     { title: '登录手机', dataIndex: ['store', 'phone'], width: 120, render: (v) => v || '—' },
     { title: '城市', dataIndex: ['store', 'cityName'], width: 90 },
+    {
+      title: '收款户名',
+      width: 100,
+      ellipsis: true,
+      render: (_, row) =>
+        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountName || '—' : '—',
+    },
+    {
+      title: '收款账号',
+      width: 140,
+      ellipsis: true,
+      render: (_, row) =>
+        row.kind === 'T1_BILL' ? row.bankAccount?.bankAccountNo || '—' : '—',
+    },
     {
       title: '笔数',
       width: 80,
@@ -288,7 +330,9 @@ export default function StoreBillsPage() {
       dataIndex: 'status',
       width: 100,
       render: (s: string, row) => (
-        <Tag color={STATUS_COLORS[s] || 'default'}>{storeSettlementStatusLabel(row.kind, s)}</Tag>
+        <Tag color={settlementStatusColor(row.kind, s)}>
+          {storeSettlementStatusLabel(row.kind, s)}
+        </Tag>
       ),
     },
     {
@@ -339,7 +383,8 @@ export default function StoreBillsPage() {
           门店账单
         </Typography.Title>
         <Typography.Text type="secondary">
-          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口
+          含 T+1 自动出账与门店手动提现；按类型筛选，详情与审核动作沿用原接口。
+          「已打款」= T+1 出账终态，「已结算」= 手动提现终态。
         </Typography.Text>
         {overdueSummary && overdueSummary.overdueCount > 0 ? (
           <Typography.Text type="danger">
@@ -503,7 +548,32 @@ export default function StoreBillsPage() {
               <Descriptions.Item label="打款时间">
                 {detail.paidAt ? fmtTime(String(detail.paidAt)) : '—'}
               </Descriptions.Item>
+              <Descriptions.Item label="打款凭证">
+                {detail.paymentRef ? String(detail.paymentRef) : '—'}
+              </Descriptions.Item>
             </Descriptions>
+            {(detail.storeAccount as {
+              bankAccountName?: string;
+              bankAccountNo?: string;
+              bankBranch?: string;
+            } | null) ? (
+              <>
+                <Typography.Title level={5} style={{ marginTop: 16 }}>
+                  收款账户
+                </Typography.Title>
+                <Descriptions column={1} size="small" bordered>
+                  <Descriptions.Item label="户名">
+                    {(detail.storeAccount as { bankAccountName?: string }).bankAccountName || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="账号">
+                    {(detail.storeAccount as { bankAccountNo?: string }).bankAccountNo || '—'}
+                  </Descriptions.Item>
+                  <Descriptions.Item label="开户行">
+                    {(detail.storeAccount as { bankBranch?: string }).bankBranch || '—'}
+                  </Descriptions.Item>
+                </Descriptions>
+              </>
+            ) : null}
             <Typography.Title level={5} style={{ marginTop: 16 }}>
               核销明细
             </Typography.Title>