优化

src/modules/overseas-business/pages/OverseasBusinessViews.test.ts

@@ -11,6 +11,7 @@ import { useAuthStore } from '@/core/auth/auth'
 import { listPlatformTenants } from '@/modules/iam'
 import type { PlatformProcurement } from '../procurementTypes'
 import { downloadProcurementFile } from '../api/procurementCommands'
+import { submitProcurementCommand } from '../api/procurementCommands'
 import { getProcurementWorkflow } from '../api/procurementWorkflow'
 import type { FleetArrangement } from '../fleetArrangement'
 import type { LocalLooseboardDetail, LocalLooseboardOrder, LocalTransportDetail, LocalTransportOrder } from '../types'
@@ -34,7 +35,7 @@ vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
 vi.mock('../api/procurementWorkflow', () => ({ getProcurementWorkflow: vi.fn(), submitProcurementWorkflow: vi.fn() }))
 vi.mock('../api/procurementCommands', async importOriginal => ({
   ...await importOriginal<typeof import('../api/procurementCommands')>(),
-  downloadProcurementFile: vi.fn(),
+  downloadProcurementFile: vi.fn(), submitProcurementCommand: vi.fn(),
 }))
 vi.mock('../api/platformOverseasBusiness', () => ({
   listOverseasPurchases: vi.fn(), getOverseasPurchase: vi.fn(), getOverseasPurchaseEditor: vi.fn(), updateOverseasPurchase: vi.fn(), listOverseasPurchaseCustomerOptions: vi.fn(), listOverseasPurchaseWarehouseOptions: vi.fn(),
@@ -72,7 +73,7 @@ describe('overseas business mounted pages', () => {
     vi.stubGlobal('ResizeObserver', ResizeObserverStub); vi.stubGlobal('localStorage', memoryStorage()); vi.stubGlobal('sessionStorage', memoryStorage()); document.body.innerHTML = ''
     routing.push.mockReset(); routing.route.params = {}; routing.route.query = {}
     vi.mocked(downloadProcurementFile).mockReset()
-    vi.mocked(getProcurementWorkflow).mockReset().mockResolvedValue({ orderNo: 'OP-100', version: 3, status: 'RECEIVING', receivedQuantity: 5, stockQuantity: 5, reservedQuantity: 0, availableQuantity: 5, receipts: [], outbounds: [] })
+    vi.mocked(getProcurementWorkflow).mockReset().mockResolvedValue({ orderNo: 'OP-100', version: 3, status: 'RECEIVING', receivedQuantity: 5, stockQuantity: 5, reservedQuantity: 0, availableQuantity: 5, rejectionReason: null, photosNeedUpdate: false, receipts: [], outbounds: [] })
     vi.mocked(listOverseasPurchases).mockReset().mockResolvedValue({ records: [purchase], page: 1, size: 20, total: 1, pages: 1 }); vi.mocked(getOverseasPurchase).mockReset().mockResolvedValue(procurementDetail()); vi.mocked(updateOverseasPurchase).mockReset().mockResolvedValue({ ...purchase, version: 4 })
     vi.mocked(getOverseasPurchaseEditor).mockReset().mockResolvedValue({ customerView: { order: { orderNo: purchase.orderNo, customerId: purchase.customerId, productName: purchase.productName, purchaseQuantity: purchase.purchaseQuantity, version: purchase.version } }, internalRemark: purchase.remark })
     vi.mocked(listOverseasPurchaseCustomerOptions).mockReset().mockResolvedValue([{ customerId: '10001', customerName: '客户甲' }]); vi.mocked(listOverseasPurchaseWarehouseOptions).mockReset().mockResolvedValue([{ warehouseId: '20001', warehouseCode: 'LAX', warehouseName: '洛杉矶采购仓', countryCode: 'US' }])
@@ -172,6 +173,8 @@ describe('overseas business mounted pages', () => {
     expect(wrapper.text()).toContain('收货记录')
     expect(wrapper.text()).toContain('出库单')
     expect(wrapper.text()).toContain('采购库存')
+    expect(wrapper.text()).toContain('采购要求')
+    expect(wrapper.text()).toContain('采购备注')
     expect(wrapper.text()).not.toContain('两段实际交寄')
     expect(wrapper.text()).not.toContain('internal-purchase-route')
     await wrapper.get('.density-back').trigger('click')
@@ -183,7 +186,7 @@ describe('overseas business mounted pages', () => {
     const result = procurementDetail()
     result.files = [{ id: '9007199254741000', fileId: '9007199254741001', category: 'LABEL', fileName: 'label.pdf', contentType: 'application/pdf', sizeBytes: 123, createdAt: '2026-10-10T10:00:00' }]
     vi.mocked(getOverseasPurchase).mockResolvedValue(result)
-    vi.mocked(getProcurementWorkflow).mockResolvedValue({ orderNo: 'OP-100', version: 3, status: 'RECEIVING', receivedQuantity: 5, stockQuantity: 5, reservedQuantity: 0, availableQuantity: 5, receipts: [{ id: '1', quantity: 5, fileIds: ['9007199254741001'], receivedAt: '2026-10-10T10:00:00' }], outbounds: [] })
+    vi.mocked(getProcurementWorkflow).mockResolvedValue({ orderNo: 'OP-100', version: 3, status: 'RECEIVING', receivedQuantity: 5, stockQuantity: 5, reservedQuantity: 0, availableQuantity: 5, rejectionReason: null, photosNeedUpdate: false, receipts: [{ id: '1', quantity: 5, fileIds: ['9007199254741001'], receivedAt: '2026-10-10T10:00:00' }], outbounds: [] })
     let rejectDownload!: (error: Error) => void
     vi.mocked(downloadProcurementFile).mockImplementation(() => new Promise((_resolve, reject) => { rejectDownload = reject }))
     const wrapper = mountPage(PurchaseOrderDetailView)
@@ -209,6 +212,16 @@ describe('overseas business mounted pages', () => {
   })
 
   it('mounts procurement list with customer candidates and real data', async () => { const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(listOverseasPurchaseCustomerOptions).toHaveBeenCalled(); expect(listOverseasPurchases).toHaveBeenCalledWith({ page: 1, size: 20, customerId: '', orderNo: '', purchaseCategory: '', productName: '', status: '' }); expect(wrapper.text()).toContain('OP-100'); expect(wrapper.text()).toContain('收货中'); expect(wrapper.text()).toContain('2026-08-01 10:00') })
+  it('reviews pending procurement from the list, submits rejection as remark, and omits edit', async () => {
+    vi.mocked(listOverseasPurchases).mockResolvedValue({ records: [{ ...purchase, status: 'PENDING_REVIEW' }], page: 1, size: 20, total: 1, pages: 1 })
+    const wrapper = mountPage(PurchaseOrdersView); await flushPromises()
+    expect(wrapper.text()).not.toContain('编辑')
+    await wrapper.findAll('button').find(button => button.text() === '审核')!.trigger('click'); await flushPromises()
+    const dialog = wrapper.findComponent(AppDialog), form = wrapper.findComponent({ name: 'ElForm' }).props('model') as { decision: string; remark: string }
+    form.decision = 'REJECT'; form.remark = '商品型号与要求不符'; dialog.vm.$emit('confirm'); await flushPromises()
+    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'review', expect.objectContaining({ version: 3, decision: 'REJECT', remark: '商品型号与要求不符' }))
+    expect(submitProcurementCommand).not.toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.anything(), expect.objectContaining({ reason: expect.anything() }))
+  })
   it('keeps long procurement identifiers and descriptive fields out of single-line truncation', async () => {
     const record = { ...purchase, orderNo: 'QLYSXDKH202610100002', customerName: '全量验收下单客户-20261010-长客户名称', productName: 'PROC-PURCHASE-20261010-长商品名称', productSpecification: '多规格描述-完整展示', purchaseCategory: 'OFFICE_SUPPLIES', purchaseWarehouseName: '洛杉矶海外采购收货仓库' }
     vi.mocked(listOverseasPurchases).mockResolvedValue({ records: [record], page: 1, size: 20, total: 1, pages: 1 })

src/modules/overseas-business/pages/PurchaseOrderDetailView.vue

@@ -5,7 +5,6 @@ import { computed, onActivated, onBeforeUnmount, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ArrowLeft } from '@lucide/vue'
 import { useAuthStore } from '@/core/auth/auth'
-import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import StatusBadge from '@/shared/components/StatusBadge.vue'
@@ -18,12 +17,11 @@ import { downloadProcurementFile } from '../api/procurementCommands'
 import { getProcurementWorkflow, type ProcurementWorkflow } from '../api/procurementWorkflow'
 import ProcurementWorkflowPanel from '../components/ProcurementWorkflowPanel.vue'
 import BusinessDocumentFees from '../components/BusinessDocumentFees.vue'
-import { overseasBusinessPermissions } from '../permissions'
 import { statusLabel, money, dateTime, text } from '../procurementPresentation'
 import type { PlatformProcurement } from '../procurementTypes'
 import { directionLabel } from '../procurementDirection'
 import { hasProcurementFeeDetails } from '../procurementOutboundFees'
-const route = useRoute(); const router = useRouter(); const auth = useAuthStore(); const access = useAccessPreviewStore()
+const route = useRoute(); const router = useRouter(); const auth = useAuthStore()
 const purchaseId = computed(() => typeof route.params.purchaseId === 'string' ? route.params.purchaseId : '')
 const customerId = computed(() => typeof route.query.customerId === 'string' ? route.query.customerId : '')
 const detail = ref<PlatformProcurement | null>(null), workflow = ref<ProcurementWorkflow | null>(null), loading = ref(false)
@@ -40,7 +38,8 @@ const fields = computed(() => [
   ['采购品类', order.value?.purchaseCategory], ['商品名称', order.value?.productName], ['规格', order.value?.productSpecification],
   ['采购数量', order.value?.purchaseQuantity], ['预算单价', money(order.value?.budgetUnitPrice, order.value?.currency)], ['预计到仓', dateTime(order.value?.estimatedArrivalAt)],
   ['收件人', order.value?.contactName], ['联系电话', order.value?.contactPhone], ['收货地址', order.value?.receivingAddress],
-  ...(detail.value?.internalRemark ? [['内部备注', detail.value.internalRemark]] : []),
+  ...(order.value?.remark ? [['采购要求', order.value.remark]] : []),
+  ...(detail.value?.internalRemark || order.value?.remark ? [['采购备注', detail.value?.internalRemark || order.value?.remark]] : []),
 ])
 let generation = 0, inFlight: Promise<void> | null = null, inFlightScope = ''
 const scope = computed(() => `${auth.user?.id || ''}:${customerId.value}:${purchaseId.value}`)
@@ -78,7 +77,7 @@ onActivated(() => { if (activatedOnce) void load(); else activatedOnce = true })
 <template>
   <AdminPage class="admin-density admin-workbench"><OperationErrorToast :details="operationError" />
     <DetailPageLayout class="purchase-detail density-detail-layout workbench-panel is-flush is-page-surface" aria-label="采购订单详情">
-      <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-business-purchases' })"><ArrowLeft :size="16" />返回列表</el-button><h1 class="density-detail-title">{{ order?.orderNo || '—' }}</h1><StatusBadge v-if="workflow" :status="statusLabel(workflow.status)" /></div><div class="density-actions"><el-button :loading="loading" @click="load">刷新</el-button><el-button v-if="order && access.can(overseasBusinessPermissions.purchaseEdit)" @click="router.push({ name: 'overseas-business-purchase-edit', params: { purchaseId: order.orderNo }, query: { customerId } })">编辑备注</el-button></div></div></template>
+      <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push({ name: 'overseas-business-purchases' })"><ArrowLeft :size="16" />返回列表</el-button><h1 class="density-detail-title">{{ order?.orderNo || '—' }}</h1><StatusBadge v-if="workflow" :status="statusLabel(workflow.status)" /></div><div class="density-actions"><el-button :loading="loading" @click="load">刷新</el-button></div></div></template>
       <LoadErrorState v-if="loadError" title="采购详情暂时无法加载" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
       <div v-else v-loading="loading" class="detail-grid">
         <template v-if="detail && order && workflow">

src/modules/overseas-business/pages/PurchaseOrdersView.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import '@/styles/adminWorkbench.css'
 import '@/styles/adminDensity.css'
-import { computed, onActivated, onMounted, onBeforeUnmount, ref, watch } from 'vue'
+import { computed, onActivated, onMounted, onBeforeUnmount, reactive, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
 import { useAuthStore } from '@/core/auth/auth'
 import { procurementStatuses, statusLabel, statusTone, money } from '../procurementPresentation'
@@ -11,9 +12,11 @@ import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.v
 import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
-import { listOverseasPurchaseCustomerOptions, listOverseasPurchases } from '../api/platformOverseasBusiness'
+import { listOverseasPurchaseCustomerOptions, listOverseasPurchaseWarehouseOptions, listOverseasPurchases } from '../api/platformOverseasBusiness'
+import { submitProcurementCommand } from '../api/procurementCommands'
 import { overseasBusinessPermissions } from '../permissions'
 import type { OverseasPurchaseCustomerOption, OverseasPurchaseQuery, OverseasPurchaseStatus, OverseasPurchaseSummary } from '../types'
 
@@ -23,6 +26,10 @@ const rows = ref<OverseasPurchaseSummary[]>([]); const loading = ref(false); con
 const page = ref(1); const pageSize = ref(20); const total = ref(0)
 const filters = ref<QueryModel>({ orderNo: '', customerId: '', purchaseCategory: '', productName: '', status: '' }); const applied = ref({ ...filters.value })
 const customerOptions = ref<OverseasPurchaseCustomerOption[]>([]); const customersLoading = ref(false)
+const reviewOpen = ref(false), reviewSaving = ref(false), reviewLoading = ref(false)
+const reviewRow = ref<OverseasPurchaseSummary | null>(null), reviewWarehouses = ref<Awaited<ReturnType<typeof listOverseasPurchaseWarehouseOptions>>>([])
+const reviewRequestKey = ref('')
+const reviewForm = reactive({ decision: 'APPROVE' as 'APPROVE' | 'REJECT', purchaseWarehouseId: '', remark: '' })
 const fields = computed<QueryField[]>(() => [
   { key: 'orderNo', type: 'input', label: '订单编号', placeholder: '请输入订单编号', width: 210 },
   { key: 'customerId', type: 'select', label: '客户', placeholder: '全部客户', width: 210, options: customerOptions.value.map((item) => ({ label: item.customerName, value: item.customerId })), props: { filterable: true, loading: customersLoading.value } },
@@ -31,7 +38,7 @@ const fields = computed<QueryField[]>(() => [
   { key: 'status', type: 'select', label: '履约状态', placeholder: '全部状态', width: 190, options: Object.entries(procurementStatuses).map(([value, label]) => ({ value, label })) },
 ])
 const columns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 120, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 170, fixed: 'left', slotName: 'actions' },
   { key: 'orderNo', prop: 'orderNo', label: '订单编号', minWidth: 220, singleLine: false },
   { key: 'status', label: '状态', minWidth: 145, slotName: 'status', afterColumn: 'orderNo' },
   { key: 'customerName', prop: 'customerName', label: '客户名称', minWidth: 220, singleLine: false, formatter: (row: OverseasPurchaseSummary) => row.customerName || '—' },
@@ -64,7 +71,26 @@ function load() {
 }
 watch(() => auth.user?.id, () => { rows.value = []; total.value = 0; void load() })
 function search(model: QueryModel) { applied.value = { ...model }; if (page.value === 1) void load(); else page.value = 1 }
-function open(row: OverseasPurchaseSummary, edit = false) { void router.push({ name: edit ? 'overseas-business-purchase-edit' : 'overseas-business-purchase-detail', params: { purchaseId: row.orderNo }, query: { customerId: row.customerId } }) }
+function open(row: OverseasPurchaseSummary) { void router.push({ name: 'overseas-business-purchase-detail', params: { purchaseId: row.orderNo }, query: { customerId: row.customerId } }) }
+async function beginReview(row: OverseasPurchaseSummary) {
+  reviewRow.value = row; reviewWarehouses.value = []; reviewRequestKey.value = crypto.randomUUID(); Object.assign(reviewForm, { decision: 'APPROVE', purchaseWarehouseId: '', remark: '' }); reviewOpen.value = true
+  reviewLoading.value = true
+  try { reviewWarehouses.value = await listOverseasPurchaseWarehouseOptions(row.procurementDirection) }
+  catch (error) { ElMessage.error(getApiErrorDetails(error, '仓库加载失败').message) }
+  finally { reviewLoading.value = false }
+}
+async function submitReview() {
+  const row = reviewRow.value
+  if (!row || reviewSaving.value) return
+  if (reviewForm.decision === 'APPROVE' && !reviewForm.purchaseWarehouseId) { ElMessage.warning('请选择采购仓库'); return }
+  if (reviewForm.decision === 'REJECT' && !reviewForm.remark.trim()) { ElMessage.warning('请填写驳回原因'); return }
+  reviewSaving.value = true
+  try {
+    await submitProcurementCommand(row.orderNo, row.customerId, 'review', { version: row.version, idempotencyKey: reviewRequestKey.value, decision: reviewForm.decision, ...(reviewForm.decision === 'APPROVE' ? { purchaseWarehouseId: reviewForm.purchaseWarehouseId } : { remark: reviewForm.remark.trim() }) })
+    reviewOpen.value = false; ElMessage.success('审核完成'); await load()
+  } catch (error) { ElMessage.error(getApiErrorDetails(error, '审核失败').message) }
+  finally { reviewSaving.value = false }
+}
 async function loadCustomerOptions() { customersLoading.value = true; try { customerOptions.value = await listOverseasPurchaseCustomerOptions() } catch { customerOptions.value = [] } finally { customersLoading.value = false } }
 let activatedOnce = false
 watch([page, pageSize], () => { void load() }); onMounted(() => { void load(); void loadCustomerOptions() })
@@ -81,10 +107,17 @@ onActivated(() => { if (activatedOnce) void load(); else activatedOnce = true })
         <template #notices><template v-if="loadError"><LoadErrorState title="海外采购订单暂时无法加载" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>
 
 
-      <template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="open(row as OverseasPurchaseSummary)">详情</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(overseasBusinessPermissions.purchaseEdit)" size="small" @click="open(row as OverseasPurchaseSummary, true)">编辑</el-button></div></template>
+      <template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="open(row as OverseasPurchaseSummary)">详情</el-button><el-button v-if="(row as OverseasPurchaseSummary).status === 'PENDING_REVIEW' && access.can(overseasBusinessPermissions.purchaseReview)" class="density-action" type="primary" size="small" @click="beginReview(row as OverseasPurchaseSummary)">审核</el-button></div></template>
       <template #status="{ row }"><el-tag :type="statusTone(row.status)" size="small" effect="light">{{ statusLabel(row.status, row.procurementDirection) }}</el-tag></template>
       <template #pagination-left>共 {{ total }} 条海外采购订单</template>
     </DataTable></div></section>
+    <AppDialog v-model="reviewOpen" class="admin-density-dialog admin-workbench is-dialog" title="采购审核" width="560px" confirm-text="提交审核" :confirm-loading="reviewSaving" :confirm-disabled="reviewLoading" @confirm="submitReview">
+      <el-form :model="reviewForm" label-position="top" class="density-form density-form--outlined">
+        <el-form-item label="审核结果"><el-radio-group v-model="reviewForm.decision"><el-radio value="APPROVE">通过</el-radio><el-radio value="REJECT">驳回</el-radio></el-radio-group></el-form-item>
+        <el-form-item v-if="reviewForm.decision === 'APPROVE'" label="采购仓库" required><el-select v-model="reviewForm.purchaseWarehouseId" filterable :loading="reviewLoading" placeholder="请选择采购仓库"><el-option v-for="warehouse in reviewWarehouses" :key="warehouse.warehouseId" :label="`${warehouse.warehouseName}（${warehouse.warehouseCode}）`" :value="warehouse.warehouseId" /></el-select></el-form-item>
+        <el-form-item v-else label="驳回原因" required><el-input v-model="reviewForm.remark" type="textarea" :rows="4" maxlength="1000" show-word-limit /></el-form-item>
+      </el-form>
+    </AppDialog>
   </ListPageLayout></AdminPage>
 </template>