Merge branch 'release/test' of http://git.buggoglobal.com/html/admin-web into dev

src/modules/unified-orders/components/InboundFeeDetailManager.test.ts

@@ -64,6 +64,8 @@ describe('InboundFeeDetailManager', () => {
     const second = wrapper.findAll('.el-table__row')[1]!.text()
     const secondButtons = wrapper.findAll('.el-table__row')[1]!.findAll('button').map((button) => button.text())
     expect(first).toContain('编辑'); expect(first).toContain('审核'); expect(first).toContain('驳回')
+    expect(first).toContain('草稿')
+    expect(second).toContain('已发布')
     expect(second).toContain('调整'); expect(second).toContain('作废'); expect(secondButtons).not.toContain('审核')
     expect(wrapper.find('th').text()).toContain('操作')
     expect(source).not.toMatch(/<el-button[^>]+link[^>]+(?:编辑|审核|驳回|调整|作废)/)
@@ -244,7 +246,11 @@ describe('InboundFeeDetailManager', () => {
   })
 
   it('refreshes fee rows and the order detail after every successful write', () => {
+<<<<<<< HEAD
     expect(source).toMatch(/async function finishAction\(message: string\) \{\r?\n  await load\(\); emit\('changed'\)/)
+=======
+    expect(source).toMatch(/async function finishAction\(message: string\)\s*\{\s*await load\(\); emit\('changed'\)/)
+>>>>>>> a67f6300f8a7a5225657bc9c9be8ee716f97ccf6
     expect(source).toMatch(/createInboundFeeDetail[\s\S]*updateInboundFeeDetail[\s\S]*adjustInboundFeeDetail[\s\S]*await finishAction\(/)
     expect(source).toMatch(/deleteInboundFeeDetail[\s\S]*await finishAction\('费用明细已删除'\)/)
     expect(source).toMatch(/reviewInboundFeeDetail[\s\S]*await finishAction\('费用审核通过'\)/)

src/modules/unified-orders/components/InboundFeeDetailManager.vue

@@ -84,6 +84,9 @@ function canReview(row: InboundFeeDetail) { return isManual(row) && access.can('
 function canAdjust(row: InboundFeeDetail) { return isManual(row) && access.can('firstleg:inbound:fee-detail:edit') && row.reviewStatus === 'APPROVED' && row.publicationStatus !== 'VOIDED' }
 function canVoid(row: InboundFeeDetail) { return isManual(row) && access.can('firstleg:inbound:fee-detail:review') && row.reviewStatus === 'APPROVED' && row.publicationStatus !== 'VOIDED' }
 function reviewLabel(value: string) { return ({ PENDING: '待审核', APPROVED: '已审核', REJECTED: '已驳回' } as Record<string, string>)[value] || value }
+function publicationLabel(value: string) {
+  return ({ DRAFT: '草稿', PUBLISHED: '已发布', SUPERSEDED: '已被替代', VOIDED: '已作废' } as Record<string, string>)[value] || value || '未知状态'
+}
 function directionLabel(value: string) { return value === 'RECEIVABLE' ? '应收' : '应付' }
 function settlementLabel(row: InboundFeeDetail) { return row.direction !== 'PAYABLE' ? '—' : row.settlementMode === 'DIRECT_PAID' ? '已付成本' : row.settlementMode === 'ON_ACCOUNT' ? '账期应付' : '未设置' }
 function paymentMethodLabel(value: string | null | undefined) { return ({ ONLINE: '线上支付', BANK_TRANSFER: '银行转账', CASH: '现金', OTHER: '其他' } as Record<string, string>)[value || ''] || '—' }
@@ -302,7 +305,7 @@ onMounted(() => void load())
           <el-table-column label="金额" min-width="120"><template #default="{ row }">{{ Number(row.amount).toFixed(2) }}</template></el-table-column>
           <el-table-column label="单价" min-width="110"><template #default="{ row }">{{ Number(row.unitPrice).toFixed(4) }}</template></el-table-column>
           <el-table-column prop="sourceFeeVersion" label="版本" width="85" />
-          <el-table-column prop="publicationStatus" label="发布状态" min-width="110" />
+          <el-table-column label="发布状态" min-width="110"><template #default="{ row }"><StatusBadge :status="publicationLabel(row.publicationStatus)" /></template></el-table-column>
           <el-table-column prop="reviewReason" label="驳回原因" min-width="180" show-overflow-tooltip />
           <el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
         </el-table>