From 64a8cd04229f7b903913fc3dc7ef4aef267ac3bc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 17:36:14 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' into dev_南通_苏珩
---
src/views/mes/pro/route/modules/process-form.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/views/mes/pro/route/modules/process-form.vue b/src/views/mes/pro/route/modules/process-form.vue
index 6dcab06..228ee31 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';
@@ -15,6 +15,7 @@
getRouteProcess,
updateRouteProcess,
} from '#/api/mes/pro/route/process';
+import { getRouteProductListByRoute } from '#/api/mes/pro/route/product';
import { $t } from '#/locales';
import { useRouteProcessFormSchema } from '../data';
@@ -31,7 +32,7 @@
commonConfig: {
componentProps: { class: 'w-full' },
formItemClass: 'col-span-1',
- labelWidth: 150,
+ labelWidth: 130,
},
layout: 'horizontal',
schema: [],
@@ -40,13 +41,14 @@
});
/** 鍔犺浇宸ュ簭閫夐」鍚庡啀鐢熸垚 schema锛堥伩鍏嶄笅鎷夌┖閫夐」锛� */
-async function loadSchema(): Promise<VbenFormSchema[]> {
+async function loadSchema(routeId: number): Promise<VbenFormSchema[]> {
const list = await getProcessSimpleList();
const options = (list || []).map((item) => ({
label: item.name ?? '',
value: item.id!,
}));
- return useRouteProcessFormSchema(options);
+ const products = routeId ? await getRouteProductListByRoute(routeId) : [];
+ return useRouteProcessFormSchema(options, products);
}
const [Modal, modalApi] = useVbenModal({
@@ -76,15 +78,6 @@
formData.value = undefined;
return;
}
- modalApi.lock();
- try {
- // 宸ュ簭涓嬫媺渚濊禆杩滅▼鏁版嵁锛宻chema 鍦ㄥ脊绐楁墦寮�鏃跺啀鐢熸垚
- const schema = await loadSchema();
- formApi.setState({ schema });
- } finally {
- modalApi.unlock();
- }
- // 鍔犺浇鏁版嵁
const data = modalApi.getData<{
id?: number;
maxSort?: number;
@@ -93,6 +86,15 @@
if (!data) {
return;
}
+ modalApi.lock();
+ try {
+ // 宸ュ簭涓嬫媺渚濊禆杩滅▼鏁版嵁锛宻chema 鍦ㄥ脊绐楁墦寮�鏃跺啀鐢熸垚
+ const schema = await loadSchema(data.routeId);
+ formApi.setState({ schema });
+ } finally {
+ modalApi.unlock();
+ }
+ // 鍔犺浇鏁版嵁
if (!data.id) {
// 鏂板鏃讹紝榛樿搴忓彿 = maxSort + 1锛屽苟缁欎竴涓粯璁ょ敇鐗瑰浘棰滆壊
await formApi.setValues({
@@ -116,6 +118,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>
--
Gitblit v1.9.3