WuYongJie/furniture-3d-system-Wu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/codex/jingchuan-unified-table-stage-fix' into codex/xuxiake-mainline

Browse Source
This commit is contained in:
jingchuan 2026-08-17 09:14:41 +08:00
commit 04379751f6
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
furniture-3d-system/src/app/supply-chain/components/supply-chain-tabs.tsx
View File

@ -91,7 +91,7 @@ export const SUPPLY_CHAIN_ROUTE_TITLES: Record<string, string> = {
'/supply-chain/database/category-config': '类目配置', '/supply-chain/database/category-config': '类目配置',
'/supply-chain/database/warehouse-config': '仓库配置', '/supply-chain/database/warehouse-config': '仓库配置',
'/supply-chain/new-products/unified-table': '新品开发进度总表', '/supply-chain/new-products/unified-table': '新品开发进度总表',
'/supply-chain/new-products/sample-progress': '新品打样明细宽表', '/supply-chain/new-products/sample-progress': '打样进度明细',
'/supply-chain/purchase/daily-affairs': '日常事项', '/supply-chain/purchase/daily-affairs': '日常事项',
'/supply-chain/purchase/price-change': '产品变价', '/supply-chain/purchase/price-change': '产品变价',
'/supply-chain/operation-logs': '操作日志', '/supply-chain/operation-logs': '操作日志',

2
furniture-3d-system/src/app/supply-chain/config/supply-chain-menu.test.ts
View File

@ -12,7 +12,7 @@ describe('supply chain menu', () => {
route: '/supply-chain/new-products/unified-table', route: '/supply-chain/new-products/unified-table',
}), }),
expect.objectContaining({ expect.objectContaining({
label: '新品打样明细宽表', label: '打样进度明细',
module: '新品管理', module: '新品管理',
route: '/supply-chain/new-products/sample-progress', route: '/supply-chain/new-products/sample-progress',
}), }),

2
furniture-3d-system/src/app/supply-chain/config/supply-chain-menu.ts
View File

@ -58,7 +58,7 @@ export const SUPPLY_CHAIN_MENU: SupplyChainMenuModule[] = [
title: '公共数据源', title: '公共数据源',
items: [ items: [
{ label: '新品开发进度总表', route: '/supply-chain/new-products/unified-table', targetKey: 'newProductUnifiedTable' }, { label: '新品开发进度总表', route: '/supply-chain/new-products/unified-table', targetKey: 'newProductUnifiedTable' },
{ label: '新品打样明细宽表', route: '/supply-chain/new-products/sample-progress', targetKey: 'newProductSampleProgress' }, { label: '打样进度明细', route: '/supply-chain/new-products/sample-progress', targetKey: 'newProductSampleProgress' },
], ],
}, },
], ],

2
furniture-3d-system/src/app/supply-chain/new-products/sample-progress/page.tsx
View File

@ -5,7 +5,7 @@ import { sampleProgressService } from '@/server/services/sample-progress.service
import { supplyChainPermissionSettingsService } from '@/server/services/supply-chain-permission-settings.service' import { supplyChainPermissionSettingsService } from '@/server/services/supply-chain-permission-settings.service'
export const dynamic = 'force-dynamic' export const dynamic = 'force-dynamic'
export const metadata = { title: '新品打样明细宽表 · 供应链中心' } export const metadata = { title: '打样进度明细 · 供应链中心' }
export default async function NewProductSampleProgressPage() { export default async function NewProductSampleProgressPage() {
const { authUser, user } = await requireSession('/login') const { authUser, user } = await requireSession('/login')

2
furniture-3d-system/src/lib/supply-chain-permission-settings.ts
View File

@ -68,7 +68,7 @@ export const SUPPLY_CHAIN_PERMISSION_TARGETS: SupplyChainPermissionTarget[] = [
{ key: 'categoryConfig', label: '类目配置', description: '产品全量档案类目维护' }, { key: 'categoryConfig', label: '类目配置', description: '产品全量档案类目维护' },
{ key: 'warehouseConfig', label: '仓库配置', description: '出入库仓库维护' }, { key: 'warehouseConfig', label: '仓库配置', description: '出入库仓库维护' },
{ key: 'newProductUnifiedTable', label: '新品开发进度总表', description: '新品流程公共数据源' }, { key: 'newProductUnifiedTable', label: '新品开发进度总表', description: '新品流程公共数据源' },
{ key: 'newProductSampleProgress', label: '新品打样明细宽表', description: '新品打样进度公共数据源' }, { key: 'newProductSampleProgress', label: '打样进度明细', description: '新品打样进度公共数据源' },
{ key: 'purchaseDailyAffairs', label: '日常事项', description: '采购日常协作' }, { key: 'purchaseDailyAffairs', label: '日常事项', description: '采购日常协作' },
{ key: 'purchasePriceChange', label: '产品变价', description: '采购价格变更协作' }, { key: 'purchasePriceChange', label: '产品变价', description: '采购价格变更协作' },
{ key: 'operationLogs', label: '操作日志', description: '供应链操作审计' }, { key: 'operationLogs', label: '操作日志', description: '供应链操作审计' },