From 70719d606cdc43bfa4bddfcfc9a3fc94794c6436 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 02 九月 2026 10:31:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/itemreceipt/modules/an-select-dialog.vue | 8 +++-----
src/views/mes/md/item/modules/form.vue | 4 +++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/mes/md/item/modules/form.vue b/src/views/mes/md/item/modules/form.vue
index 7f1f865..5227e24 100644
--- a/src/views/mes/md/item/modules/form.vue
+++ b/src/views/mes/md/item/modules/form.vue
@@ -8,7 +8,7 @@
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';
@@ -138,9 +138,11 @@
:item-or-product="currentItemOrProduct"
/>
</Tabs.TabPane>
+ <!-- 鏇夸唬鍝佹爣绛鹃〉鏈疄鐜帮紝鏆傛椂闅愯棌
<Tabs.TabPane key="substitute" tab="鏇夸唬鍝�">
<Empty description="鏇夸唬鍝侊紙寰呭疄鐜帮級" />
</Tabs.TabPane>
+ -->
<Tabs.TabPane key="sip" tab="妫�楠屾寚瀵间功(SIP)">
<ProductSipForm :form-type="formType" :item-id="formData.id" />
</Tabs.TabPane>
diff --git a/src/views/wls/itemreceipt/modules/an-select-dialog.vue b/src/views/wls/itemreceipt/modules/an-select-dialog.vue
index eef4eef..dfdc0c5 100644
--- a/src/views/wls/itemreceipt/modules/an-select-dialog.vue
+++ b/src/views/wls/itemreceipt/modules/an-select-dialog.vue
@@ -79,7 +79,7 @@
},
},
],
- height: 'auto',
+ height: 460,
keepSource: true,
proxyConfig: {
ajax: {
@@ -114,10 +114,8 @@
emit('selected', selectedRows.id);
await modalApi.close();
},
- async onOpenChange(isOpen: boolean) {
- if (isOpen) {
- await gridApi.query();
- }
+ async onOpened() {
+ await gridApi.query();
},
});
</script>
--
Gitblit v1.9.3