From a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/md/item/modules/form.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/views/mes/md/item/modules/form.vue b/src/views/mes/md/item/modules/form.vue
index 3295fb3..1639098 100644
--- a/src/views/mes/md/item/modules/form.vue
+++ b/src/views/mes/md/item/modules/form.vue
@@ -5,10 +5,10 @@
import { computed, ref } from 'vue';
-import { useVbenModal } from '../../../../../packages/effects/common-ui/src';
-import { BarcodeBizTypeEnum } from '../../../../../packages/constants/src';
+import { useVbenModal } from '@vben/common-ui';
+import { BarcodeBizTypeEnum } from '@vben/constants';
-import { Button, Empty, message, Tabs } from 'ant-design-vue';
+import { Button, message, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { createItem, getItem, updateItem } from '#/api/mes/md/item';
@@ -82,14 +82,12 @@
if (formType.value === 'create') {
const id = await createItem(data);
formData.value = { ...data, id };
- await formApi.setFieldValue('id', id);
- formType.value = 'update';
- message.success($t('ui.actionMessage.operationSuccess'));
} else {
await updateItem(data);
formData.value = { ...formData.value, ...data };
- message.success($t('ui.actionMessage.operationSuccess'));
}
+ message.success($t('ui.actionMessage.operationSuccess'));
+ await modalApi.close();
emit('success');
} finally {
modalApi.unlock();
@@ -131,22 +129,30 @@
class="mx-4 mt-4"
>
<Tabs.TabPane key="bom" tab="BOM 缁勬垚">
+ <p class="mb-3 text-xs text-gray-400">
+ 姝ゅ缁存姢鐨勬槸浜у搧鑷韩鐨勭墿鏂欐瀯鎴愶紙閰嶆柟锛夛紝骞堕潪宸ヨ壓璺嚎鐨勬姇鏂� BOM锛涘湪銆屽伐鑹烘祦绋嬨�嶅伐浣滃彴閰嶇疆銆屾姇鍏ョ墿鏂欍�嶆椂锛屼細浠庤 BOM 涓�夋嫨鐗╂枡銆�
+ </p>
<ProductBomForm :form-type="formType" :item-id="formData.id" />
</Tabs.TabPane>
<Tabs.TabPane v-if="formData.batchFlag" key="batch" tab="鎵规灞炴��">
+ <p class="mb-3 text-xs text-gray-400">
+ 姝ゅ閰嶇疆姣忎釜鎵规闇�瑕佺櫥璁扮殑灞炴�х淮搴︼紝鍕鹃�夊悗鍏ュ簱銆佹姤宸ャ�佽川妫�绛夌幆鑺傚皢鎸夋墍閫夌淮搴︾敓鎴愭壒娆′俊鎭�傜墿鏂欎笌浜у搧鐨勫彲閫夊睘鎬т笉鍚岋細鐗╂枡渚ч噸渚涘簲鍟嗐�佹湁鏁堟湡绛夛紝浜у搧渚ч噸璁㈠崟銆佸伐搴忋�佸伐浣滅珯绛夈��
+ </p>
<ItemBatchConfigForm
:form-type="formType"
:item-id="formData.id"
:item-or-product="currentItemOrProduct"
/>
</Tabs.TabPane>
+ <!-- 鏇夸唬鍝佹爣绛鹃〉鏈疄鐜帮紝鏆傛椂闅愯棌
<Tabs.TabPane key="substitute" tab="鏇夸唬鍝�">
<Empty description="鏇夸唬鍝侊紙寰呭疄鐜帮級" />
</Tabs.TabPane>
- <Tabs.TabPane key="sip" tab="SIP">
+ -->
+ <Tabs.TabPane key="sip" tab="妫�楠屾寚瀵间功(SIP)">
<ProductSipForm :form-type="formType" :item-id="formData.id" />
</Tabs.TabPane>
- <Tabs.TabPane key="sop" tab="SOP">
+ <Tabs.TabPane key="sop" tab="浣滀笟鎸囧涔�(SOP)">
<ProductSopForm :form-type="formType" :item-id="formData.id" />
</Tabs.TabPane>
</Tabs>
--
Gitblit v1.9.3