From 44266ab0adf7b14aabc28017dec34bdc4fbc96da Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:53:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新高电力' into dev_新疆_新高电力
---
src/views/mes/pro/route/modules/product-form.vue | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
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>
--
Gitblit v1.9.3