From c16733d1a45d785afd3fc1ed6aef9ba590a7f8b7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 10:52:55 +0800
Subject: [PATCH] feat(mes): 优化工艺路线配置流程和界面
---
src/utils/routerHelper.ts | 9
src/views/mes/pro/route/modules/process-form.vue | 9
src/views/mes/pro/route/index.vue | 15
PRODUCT.md | 53 +++
src/views/mes/pro/route/modules/product-list.vue | 13
src/views/mes/pro/route/modules/route-configurator.vue | 413 +++++++++++++++++++++++++++
src/views/mes/pro/route/data.ts | 49 ++-
src/views/mes/md/item/components/select-dialog.vue | 31 +
src/router/access.ts | 4
src/views/mes/pro/route/modules/product-form.vue | 29 -
src/views/mes/pro/route/modules/material-input-list.vue | 145 +++++++++
src/views/mes/process-design/route/index.vue | 16
src/views/mes/pro/route/modules/process-list.vue | 26 +
src/views/mes/pro/route/modules/product-bom-list.vue | 28 +
src/router/routes/index.ts | 15
15 files changed, 787 insertions(+), 68 deletions(-)
diff --git a/PRODUCT.md b/PRODUCT.md
new file mode 100644
index 0000000..35f2555
--- /dev/null
+++ b/PRODUCT.md
@@ -0,0 +1,53 @@
+# Product
+
+<!-- impeccable:product-schema 1 -->
+
+## Platform
+
+web
+
+## Users
+
+- 鐢熶骇宸ヨ壓銆佽鍒掑拰杞﹂棿绠$悊浜哄憳鍦ㄦ闈㈢缁存姢鐢熶骇鍩虹鏁版嵁銆�
+- 鐢ㄦ埛闇�瑕佸湪杈冨皯鍩硅鐨勬儏鍐典笅瀹屾垚宸ヨ壓璺嚎銆佷骇鍑轰骇鍝併�佸叆搴撲綅缃拰宸ュ簭浜у嚭鐨勯厤缃��
+
+## Product Purpose
+
+鏂伴珮鐢靛姏鏅洪�犲钩鍙扮敤浜庤疮閫氫骇鍝併�佸伐鑹恒�佺敓浜с�佽川閲忓拰浠撳偍涓氬姟銆傚伐鑹鸿矾绾块厤缃垚鍔熺殑鏍囧噯锛屾槸鐢ㄦ埛鑳芥槑纭煡閬撴瘡閬撳伐搴忎骇鍑轰粈涔堬紝浠ュ強鍚堟牸浜у嚭鏈�缁堣繘鍏ュ摢涓粨搴撱�佸簱鍖哄拰搴撲綅銆�
+
+## Operating Context
+
+- 涓�鏉″伐鑹鸿矾绾垮彲鍏宠仈澶氫釜鏈�缁堜骇鍝併��
+- 姣忎釜鏈�缁堜骇鍝佸繀椤婚厤缃姤宸ュ搴旂殑浠撳簱銆佸簱鍖哄拰搴撲綅銆�
+- 涓棿宸ュ簭浜у嚭鍗婃垚鍝侊紝鏈�鍚庝竴閬撳伐搴忓繀椤讳骇鍑鸿矾绾跨粦瀹氱殑鍏ㄩ儴鎴愬搧銆�
+- 璺嚎鍋滅敤鏃舵墠鍏佽淇敼鎴栧垹闄わ紱閰嶇疆瀹屾暣鍚庡湪鍒楄〃涓惎鐢ㄣ��
+
+## Capabilities and Constraints
+
+- 鎶�鏈爤涓� Vue 3銆乀ypeScript銆乂ben Admin銆丄nt Design Vue 鍜� VXE Table銆�
+- 淇濈暀鐜版湁鍚庣鎺ュ彛鍜屼笟鍔℃牎楠岋紝涓嶆敼鍙樻暟鎹ā鍨嬨��
+- 椤甸潰搴斿吋瀹逛寒鑹层�佹殫鑹蹭富棰樺強甯歌妗岄潰鍒嗚鲸鐜囥��
+- 褰撳墠浜嬪疄鏉ヨ嚜鐢ㄦ埛鏄庣‘闇�姹傚拰鐜版湁浠g爜锛涙槸鍚﹂渶瑕佺Щ鍔ㄧ缁存姢宸ヨ壓璺嚎灏氭湭纭銆�
+
+## Brand Commitments
+
+- 浜у搧鍚嶇О涓衡�滄柊楂樼數鍔涙櫤閫犲钩鍙扳�濄��
+- 娌跨敤褰撳墠绯荤粺鐨勮摑鑹蹭富鑹层�丄nt Design 鎺т欢鍜屼腑鏂囦笟鍔℃湳璇��
+
+## Evidence on Hand
+
+- 鐜版湁宸ヨ壓璺嚎椤甸潰鍜屾帴鍙d綅浜� `src/views/mes/pro/route` 涓� `src/api/mes/pro/route`銆�
+- 鍚庣宸插疄鐜板伐鑹鸿矾绾夸骇鍝佷粨浣嶅強宸ュ簭浜у嚭瀹屾暣鎬ф牎楠屻��
+- 娌℃湁鐙珛鐢ㄦ埛鐮旂┒鏉愭枡鎴栧彲鐢ㄦ�ф祴璇曞綍鍍忥紝涓嶈櫄鏋勯噺鍖栨晥鏋溿��
+
+## Product Principles
+
+- 涓氬姟椤哄簭灏辨槸鐣岄潰椤哄簭锛氬厛浜у搧鍜屽叆搴撲綅缃紝鍐嶅伐搴忓拰浜у嚭锛屾渶鍚庢寜浜у搧涓庡伐搴忛厤缃姇鏂欍��
+- 鍦ㄧ敤鎴锋彁浜ゅ墠瑙i噴瑙勫垯锛屽苟鍦ㄥ綋鍓嶆楠ゅ氨杩戞毚闇茬己澶遍」銆�
+- 閲嶈鐘舵�佸悓鏃朵娇鐢ㄦ枃瀛椼�佸浘鏍囧拰棰滆壊琛ㄨ揪銆�
+- 榛樿娴佺▼鏈嶅姟鏅�氫笟鍔$敤鎴凤紝楂樼骇瀛楁涓嶆姠鍗犱富瑕佹搷浣滆矾寰勩��
+
+## Accessibility & Inclusion
+
+- 浜や簰鐩爣搴旀弧瓒抽敭鐩樻搷浣滃拰娓呮櫚鐒︾偣鐘舵�併��
+- 姝f枃涓庢帶浠舵枃瀛椾繚鎸佸彲璇诲姣斿害锛屼笉鑳戒粎渚濊禆棰滆壊鍖哄垎瀹屾垚鐘舵�併��
diff --git a/src/router/access.ts b/src/router/access.ts
index 1076d56..5731c2b 100644
--- a/src/router/access.ts
+++ b/src/router/access.ts
@@ -44,6 +44,10 @@
const pageMap: ComponentRecordType = import.meta.glob([
'../views/**/*.vue',
'!../views/ai/**/*.vue',
+ '!../views/dashboard/analytics/modules/ai-insights.vue',
+ '!../views/mes/**/modules/ai/**/*.vue',
+ '!../views/mes/qc/components/ai-*.vue',
+ '!../views/crm/saleQuotation/modules/ocr-upload.vue',
]);
const accessStore = useAccessStore();
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 027c143..408fb46 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -2,11 +2,12 @@
import { mergeRouteModules, traverseTreeValues } from '@vben/utils';
-import { isAiFeatureEnabled } from '#/utils/features';
-
import { coreRoutes, fallbackNotFoundRoute } from './core';
-const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', {
+const dynamicRouteFiles = import.meta.glob([
+ './modules/**/*.ts',
+ '!./modules/ai.ts',
+], {
eager: true,
});
@@ -39,10 +40,12 @@
// add by 鑺嬭壙锛歠rom https://github.com/vbenjs/vue-vben-admin/blob/main/playground/src/router/routes/index.ts#L38-L45
const componentKeys: string[] = Object.keys(
- import.meta.glob('../../views/**/*.vue'),
+ import.meta.glob([
+ '../../views/**/*.vue',
+ '!../../views/**/modules/**',
+ '!../../views/ai/**',
+ ]),
)
- .filter((item) => !item.includes('/modules/'))
- .filter((item) => isAiFeatureEnabled || !item.includes('/views/ai/'))
.map((v) => {
const path = v.replace('../../views/', '/');
return path.endsWith('.vue') ? path.slice(0, -4) : path;
diff --git a/src/utils/routerHelper.ts b/src/utils/routerHelper.ts
index a9e99f5..299b2d1 100644
--- a/src/utils/routerHelper.ts
+++ b/src/utils/routerHelper.ts
@@ -5,7 +5,14 @@
import { defineAsyncComponent } from 'vue';
-const modules = import.meta.glob('../views/**/*.{vue,tsx}');
+const modules = import.meta.glob([
+ '../views/**/*.{vue,tsx}',
+ '!../views/ai/**',
+ '!../views/dashboard/analytics/modules/ai-insights.vue',
+ '!../views/mes/**/modules/ai/**',
+ '!../views/mes/qc/components/ai-*.vue',
+ '!../views/crm/saleQuotation/modules/ocr-upload.vue',
+]);
/**
* 娉ㄥ唽涓�涓紓姝ョ粍浠�
diff --git a/src/views/mes/md/item/components/select-dialog.vue b/src/views/mes/md/item/components/select-dialog.vue
index aff91de..a1b4d30 100644
--- a/src/views/mes/md/item/components/select-dialog.vue
+++ b/src/views/mes/md/item/components/select-dialog.vue
@@ -3,11 +3,11 @@
import type { MesMdItemApi } from "#/api/mes/md/item";
import type { MesMdItemTypeApi } from "#/api/mes/md/item/type";
- import { nextTick, ref } from "vue";
+ import { computed, nextTick, ref } from "vue";
import { CommonStatusEnum } from "@vben/constants";
- import { Card, message, Modal } from "ant-design-vue";
+ import { Alert, Card, message, Modal, Tag } from "ant-design-vue";
import { useVbenVxeGrid } from "#/adapter/vxe-table";
import { getItemPage } from "#/api/mes/md/item";
@@ -28,6 +28,13 @@
const preSelectedIds = ref<number[]>([]); // 棰勯�夌墿鏂欑紪鍙峰垪琛�
const productIds = ref<number[]>([]); // 闄愬畾鍙�夌殑鐗╂枡缂栧彿鍒楄〃锛堜负绌哄垯涓嶉檺鍒讹級
const typeTreeRef = ref<InstanceType<typeof MdItemTypeTree>>(); // 鐗╂枡鍒嗙被鏍�
+ const limitedToProducts = computed(() => productIds.value.length > 0);
+ const dialogTitle = computed(() =>
+ limitedToProducts.value ? "璺嚎浜у嚭閫夋嫨" : "鐗╂枡浜у搧閫夋嫨",
+ );
+ const tableTitle = computed(() =>
+ limitedToProducts.value ? "宸查厤缃殑浜у嚭浜у搧" : "鐗╂枡浜у搧鍒楄〃",
+ );
/** 鑾峰彇褰撳墠琛ㄦ牸鏁版嵁 */
function getTableRows() {
@@ -140,7 +147,6 @@
};
// 闄愬畾鍙�夌墿鏂欒寖鍥�
if (productIds.value.length > 0) {
- params.pageSize = 1000;
params.ids = productIds.value.join(',');
}
const result = await getItemPage(params as never);
@@ -219,21 +225,34 @@
<template>
<Modal v-model:open="open"
- title="鐗╂枡浜у搧閫夋嫨"
+ :title="dialogTitle"
width="80%"
:destroy-on-close="true"
@ok="handleConfirm"
@cancel="closeModal">
<div class="flex h-[60vh] w-full">
<Card
+ v-if="!limitedToProducts"
class="mr-4 h-full w-1/5"
:body-style="{ height: '100%', overflow: 'hidden' }"
>
<MdItemTypeTree ref="typeTreeRef"
@node-click="handleItemTypeNodeClick" />
</Card>
- <div class="w-4/5">
- <Grid table-title="鐗╂枡浜у搧鍒楄〃" />
+ <div :class="limitedToProducts ? 'w-full' : 'w-4/5'">
+ <Alert
+ v-if="limitedToProducts"
+ class="mb-3"
+ message="浠呭彲閫夋嫨鏈矾绾垮凡閰嶇疆鐨勪骇鍑轰骇鍝�"
+ description="濡傞渶澧炲姞鍙�夐」锛岃杩斿洖鈥滀骇鍑轰骇鍝佸強鍏ュ簱浠撯�濇楠ゅ厛娣诲姞浜у嚭銆�"
+ show-icon
+ type="info"
+ >
+ <template #action>
+ <Tag color="blue">{{ productIds.length }} 涓骇鍑�</Tag>
+ </template>
+ </Alert>
+ <Grid :table-title="tableTitle" />
</div>
</div>
</Modal>
diff --git a/src/views/mes/pro/route/data.ts b/src/views/mes/pro/route/data.ts
index 71199db..5fb905a 100644
--- a/src/views/mes/pro/route/data.ts
+++ b/src/views/mes/pro/route/data.ts
@@ -220,6 +220,17 @@
rules: 'selectRequired',
},
{
+ fieldName: 'outputItemIds',
+ label: '鏈伐搴忎骇鍑�',
+ component: markRaw(MdItemSelect),
+ componentProps: {
+ multiple: true,
+ productIds,
+ placeholder: '鍙暀绌猴紱褰㈡垚鍗婃垚鍝佹椂閫夋嫨锛屾湯閬撳伐搴忛�夋嫨鍏ㄩ儴鎴愬搧',
+ },
+ formItemClass: 'col-span-2',
+ },
+ {
fieldName: 'linkType',
label: '涓庝笅閬撳伐搴忓叧绯�',
component: 'Select',
@@ -256,15 +267,14 @@
rules: z.boolean().default(false),
},
{
- fieldName: 'outputItemIds',
- label: '浜у嚭浜у搧',
- component: markRaw(MdItemSelect),
+ fieldName: 'backflushFlag',
+ label: '鎶ュ伐鑷姩鎵f枡',
+ component: 'Switch',
componentProps: {
- multiple: true,
- productIds,
- placeholder: '涓棿宸ュ簭閫夊崐鎴愬搧锛屾湯閬撳伐搴忛�夊叏閮ㄦ垚鍝�',
+ checkedChildren: '鑷姩',
+ unCheckedChildren: '鎵嬪姩',
},
- formItemClass: 'col-span-2',
+ rules: z.boolean().default(false),
},
{
fieldName: 'prepareTime',
@@ -308,6 +318,7 @@
{ field: 'sort', title: '搴忓彿', width: 70, align: 'center', fixed: 'left' },
{ field: 'processCode', title: '宸ュ簭缂栫爜', width: 140, fixed: 'left' },
{ field: 'processName', title: '宸ュ簭鍚嶇О', width: 140, fixed: 'left' },
+ { field: 'outputItemNames', title: '鏈伐搴忎骇鍑�', minWidth: 190 },
{ field: 'nextProcessName', title: '涓嬩竴閬撳伐搴�', width: 140 },
{
field: 'linkType',
@@ -336,9 +347,17 @@
props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
},
},
+ {
+ field: 'backflushFlag',
+ title: '鑷姩鎵f枡',
+ width: 100,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+ },
+ },
{ field: 'prepareTime', title: '鍑嗗鏃堕棿(鍒�)', width: 110 },
{ field: 'waitTime', title: '绛夊緟鏃堕棿(鍒�)', width: 110 },
- { field: 'outputItemNames', title: '浜у嚭浜у搧', minWidth: 180 },
{
field: 'colorCode',
title: '鐢樼壒鍥鹃鑹�',
@@ -358,14 +377,14 @@
/** 宸ヨ壓璺嚎浜у搧鍒楄〃瀛楁 */
export function useRouteProductGridColumns(): VxeTableGridOptions<MesProRouteProductApi.RouteProduct>['columns'] {
return [
- { field: 'itemCode', title: '浜у搧鐗╂枡缂栫爜', width: 150 },
- { field: 'itemName', title: '浜у搧鐗╂枡鍚嶇О', width: 150 },
+ { field: 'itemCode', title: '浜у嚭缂栫爜', width: 150 },
+ { field: 'itemName', title: '浜у嚭鍚嶇О', width: 150 },
{ field: 'specification', title: '瑙勬牸鍨嬪彿', width: 150 },
{ field: 'unitName', title: '鍗曚綅', width: 80 },
{ field: 'quantity', title: '鐢熶骇鏁伴噺', width: 100 },
- { field: 'warehouseName', title: '鎶ュ伐浠撳簱', width: 130 },
- { field: 'locationName', title: '搴撳尯', width: 120 },
- { field: 'areaName', title: '搴撲綅', width: 120 },
+ { field: 'warehouseName', title: '鎶ュ伐鍏ュ簱浠�', width: 140 },
+ { field: 'locationName', title: '鍏ュ簱搴撳尯', width: 120 },
+ { field: 'areaName', title: '鍏ュ簱搴撲綅', width: 120 },
{
field: 'productionTime',
title: '鐢熶骇鐢ㄦ椂',
@@ -385,8 +404,8 @@
/** 宸ヨ壓璺嚎浜у搧 BOM 鍒楄〃瀛楁 */
export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>['columns'] {
return [
- { field: 'itemCode', title: 'BOM 鐗╂枡缂栫爜', width: 150 },
- { field: 'itemName', title: 'BOM 鐗╂枡鍚嶇О', width: 150 },
+ { field: 'itemCode', title: '鎶曟枡缂栫爜', width: 150 },
+ { field: 'itemName', title: '鎶曟枡鍚嶇О', width: 150 },
{ field: 'specification', title: '瑙勬牸鍨嬪彿', width: 150 },
{ field: 'unitName', title: '鍗曚綅', width: 80 },
{ field: 'quantity', title: '鐢ㄦ枡姣斾緥', width: 100 },
diff --git a/src/views/mes/pro/route/index.vue b/src/views/mes/pro/route/index.vue
index 42e1081..d29404e 100644
--- a/src/views/mes/pro/route/index.vue
+++ b/src/views/mes/pro/route/index.vue
@@ -8,7 +8,7 @@
import { getDictLabel } from '@vben/hooks';
import { downloadFileFromBlobPart } from '@vben/utils';
-import { Button, message, Tooltip } from 'ant-design-vue';
+import { Alert, Button, message, Tooltip } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -23,7 +23,7 @@
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
-import Form from './modules/form.vue';
+import Form from './modules/route-configurator.vue';
const { hasAccessByCodes } = useAccess();
const statusEditable = hasAccessByCodes(['mes:pro-route:update']); // 鏄惁鍙垏鎹㈢姸鎬�
@@ -77,7 +77,9 @@
): Promise<boolean | undefined> {
try {
await confirm(
- `纭瑕佸皢"${row.name}"宸ヨ壓璺嚎鍒囨崲涓恒��${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}銆戝悧锛焋,
+ newStatus === CommonStatusEnum.ENABLE
+ ? `纭鍚敤鈥�${row.name}鈥濆悧锛熺郴缁熷皢妫�鏌ヤ骇鍑哄叆搴撲綅缃�佸伐搴忎骇鍑哄拰宸ュ簭鎶曟枡鏄惁瀹屾暣銆俙
+ : `纭瑕佸皢鈥�${row.name}鈥濆伐鑹鸿矾绾垮垏鎹负銆�${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}銆戝悧锛焋,
);
} catch {
return false;
@@ -139,6 +141,13 @@
<template>
<Page auto-content-height><FormModal @success="handleRefresh" />
<ImportModal @success="handleRefresh" />
+ <Alert
+ class="mb-3"
+ message="璺嚎閰嶇疆椤哄簭"
+ description="鍩烘湰淇℃伅 鈫� 浜у嚭浜у搧鍙婂叆搴撲粨 鈫� 宸ュ簭鍙婂悇宸ュ簭浜у嚭 鈫� 宸ュ簭鎶曟枡 鈫� 鏍¢獙鍚敤"
+ show-icon
+ type="info"
+ />
<Grid table-title="宸ヨ壓璺嚎鍒楄〃">
<template #toolbar-tools>
<TableAction
diff --git a/src/views/mes/pro/route/modules/material-input-list.vue b/src/views/mes/pro/route/modules/material-input-list.vue
new file mode 100644
index 0000000..8d0c9c6
--- /dev/null
+++ b/src/views/mes/pro/route/modules/material-input-list.vue
@@ -0,0 +1,145 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { computed, ref, watch } from 'vue';
+
+import { Alert, Button, Empty, Tag } from 'ant-design-vue';
+
+import { getRouteProductBomList } from '#/api/mes/pro/route/productbom';
+
+import ProductBomList from './product-bom-list.vue';
+
+const props = defineProps<{
+ formType: FormType;
+ processes: MesProRouteProcessApi.RouteProcess[];
+ products: MesProRouteProductApi.RouteProduct[];
+ routeId: number;
+}>();
+
+const emit = defineEmits<{
+ change: [list: MesProRouteProductBomApi.RouteProductBom[]];
+}>();
+
+const activeProductId = ref<number>();
+const allBomList = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
+
+const activeProduct = computed(() =>
+ props.products.find((item) => item.itemId === activeProductId.value),
+);
+
+function materialCount(productId?: number) {
+ if (!productId) return 0;
+ return allBomList.value.filter((item) => item.productId === productId).length;
+}
+
+async function loadAll() {
+ allBomList.value = (await getRouteProductBomList({ routeId: props.routeId })) || [];
+ emit('change', allBomList.value);
+}
+
+watch(
+ () => props.products.map((item) => item.itemId).filter(Boolean),
+ (productIds) => {
+ if (!productIds.length) {
+ activeProductId.value = undefined;
+ return;
+ }
+ if (!activeProductId.value || !productIds.includes(activeProductId.value)) {
+ activeProductId.value = productIds[0];
+ }
+ },
+ { immediate: true },
+);
+
+watch(
+ () => props.routeId,
+ (value) => value && loadAll(),
+ { immediate: true },
+);
+</script>
+
+<template>
+ <Alert
+ class="mb-4"
+ message="鎸変骇鍑轰骇鍝侀厤缃瘡閬撳伐搴忛渶瑕佹姇鍏ョ殑鐗╂枡"
+ description="鍏堥�夋嫨浜у嚭浜у搧锛屽啀鍒囨崲鍒板叿浣撳伐搴忔坊鍔犳姇鏂欑墿鏂欏拰鐢ㄦ枡姣斾緥銆傚紑鍚�滄姤宸ヨ嚜鍔ㄦ墸鏂欌�濈殑宸ュ簭锛屼細鍦ㄦ姤宸ユ椂鎸夎繖閲岀殑閰嶇疆鑷姩鎵e噺搴撳瓨銆�"
+ show-icon
+ type="info"
+ />
+
+ <Empty
+ v-if="!products.length || !processes.length"
+ :description="!products.length ? '璇峰厛瀹屾垚浜у嚭浜у搧閰嶇疆' : '璇峰厛瀹屾垚宸ュ簭閰嶇疆'"
+ />
+
+ <div v-else class="material-layout">
+ <aside class="product-selector" aria-label="閫夋嫨瑕侀厤缃姇鏂欑殑浜у嚭浜у搧">
+ <div class="selector-heading">
+ <strong>浜у嚭浜у搧</strong>
+ <span>{{ products.length }} 涓�</span>
+ </div>
+ <Button
+ v-for="product in products"
+ :key="product.itemId"
+ :class="['product-button', { active: product.itemId === activeProductId }]"
+ type="text"
+ @click="activeProductId = product.itemId"
+ >
+ <span class="product-copy">
+ <strong>{{ product.itemName }}</strong>
+ <small>{{ product.itemCode }}</small>
+ </span>
+ <Tag :color="materialCount(product.itemId) ? 'success' : 'warning'">
+ {{ materialCount(product.itemId) ? `${materialCount(product.itemId)} 鏉 : '鏈厤缃�' }}
+ </Tag>
+ </Button>
+ </aside>
+
+ <section v-if="activeProduct" class="material-detail">
+ <header class="material-detail-header">
+ <div>
+ <h3>{{ activeProduct.itemName }} 路 宸ュ簭鎶曟枡</h3>
+ <p>渚濇鍒囨崲宸ュ簭锛岀淮鎶よ浜у搧鍦ㄨ宸ュ簭瀹為檯娑堣�楃殑鐗╂枡銆�</p>
+ </div>
+ <Tag color="blue">{{ processes.length }} 閬撳伐搴�</Tag>
+ </header>
+ <ProductBomList
+ :form-type="formType"
+ :product-id="activeProduct.itemId!"
+ :product-name="activeProduct.itemName"
+ :route-id="routeId"
+ @change="loadAll"
+ />
+ </section>
+ </div>
+</template>
+
+<style scoped>
+.material-layout { display: grid; grid-template-columns: minmax(210px, 260px) minmax(0, 1fr); gap: 18px; }
+.product-selector { overflow: hidden; align-self: start; border: 1px solid rgb(226 232 240); border-radius: 12px; background: rgb(248 250 252); }
+.selector-heading { display: flex; align-items: center; justify-content: space-between; padding: 14px 16px; border-bottom: 1px solid rgb(226 232 240); color: rgb(15 23 42); }
+.selector-heading span { color: rgb(100 116 139); font-size: 12px; }
+.product-button { display: flex; width: 100%; height: auto; min-height: 62px; align-items: center; justify-content: space-between; gap: 10px; padding: 10px 12px; border-radius: 0; text-align: left; }
+.product-button + .product-button { border-top: 1px solid rgb(226 232 240); }
+.product-button.active { background: rgb(219 234 254); color: rgb(29 78 216); }
+.product-copy { display: grid; min-width: 0; gap: 2px; }
+.product-copy strong, .product-copy small { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.product-copy small { color: rgb(100 116 139); }
+.material-detail { min-width: 0; padding: 18px; border: 1px solid rgb(226 232 240); border-radius: 12px; }
+.material-detail-header { display: flex; align-items: flex-start; justify-content: space-between; gap: 12px; }
+.material-detail-header h3 { margin: 0; color: rgb(15 23 42); font-size: 16px; font-weight: 650; }
+.material-detail-header p { margin: 4px 0 0; color: rgb(100 116 139); font-size: 13px; }
+:global(.dark) .product-selector, :global(.dark) .material-detail { border-color: rgb(51 65 85); background: rgb(15 23 42); }
+:global(.dark) .selector-heading, :global(.dark) .product-button + .product-button { border-color: rgb(51 65 85); color: rgb(241 245 249); }
+:global(.dark) .product-button.active { background: rgb(30 64 175 / 35%); color: rgb(147 197 253); }
+:global(.dark) .material-detail-header h3 { color: rgb(241 245 249); }
+@media (max-width: 900px) {
+ .material-layout { grid-template-columns: 1fr; }
+ .product-selector { display: flex; overflow-x: auto; }
+ .selector-heading { display: none; }
+ .product-button { min-width: 210px; border-top: 0 !important; border-right: 1px solid rgb(226 232 240); }
+}
+</style>
diff --git a/src/views/mes/pro/route/modules/process-form.vue b/src/views/mes/pro/route/modules/process-form.vue
index 46b7318..493f6c4 100644
--- a/src/views/mes/pro/route/modules/process-form.vue
+++ b/src/views/mes/pro/route/modules/process-form.vue
@@ -6,7 +6,7 @@
import { useVbenModal } from '@vben/common-ui';
-import { message } from 'ant-design-vue';
+import { Alert, message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { getProcessSimpleList } from '#/api/mes/pro/process';
@@ -121,6 +121,13 @@
<template>
<Modal :title="getTitle" class="w-3/5">
+ <Alert
+ class="mx-4 mb-4"
+ message="鎸夊疄闄呯敓浜ц妭鐐归厤缃骇鍑�"
+ description="涓棿宸ュ簭娌℃湁鐙珛浜у嚭鏃跺彲鐣欑┖锛涘舰鎴愬崐鎴愬搧鏃堕�夋嫨瀵瑰簲鍗婃垚鍝侊紝鏈亾宸ュ簭蹇呴』閫夋嫨鍏ㄩ儴鎴愬搧銆傚寮�鍚姤宸ヨ嚜鍔ㄦ墸鏂欙紝鎶ュ伐鏃朵細鎸夊伐搴忔姇鏂欓厤缃墸鍑忓簱瀛樸��"
+ show-icon
+ type="info"
+ />
<Form class="mx-4" />
</Modal>
</template>
diff --git a/src/views/mes/pro/route/modules/process-list.vue b/src/views/mes/pro/route/modules/process-list.vue
index 192cb5c..b6f4fd0 100644
--- a/src/views/mes/pro/route/modules/process-list.vue
+++ b/src/views/mes/pro/route/modules/process-list.vue
@@ -4,11 +4,11 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
-import { ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
-import { message } from 'ant-design-vue';
+import { message, Tag } from 'ant-design-vue';
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -25,8 +25,15 @@
routeId: number;
}>();
-const isEditable = ref(props.formType !== 'detail'); // 鏄惁鍙紪杈�
+const emit = defineEmits<{
+ change: [list: MesProRouteProcessApi.RouteProcess[]];
+}>();
+
+const isEditable = computed(() => props.formType !== 'detail'); // 鏄惁鍙紪杈�
const list = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 宸ヨ壓璺嚎宸ュ簭鍒楄〃
+const sortedList = computed(() =>
+ [...list.value].sort((a, b) => (a.sort || 0) - (b.sort || 0)),
+);
const [ProcessFormModal, processFormModalApi] = useVbenModal({
connectedComponent: ProcessForm,
@@ -53,6 +60,7 @@
try {
list.value = await getRouteProcessListByRoute(props.routeId);
gridApi.setGridOptions({ data: list.value });
+ emit('change', list.value);
} finally {
gridApi.setLoading(false);
}
@@ -89,6 +97,16 @@
<template>
<ProcessFormModal @success="getList" />
+ <div v-if="sortedList.length" class="mb-4 flex flex-wrap items-center gap-2 rounded-lg bg-slate-50 p-3 dark:bg-slate-900">
+ <template v-for="(item, index) in sortedList" :key="item.id">
+ <div class="flex items-center gap-2 rounded-md border border-slate-200 bg-white px-3 py-2 dark:border-slate-700 dark:bg-slate-800">
+ <span class="text-xs font-semibold text-blue-600">{{ item.sort }}</span>
+ <span class="font-medium">{{ item.processName }}</span>
+ <Tag v-if="index === sortedList.length - 1" color="blue">鏈亾</Tag>
+ </div>
+ <span v-if="index < sortedList.length - 1" class="text-slate-400">鈫�</span>
+ </template>
+ </div>
<div v-if="isEditable" class="mb-3 flex items-center justify-start">
<TableAction
:actions="[
@@ -100,7 +118,7 @@
]"
/>
</div>
- <Grid class="w-full" table-title="缁勬垚宸ュ簭">
+ <Grid class="w-full" table-title="宸ュ簭椤哄簭鍙婂悇宸ュ簭浜у嚭">
<template #colorCode="{ row }">
<div v-if="row.colorCode" class="flex items-center justify-center gap-1">
<div
diff --git a/src/views/mes/pro/route/modules/product-bom-list.vue b/src/views/mes/pro/route/modules/product-bom-list.vue
index 78ac672..9d36a56 100644
--- a/src/views/mes/pro/route/modules/product-bom-list.vue
+++ b/src/views/mes/pro/route/modules/product-bom-list.vue
@@ -1,9 +1,10 @@
<script lang="ts" setup>
+import type { FormType } from '../data';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
-import { ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
@@ -21,10 +22,17 @@
import BomForm from './bom-form.vue';
const props = defineProps<{
+ formType: FormType;
productId: number;
productName?: string;
routeId: number;
}>();
+
+const emit = defineEmits<{
+ change: [];
+}>();
+
+const isEditable = computed(() => props.formType !== 'detail');
const processList = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 宸ュ簭鍒楄〃锛堢敤浜� Tab锛�
const activeProcessId = ref<number>(); // 褰撳墠閫変腑鐨勫伐搴� Tab
@@ -112,6 +120,12 @@
await deleteRouteProductBom(row.id!);
message.success($t('ui.actionMessage.deleteSuccess', ['BOM 鐗╂枡']));
await getList();
+ emit('change');
+}
+
+async function handleSaved() {
+ await getList();
+ emit('change');
}
watch(
@@ -126,7 +140,7 @@
</script>
<template>
- <BomFormModal @success="getList" />
+ <BomFormModal @success="handleSaved" />
<Tabs v-model:active-key="activeProcessId" @change="getList">
<TabPane
v-for="item in processList"
@@ -134,11 +148,11 @@
:tab="item.processName"
/>
</Tabs>
- <div class="mb-3 flex items-center justify-start">
+ <div v-if="isEditable" class="mb-3 flex items-center justify-start">
<TableAction
:actions="[
{
- label: $t('ui.actionTitle.create', ['BOM 鐗╂枡']),
+ label: $t('ui.actionTitle.create', ['鎶曟枡鐗╂枡']),
type: 'primary',
disabled: !activeProcessId,
onClick: handleCreate,
@@ -146,21 +160,23 @@
]"
/>
</div>
- <Grid class="w-full" table-title="浜у搧 BOM">
+ <Grid class="w-full" table-title="褰撳墠宸ュ簭鎶曟枡">
<template #actions="{ row }">
<TableAction
:actions="[
{
label: $t('common.edit'),
type: 'link',
+ ifShow: () => isEditable,
onClick: handleEdit.bind(null, row),
},
{
label: $t('common.delete'),
type: 'link',
danger: true,
+ ifShow: () => isEditable,
popConfirm: {
- title: $t('ui.actionMessage.deleteConfirm', ['BOM 鐗╂枡']),
+ title: $t('ui.actionMessage.deleteConfirm', ['鎶曟枡鐗╂枡']),
confirm: handleDelete.bind(null, row),
},
},
diff --git a/src/views/mes/pro/route/modules/product-form.vue b/src/views/mes/pro/route/modules/product-form.vue
index 399681d..dbe573b 100644
--- a/src/views/mes/pro/route/modules/product-form.vue
+++ b/src/views/mes/pro/route/modules/product-form.vue
@@ -5,7 +5,7 @@
import { useVbenModal } from '@vben/common-ui';
-import { Divider, message } from 'ant-design-vue';
+import { Alert, message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import {
@@ -16,7 +16,6 @@
import { $t } from '#/locales';
import { useRouteProductFormSchema } from '../data';
-import ProductBomList from './product-bom-list.vue';
const emit = defineEmits(['success']);
const formData = ref<MesProRouteProductApi.RouteProduct>();
@@ -64,14 +63,10 @@
try {
if (formData.value?.id) {
await updateRouteProduct(data);
- // 鐢ㄦ渶鏂拌〃鍗曞�煎悓姝� formData锛岀‘淇濅骇鍝� BOM 瀛愯〃缁戝畾鐨� itemId 涓庤〃鍗曚竴鑷�
- formData.value = { ...formData.value, ...data };
} else {
- // 鏂板鎴愬姛鍚庡垏鎹㈠埌缂栬緫妯″紡锛屾柟渚跨户缁淮鎶や骇鍝� BOM
- const id = await createRouteProduct(data);
- formData.value = { ...data, id };
- await formApi.setFieldValue('id', id);
+ await createRouteProduct(data);
}
+ await modalApi.close();
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
@@ -109,17 +104,13 @@
<template>
<Modal :title="getTitle" class="w-3/5">
+ <Alert
+ class="mx-4 mb-4"
+ message="杩欓噷缁存姢浜у嚭鍙婂叾鎶ュ伐鍏ュ簱浣嶇疆"
+ description="鎶曟枡鐗╂枡灏嗗湪璺嚎閰嶇疆鐨勨�滃伐搴忔姇鏂欌�濇楠や腑鎸変骇鍝併�佹寜宸ュ簭缁熶竴缁存姢銆�"
+ show-icon
+ type="info"
+ />
<Form class="mx-4" />
- <!-- 缂栬緫妯″紡涓嬪睍绀轰骇鍝� BOM 瀛愯〃锛屾柊澧炴ā寮忎笅闅愯棌 -->
- <template v-if="formData?.id && formData?.itemId">
- <Divider class="!my-3" orientation="left">浜у搧 BOM 閰嶇疆</Divider>
- <div class="mx-4">
- <ProductBomList
- :route-id="formData.routeId!"
- :product-id="formData.itemId"
- :product-name="formData.itemName"
- />
- </div>
- </template>
</Modal>
</template>
diff --git a/src/views/mes/pro/route/modules/product-list.vue b/src/views/mes/pro/route/modules/product-list.vue
index ea34d58..056d6db 100644
--- a/src/views/mes/pro/route/modules/product-list.vue
+++ b/src/views/mes/pro/route/modules/product-list.vue
@@ -4,7 +4,7 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
-import { ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
@@ -27,7 +27,11 @@
routeId: number;
}>();
-const isEditable = ref(props.formType !== 'detail'); // 鏄惁鍙紪杈�
+const emit = defineEmits<{
+ change: [list: MesProRouteProductApi.RouteProduct[]];
+}>();
+
+const isEditable = computed(() => props.formType !== 'detail'); // 鏄惁鍙紪杈�
const list = ref<MesProRouteProductApi.RouteProduct[]>([]); // 宸ヨ壓璺嚎浜у搧鍒楄〃
const [ProductFormModal, productFormModalApi] = useVbenModal({
@@ -55,6 +59,7 @@
try {
list.value = await getRouteProductListByRoute(props.routeId);
gridApi.setGridOptions({ data: list.value });
+ emit('change', list.value);
} finally {
gridApi.setLoading(false);
}
@@ -94,14 +99,14 @@
<TableAction
:actions="[
{
- label: $t('ui.actionTitle.create', ['鍏宠仈浜у搧']),
+ label: $t('ui.actionTitle.create', ['浜у嚭浜у搧']),
type: 'primary',
onClick: handleCreate,
},
]"
/>
</div>
- <Grid class="w-full" table-title="鍏宠仈浜у搧">
+ <Grid class="w-full" table-title="浜у嚭浜у搧鍙婃姤宸ュ叆搴撲綅缃�">
<template #productionTime="{ row }">
<span v-if="row.productionTime">
{{ row.productionTime }}
diff --git a/src/views/mes/pro/route/modules/route-configurator.vue b/src/views/mes/pro/route/modules/route-configurator.vue
new file mode 100644
index 0000000..f97e543
--- /dev/null
+++ b/src/views/mes/pro/route/modules/route-configurator.vue
@@ -0,0 +1,413 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+import type { MesProRouteApi } from '#/api/mes/pro/route';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { computed, ref } from 'vue';
+import { useVbenModal } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+import { Alert, Button, Empty, message, Steps, Tag } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { createRoute, getRoute, updateRoute } from '#/api/mes/pro/route';
+import { getRouteProcessListByRoute } from '#/api/mes/pro/route/process';
+import { getRouteProductListByRoute } from '#/api/mes/pro/route/product';
+import { getRouteProductBomList } from '#/api/mes/pro/route/productbom';
+
+import { useFormSchema } from '../data';
+import MaterialInputList from './material-input-list.vue';
+import ProcessList from './process-list.vue';
+import ProductList from './product-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesProRouteApi.Route>();
+const activeStep = ref(0);
+const productList = ref<MesProRouteProductApi.RouteProduct[]>([]);
+const processList = ref<MesProRouteProcessApi.RouteProcess[]>([]);
+const bomList = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
+
+const isDetail = computed(() => formType.value === 'detail');
+const isNew = computed(() => !formData.value?.id);
+const routeId = computed(() => formData.value?.id);
+const sortedProcessList = computed(() =>
+ [...processList.value].sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0)),
+);
+const title = computed(() =>
+ isDetail.value ? '鏌ョ湅宸ヨ壓璺嚎' : isNew.value ? '鏂板缓宸ヨ壓璺嚎' : '缂栬緫宸ヨ壓璺嚎',
+);
+
+const stepItems = [
+ { title: '鍩烘湰淇℃伅', description: '璺嚎鍚嶇О涓庤鏄�' },
+ { title: '浜у嚭涓庡叆搴�', description: '浜у搧鍙婃姤宸ヤ粨浣�' },
+ { title: '宸ュ簭涓庝骇鍑�', description: '椤哄簭鍜屽崐鎴愬搧/鎴愬搧' },
+ { title: '宸ュ簭鎶曟枡', description: '鎸変骇鍝佷笌宸ュ簭閰嶇疆' },
+ { title: '鍚敤鍓嶆鏌�', description: '闆嗕腑妫�鏌ョ己澶遍」' },
+];
+
+const productsWithWarehouse = computed(() =>
+ productList.value.filter((item) => item.warehouseId && item.locationId && item.areaId).length,
+);
+const processesWithOutput = computed(() =>
+ processList.value.filter((item) => item.outputItemIds?.length).length,
+);
+const lastProcess = computed(() => sortedProcessList.value.at(-1));
+const configuredProductIds = computed(
+ () => new Set(bomList.value.map((item) => item.productId).filter(Boolean)),
+);
+const productsWithBom = computed(() => configuredProductIds.value.size);
+const reviewIssues = computed(() => {
+ const issues: Array<{ step: number; text: string }> = [];
+ if (!productList.value.length) issues.push({ step: 1, text: '杩樻病鏈夐厤缃骇鍑轰骇鍝�' });
+ const missingWarehouse = productList.value.filter(
+ (item) => !item.warehouseId || !item.locationId || !item.areaId,
+ );
+ if (missingWarehouse.length) {
+ issues.push({
+ step: 1,
+ text: `${missingWarehouse.length} 涓骇鍑轰骇鍝佹湭閰嶇疆瀹屾暣浠撳簱銆佸簱鍖哄拰搴撲綅`,
+ });
+ }
+ if (!processList.value.length) issues.push({ step: 2, text: '杩樻病鏈夐厤缃敓浜у伐搴�' });
+ if (processList.value.length && !processList.value.some((item) => item.keyFlag)) {
+ issues.push({ step: 2, text: '鏈缃叧閿伐搴�' });
+ }
+ if (lastProcess.value && !lastProcess.value.outputItemIds?.length) {
+ issues.push({
+ step: 2,
+ text: `鏈亾宸ュ簭鈥�${lastProcess.value.processName || lastProcess.value.processCode || lastProcess.value.sort}鈥濆繀椤婚厤缃垚鍝佷骇鍑篳,
+ });
+ }
+ const productIds = new Set(productList.value.map((item) => item.itemId));
+ const invalidOutputCount = processList.value.filter((process) =>
+ process.outputItemIds?.some((itemId) => !productIds.has(itemId)),
+ ).length;
+ if (invalidOutputCount) {
+ issues.push({
+ step: 2,
+ text: `${invalidOutputCount} 閬撳伐搴忕殑浜у嚭鏈寘鍚湪璺嚎浜у嚭浜у搧涓璥,
+ });
+ }
+ const noBomProducts = productList.value.filter(
+ (item) => item.itemId && !configuredProductIds.value.has(item.itemId),
+ );
+ if (noBomProducts.length) {
+ issues.push({ step: 3, text: `${noBomProducts.length} 涓骇鍝佽繕娌℃湁閰嶇疆浠讳綍宸ュ簭鎶曟枡` });
+ }
+ return issues;
+});
+const primaryText = computed(() => {
+ if (activeStep.value === stepItems.length - 1) return isDetail.value ? '鍏抽棴' : '瀹屾垚閰嶇疆';
+ if (activeStep.value === 0 && isNew.value) return '淇濆瓨骞堕厤缃骇鍑�';
+ return '涓嬩竴姝�';
+});
+
+const [Form, formApi] = useVbenForm({
+ commonConfig: {
+ componentProps: { class: 'w-full' },
+ formItemClass: 'col-span-1',
+ labelWidth: 100,
+ },
+ layout: 'horizontal',
+ schema: [],
+ showDefaultActions: false,
+ wrapperClass: 'grid-cols-2',
+});
+
+async function loadConfiguration() {
+ if (!routeId.value) return;
+ const [products, processes, boms] = await Promise.all([
+ getRouteProductListByRoute(routeId.value),
+ getRouteProcessListByRoute(routeId.value),
+ getRouteProductBomList({ routeId: routeId.value }),
+ ]);
+ productList.value = products || [];
+ processList.value = processes || [];
+ bomList.value = boms || [];
+}
+
+async function saveBaseInformation() {
+ const { valid } = await formApi.validate();
+ if (!valid) return false;
+ modalApi.lock();
+ try {
+ const data = (await formApi.getValues()) as MesProRouteApi.Route;
+ if (!routeId.value) {
+ const id = await createRoute(data);
+ formData.value = { ...data, id };
+ await formApi.setFieldValue('id', id);
+ formType.value = 'update';
+ message.success('鍩烘湰淇℃伅宸蹭繚瀛橈紝璇风户缁厤缃骇鍑轰骇鍝佸拰鍏ュ簱浣嶇疆');
+ } else {
+ await updateRoute({ ...data, id: routeId.value });
+ formData.value = { ...formData.value, ...data, id: routeId.value };
+ }
+ emit('success');
+ return true;
+ } finally {
+ modalApi.unlock();
+ }
+}
+
+function validateProducts() {
+ if (!productList.value.length) {
+ message.warning('璇疯嚦灏戞坊鍔犱竴涓骇鍑轰骇鍝侊紝鍐嶉厤缃伐搴�');
+ return false;
+ }
+ if (productsWithWarehouse.value !== productList.value.length) {
+ message.warning('璇蜂负姣忎釜浜у嚭浜у搧閰嶇疆瀹屾暣鐨勪粨搴撱�佸簱鍖哄拰搴撲綅');
+ return false;
+ }
+ return true;
+}
+
+function validateProcesses() {
+ if (!processList.value.length) {
+ message.warning('璇疯嚦灏戞坊鍔犱竴閬撶敓浜у伐搴�');
+ return false;
+ }
+ return true;
+}
+
+function validateBom() {
+ if (productsWithBom.value !== productList.value.length) {
+ message.warning('姣忎釜浜у嚭浜у搧鑷冲皯瑕侀厤缃竴鏉″伐搴忔姇鏂�');
+ return false;
+ }
+ return true;
+}
+
+async function goToStep(target: number) {
+ if (target < 0 || target >= stepItems.length) return;
+ if (target <= activeStep.value || isDetail.value) {
+ activeStep.value = target;
+ return;
+ }
+ if (!(await saveBaseInformation())) return;
+ await loadConfiguration();
+ if (target >= 2 && !validateProducts()) return void (activeStep.value = 1);
+ if (target >= 3 && !validateProcesses()) return void (activeStep.value = 2);
+ if (target >= 4 && !validateBom()) return void (activeStep.value = 3);
+ activeStep.value = target;
+}
+
+async function handlePrimaryAction() {
+ if (activeStep.value === stepItems.length - 1) {
+ if (!isDetail.value && reviewIssues.value.length) {
+ message.warning('浠嶆湁缂哄け閰嶇疆锛岃鏍规嵁妫�鏌ョ粨鏋滆ˉ鍏呭悗鍐嶅畬鎴�');
+ return;
+ }
+ await modalApi.close();
+ return;
+ }
+ await goToStep(activeStep.value + 1);
+}
+
+const [Modal, modalApi] = useVbenModal({
+ showConfirmButton: false,
+ cancelText: '鍏抽棴',
+ async onOpenChange(isOpen: boolean) {
+ if (!isOpen) {
+ formData.value = undefined;
+ productList.value = [];
+ processList.value = [];
+ bomList.value = [];
+ activeStep.value = 0;
+ return;
+ }
+ formApi.setState({ schema: useFormSchema(formApi) });
+ const data = modalApi.getData<{ formType: FormType; id?: number }>();
+ formType.value = data.formType;
+ formApi.setDisabled(isDetail.value);
+ if (!data.id) return;
+ modalApi.lock();
+ try {
+ formData.value = await getRoute(data.id);
+ await formApi.setValues(formData.value);
+ await loadConfiguration();
+ } finally {
+ modalApi.unlock();
+ }
+ },
+});
+</script>
+
+<template>
+ <Modal :title="title" class="w-[94vw] max-w-[1560px]">
+ <div class="route-config-shell">
+ <header class="route-config-header">
+ <div class="min-w-0">
+ <div class="flex flex-wrap items-center gap-2">
+ <h2 class="m-0 text-lg font-semibold text-gray-900 dark:text-gray-100">
+ {{ formData?.name || '鏂板伐鑹鸿矾绾�' }}
+ </h2>
+ <Tag :color="isDetail ? 'default' : 'processing'">
+ {{ isDetail ? '鍙鏌ョ湅' : '閰嶇疆涓�' }}
+ </Tag>
+ </div>
+ <p class="mb-0 mt-1 text-sm text-gray-600 dark:text-gray-300">
+ 宸ュ簭鎶曟枡渚濊禆浜у嚭浜у搧鍜屽伐搴忥紝鍥犳鍦ㄥ伐搴忕紪鎺掑畬鎴愬悗闆嗕腑閰嶇疆銆�
+ </p>
+ </div>
+ <div class="route-config-summary" aria-label="褰撳墠閰嶇疆姒傝">
+ <span>浜у嚭 {{ productList.length }}</span>
+ <span>宸ュ簭 {{ processList.length }}</span>
+ <span>鎶曟枡 {{ bomList.length }}</span>
+ </div>
+ </header>
+
+ <Steps
+ :current="activeStep"
+ :items="stepItems"
+ class="route-config-steps"
+ responsive
+ size="small"
+ type="navigation"
+ @change="goToStep"
+ />
+
+ <main class="route-config-content">
+ <section v-show="activeStep === 0" class="route-step-panel">
+ <div class="route-step-copy">
+ <IconifyIcon icon="lucide:route" />
+ <div>
+ <h3>鍏堝畾涔夎繖鏉¤矾绾挎槸浠�涔�</h3>
+ <p>缂栫爜鐢ㄤ簬绯荤粺璇嗗埆锛屽悕绉板拰璇存槑甯姪鐜板満浜哄憳蹇�熼�夋嫨銆�</p>
+ </div>
+ </div>
+ <Form class="route-base-form" />
+ </section>
+
+ <section v-if="routeId" v-show="activeStep === 1" class="route-step-panel">
+ <Alert
+ class="mb-4"
+ message="鍏堢淮鎶ゆ墍鏈夊彲鑳界殑宸ュ簭浜у嚭"
+ description="瀹為檯褰㈡垚鐨勪腑闂村崐鎴愬搧鍜屾湯閬撳伐搴忕殑鎴愬搧閮借鍔犲叆锛屽苟鍒嗗埆鎸囧畾鎶ュ伐鍚庤繘鍏ョ殑浠撳簱銆佸簱鍖哄拰搴撲綅銆�"
+ show-icon
+ type="info"
+ />
+ <ProductList
+ :form-type="formType"
+ :route-id="routeId"
+ @change="productList = $event"
+ />
+ </section>
+
+ <section v-if="routeId" v-show="activeStep === 2" class="route-step-panel">
+ <Alert
+ class="mb-4"
+ message="鎸夊疄闄呯敓浜ч『搴忕紪鎺掑伐搴�"
+ description="涓棿宸ュ簭娌℃湁鐙珛浜у嚭鏃跺彲鐣欑┖锛涘舰鎴愬崐鎴愬搧鏃堕�夋嫨瀵瑰簲鍗婃垚鍝侊紝鏈�鍚庝竴閬撳伐搴忓繀椤婚�夋嫨璺嚎缁戝畾鐨勫叏閮ㄦ垚鍝併��"
+ show-icon
+ type="info"
+ />
+ <ProcessList
+ :form-type="formType"
+ :route-id="routeId"
+ @change="processList = $event"
+ />
+ </section>
+
+ <section v-if="routeId" v-show="activeStep === 3" class="route-step-panel">
+ <MaterialInputList
+ :form-type="formType"
+ :processes="sortedProcessList"
+ :products="productList"
+ :route-id="routeId"
+ @change="bomList = $event"
+ />
+ </section>
+
+ <section v-show="activeStep === 4" class="route-step-panel">
+ <div class="review-heading">
+ <div>
+ <h3>鍚敤鍓嶆鏌�</h3>
+ <p>纭浜у嚭銆佷粨浣嶃�佸伐搴忓拰鎶曟枡褰㈡垚闂幆鍚庯紝鍐嶅洖鍒板垪琛ㄥ惎鐢ㄨ矾绾裤��</p>
+ </div>
+ <Tag :color="reviewIssues.length ? 'warning' : 'success'">
+ {{ reviewIssues.length ? `${reviewIssues.length} 椤瑰緟澶勭悊` : '閰嶇疆瀹屾暣' }}
+ </Tag>
+ </div>
+
+ <div class="review-metrics">
+ <div><strong>{{ productsWithWarehouse }}/{{ productList.length }}</strong><span>浜у搧浠撲綅瀹屾暣</span></div>
+ <div><strong>{{ processesWithOutput }}</strong><span>閰嶇疆浜у嚭鐨勫伐搴�</span></div>
+ <div><strong>{{ productsWithBom }}/{{ productList.length }}</strong><span>浜у搧宸查厤缃姇鏂�</span></div>
+ </div>
+
+ <div v-if="reviewIssues.length" class="issue-list" role="status">
+ <button
+ v-for="issue in reviewIssues"
+ :key="issue.text"
+ class="issue-item"
+ type="button"
+ @click="activeStep = issue.step"
+ >
+ <IconifyIcon icon="lucide:circle-alert" />
+ <span>{{ issue.text }}</span>
+ <IconifyIcon class="ml-auto" icon="lucide:chevron-right" />
+ </button>
+ </div>
+ <Empty v-else description="鎵�鏈夊繀闇�閰嶇疆鍧囧凡瀹屾垚">
+ <template #image>
+ <div class="review-success-icon"><IconifyIcon icon="lucide:badge-check" /></div>
+ </template>
+ </Empty>
+ </section>
+ </main>
+ </div>
+
+ <template #prepend-footer>
+ <div class="flex flex-auto items-center justify-between gap-3">
+ <Button v-if="activeStep > 0" @click="activeStep--">
+ <IconifyIcon class="mr-1" icon="lucide:arrow-left" />涓婁竴姝�
+ </Button>
+ <span v-else class="text-sm text-gray-500">鏂板缓璺嚎榛樿鍋滅敤锛岄厤缃畬鏁村悗鍐嶅惎鐢�</span>
+ <Button type="primary" @click="handlePrimaryAction">
+ {{ primaryText }}
+ <IconifyIcon
+ v-if="activeStep < stepItems.length - 1"
+ class="ml-1"
+ icon="lucide:arrow-right"
+ />
+ </Button>
+ </div>
+ </template>
+ </Modal>
+</template>
+
+<style scoped>
+.route-config-shell { min-height: min(720px, 72vh); background: rgb(248 250 252); color: rgb(15 23 42); }
+.route-config-header { display: flex; align-items: center; justify-content: space-between; gap: 24px; padding: 18px 24px 14px; background: white; border-bottom: 1px solid rgb(226 232 240); }
+.route-config-summary { display: flex; flex-shrink: 0; gap: 8px; }
+.route-config-summary span { padding: 5px 10px; border-radius: 8px; background: rgb(239 246 255); color: rgb(29 78 216); font-size: 12px; font-weight: 600; }
+.route-config-steps { padding: 12px 20px 0; background: white; }
+.route-config-content { padding: 20px 24px 28px; }
+.route-step-panel { min-height: 460px; padding: 22px; border-radius: 14px; background: white; box-shadow: 0 10px 28px rgb(15 23 42 / 6%); }
+.route-step-copy, .review-heading { display: flex; align-items: flex-start; justify-content: space-between; gap: 14px; margin-bottom: 22px; }
+.route-step-copy { justify-content: flex-start; }
+.route-step-copy > svg { width: 38px; height: 38px; padding: 9px; border-radius: 10px; background: rgb(219 234 254); color: rgb(29 78 216); }
+.route-step-copy h3, .review-heading h3 { margin: 0; color: rgb(15 23 42); font-size: 17px; font-weight: 650; }
+.route-step-copy p, .review-heading p { margin: 4px 0 0; color: rgb(71 85 105); font-size: 14px; }
+.route-base-form { max-width: 1040px; margin: 34px auto 0; }
+.review-metrics { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 14px; margin: 24px 0; }
+.review-metrics > div { display: flex; align-items: baseline; gap: 10px; padding: 18px; border-radius: 12px; background: rgb(248 250 252); }
+.review-metrics strong { color: rgb(29 78 216); font-size: 24px; }
+.review-metrics span { color: rgb(71 85 105); font-size: 13px; }
+.issue-list { display: grid; gap: 10px; }
+.issue-item { display: flex; width: 100%; min-height: 48px; align-items: center; gap: 10px; padding: 10px 14px; border: 1px solid rgb(253 230 138); border-radius: 10px; background: rgb(255 251 235); color: rgb(146 64 14); cursor: pointer; text-align: left; transition: background-color 180ms ease, border-color 180ms ease; }
+.issue-item:hover, .issue-item:focus-visible { border-color: rgb(245 158 11); background: rgb(254 243 199); outline: none; }
+.review-success-icon { display: grid; width: 72px; height: 72px; place-items: center; margin: 0 auto; border-radius: 50%; background: rgb(220 252 231); color: rgb(22 163 74); font-size: 38px; }
+:global(.dark) .route-config-shell { background: rgb(15 23 42); color: rgb(226 232 240); }
+:global(.dark) .route-config-header, :global(.dark) .route-config-steps, :global(.dark) .route-step-panel { background: rgb(30 41 59); border-color: rgb(51 65 85); }
+:global(.dark) .route-step-copy h3, :global(.dark) .review-heading h3 { color: rgb(241 245 249); }
+:global(.dark) .route-step-copy p, :global(.dark) .review-heading p, :global(.dark) .review-metrics span { color: rgb(203 213 225); }
+:global(.dark) .review-metrics > div { background: rgb(15 23 42); }
+@media (max-width: 900px) {
+ .route-config-header { align-items: flex-start; flex-direction: column; }
+ .review-metrics { grid-template-columns: 1fr; }
+ .route-step-panel { padding: 16px; }
+}
+</style>
diff --git a/src/views/mes/process-design/route/index.vue b/src/views/mes/process-design/route/index.vue
index be8dc06..48f9ca1 100644
--- a/src/views/mes/process-design/route/index.vue
+++ b/src/views/mes/process-design/route/index.vue
@@ -8,7 +8,7 @@
import { getDictLabel } from '@vben/hooks';
import { downloadFileFromBlobPart } from '@vben/utils';
-import { Button, message, Tooltip } from 'ant-design-vue';
+import { Alert, Button, message, Tooltip } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -24,7 +24,8 @@
import ImportModalComponent from '#/components/import-modal';
import { useGridColumns, useGridFormSchema } from './data';
-import Form from './modules/form.vue';
+// 宸ヨ壓璁捐涓庣敓浜у熀纭�鏁版嵁鍏辩敤鍚屼竴涓厤缃櫒锛岄伩鍏嶄袱濂楅〉闈㈣兘鍔涗笉涓�鑷淬��
+import Form from '#/views/mes/pro/route/modules/route-configurator.vue';
const { hasAccessByCodes } = useAccess();
const statusEditable = hasAccessByCodes(['mes:pro-route:update']); // 鏄惁鍙垏鎹㈢姸鎬�
@@ -78,7 +79,9 @@
): Promise<boolean | undefined> {
try {
await confirm(
- `纭瑕佸皢"${row.name}"宸ヨ壓璺嚎鍒囨崲涓恒��${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}銆戝悧锛焋,
+ newStatus === CommonStatusEnum.ENABLE
+ ? `纭鍚敤鈥�${row.name}鈥濆悧锛熺郴缁熷皢妫�鏌ヤ骇鍑哄叆搴撲綅缃�佸伐搴忎骇鍑哄拰宸ュ簭鎶曟枡鏄惁瀹屾暣銆俙
+ : `纭瑕佸皢鈥�${row.name}鈥濆伐鑹鸿矾绾垮垏鎹负銆�${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}銆戝悧锛焋,
);
} catch {
return false;
@@ -140,6 +143,13 @@
<template>
<Page auto-content-height><FormModal @success="handleRefresh" />
<ImportModal @success="handleRefresh" />
+ <Alert
+ class="mb-3"
+ message="璺嚎閰嶇疆椤哄簭"
+ description="鍩烘湰淇℃伅 鈫� 浜у嚭浜у搧鍙婂叆搴撲粨 鈫� 宸ュ簭鍙婂悇宸ュ簭浜у嚭 鈫� 宸ュ簭鎶曟枡 鈫� 鏍¢獙鍚敤"
+ show-icon
+ type="info"
+ />
<Grid table-title="宸ヨ壓璺嚎鍒楄〃">
<template #toolbar-tools>
<TableAction
--
Gitblit v1.9.3