{orderMode ? '前置仓下单表' : '前置仓进销存管理'}
diff --git a/furniture-3d-system/src/app/supply-chain/management/front-warehouse-inventory/front-warehouse-inventory.module.css b/furniture-3d-system/src/app/supply-chain/management/front-warehouse-inventory/front-warehouse-inventory.module.css
index 0c396bff..b52c8feb 100644
--- a/furniture-3d-system/src/app/supply-chain/management/front-warehouse-inventory/front-warehouse-inventory.module.css
+++ b/furniture-3d-system/src/app/supply-chain/management/front-warehouse-inventory/front-warehouse-inventory.module.css
@@ -16,6 +16,44 @@
flex-shrink: 0;
}
+.subpageTabs {
+ display: flex;
+ min-height: 36px;
+ flex: 0 0 auto;
+ align-items: flex-end;
+ gap: 4px;
+ overflow-x: auto;
+ border-bottom: 1px solid var(--sc-border);
+}
+
+.subpageTabs a {
+ display: inline-flex;
+ height: 34px;
+ flex: none;
+ align-items: center;
+ box-sizing: border-box;
+ border: 1px solid transparent;
+ border-bottom: 0;
+ border-radius: 7px 7px 0 0;
+ padding: 0 15px;
+ color: #71717a;
+ font-size: 12px;
+ font-weight: 500;
+ text-decoration: none;
+}
+
+.subpageTabs a:hover {
+ background: #f8fafc;
+ color: #3f3f46;
+}
+
+.subpageTabs .subpageTabActive {
+ border-color: var(--sc-border);
+ background: #fff;
+ color: #18181b;
+ font-weight: 600;
+}
+
.header {
display: flex;
min-height: 52px;
@@ -1005,6 +1043,12 @@ tbody .stickyColumn {
flex-direction: column;
}
+ .subpageTabs {
+ margin-right: calc(var(--wb-panel-inset, 12px) * -1);
+ margin-left: calc(var(--wb-panel-inset, 12px) * -1);
+ padding: 0 var(--wb-panel-inset, 12px);
+ }
+
.summary {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
diff --git a/furniture-3d-system/src/app/supply-chain/management/front-warehouse-inventory/page.tsx b/furniture-3d-system/src/app/supply-chain/management/front-warehouse-inventory/page.tsx
index e62c9597..08ab1a51 100644
--- a/furniture-3d-system/src/app/supply-chain/management/front-warehouse-inventory/page.tsx
+++ b/furniture-3d-system/src/app/supply-chain/management/front-warehouse-inventory/page.tsx
@@ -1,6 +1,7 @@
import { redirect } from 'next/navigation'
import { isFrontWarehousePurchaser } from '@/lib/front-warehouse-inventory'
import { requireSession } from '@/lib/server-session'
+import { frontWarehouseOrderService } from '@/server/services/front-warehouse-order.service'
import { supplyChainPermissionSettingsService } from '@/server/services/supply-chain-permission-settings.service'
import { frontWarehouseInventoryService } from '@/server/services/front-warehouse-inventory.service'
import { FrontWarehouseInventoryView } from './FrontWarehouseInventoryView'
@@ -8,7 +9,11 @@ import { FrontWarehouseInventoryView } from './FrontWarehouseInventoryView'
export const metadata = { title: '前置仓进销存管理 · 供应链中心' }
export const dynamic = 'force-dynamic'
-export default async function FrontWarehouseInventoryPage() {
+export default async function FrontWarehouseInventoryPage({
+ searchParams,
+}: {
+ searchParams: Promise<{ tab?: string | string[] }>
+}) {
const { authUser } = await requireSession('/login')
const access = await supplyChainPermissionSettingsService.getUserAccess(
authUser,
@@ -17,7 +22,9 @@ export default async function FrontWarehouseInventoryPage() {
if (!access.view) redirect('/supply-chain')
const purchaserOnly = isFrontWarehousePurchaser(authUser)
- const initialData = await frontWarehouseInventoryService.getPage({
+ const tab = (await searchParams).tab
+ const orderMode = tab === 'order'
+ const query = {
page: 1,
pageSize: 100,
sku: '',
@@ -27,12 +34,23 @@ export default async function FrontWarehouseInventoryPage() {
purchaseOwner: '',
purchaseType: [],
qualifies: ['yes'],
- }, { purchaserOnly })
+ }
+ const initialData = orderMode
+ ? await frontWarehouseOrderService.getPage(
+ { ...query, qualifies: ['yes'], refresh: false },
+ { purchaserOnly },
+ )
+ : await frontWarehouseInventoryService.getPage(
+ { ...query, qualifies: ['yes'] },
+ { purchaserOnly },
+ )
return (
)
}
diff --git a/furniture-3d-system/src/app/supply-chain/management/front-warehouse-order/page.tsx b/furniture-3d-system/src/app/supply-chain/management/front-warehouse-order/page.tsx
index 1bab90de..d5905505 100644
--- a/furniture-3d-system/src/app/supply-chain/management/front-warehouse-order/page.tsx
+++ b/furniture-3d-system/src/app/supply-chain/management/front-warehouse-order/page.tsx
@@ -1,40 +1,5 @@
import { redirect } from 'next/navigation'
-import { isFrontWarehousePurchaser } from '@/lib/front-warehouse-inventory'
-import { requireSession } from '@/lib/server-session'
-import { frontWarehouseOrderService } from '@/server/services/front-warehouse-order.service'
-import { supplyChainPermissionSettingsService } from '@/server/services/supply-chain-permission-settings.service'
-import { FrontWarehouseInventoryView } from '../front-warehouse-inventory/FrontWarehouseInventoryView'
-export const metadata = { title: '前置仓下单表 · 供应链中心' }
-export const dynamic = 'force-dynamic'
-
-export default async function FrontWarehouseOrderPage() {
- const { authUser } = await requireSession('/login')
- const access = await supplyChainPermissionSettingsService.getUserAccess(
- authUser,
- 'frontWarehouseInventory',
- )
- if (!access.view) redirect('/supply-chain')
-
- const initialData = await frontWarehouseOrderService.getPage({
- page: 1,
- pageSize: 100,
- sku: '',
- barcode: '',
- supplier: '',
- rating: [],
- purchaseOwner: '',
- purchaseType: [],
- qualifies: ['yes'],
- refresh: false,
- }, { purchaserOnly: isFrontWarehousePurchaser(authUser) })
-
- return (
-
- )
+export default function FrontWarehouseOrderPage() {
+ redirect('/supply-chain/management/front-warehouse-inventory?tab=order')
}