From a2002ba0e8aa2a0e4eee61b5205748d8f6e454fc Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 21 七月 2026 17:30:10 +0800
Subject: [PATCH] 其余新增后弹窗不自动关闭问题修改

---
 src/views/basicData/mdm/modules/form.vue |  125 +++++++++++++++++++++--------------------
 1 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/src/views/basicData/mdm/modules/form.vue b/src/views/basicData/mdm/modules/form.vue
index fd08771..c1f5eb7 100644
--- a/src/views/basicData/mdm/modules/form.vue
+++ b/src/views/basicData/mdm/modules/form.vue
@@ -1,82 +1,87 @@
 <script lang="ts" setup>
-  import type { MdmItemApi } from "#/api/mdm/item";
+import type { MdmItemApi } from '#/api/mdm/item';
 
-  import { computed, ref } from "vue";
+import { ref } from 'vue';
 
-  import { useVbenModal } from "#/packages/effects/common-ui/src";
+import { useVbenModal } from "#/packages/effects/common-ui/src";
 
-  import { message } from "ant-design-vue";
+import { message } from "ant-design-vue";
 
-  import { useVbenForm } from "#/adapter/form";
-  import { createItem, getItem, updateItem } from "#/api/mdm/item";
-  import { $t } from "#/locales";
+import { useVbenForm } from '#/adapter/form';
+import { createItem, getItem, updateItem } from '#/api/mdm/item';
+import { $t } from '#/locales';
 
-  import { useFormSchema } from "../data";
+import { useFormSchema, clearUnitListCache, buildCategoryTree } from '../data';
+import { getItemTypeSimpleList } from '#/api/mes/md/item/type';
 
-  defineOptions({ name: "ItemForm" });
+defineOptions({ name: "ItemForm" });
 
-  const emit = defineEmits(["success"]);
-  const formData = ref<MdmItemApi.Item>();
-  const getTitle = computed(() => {
-    return formData.value?.id
-      ? $t("ui.actionTitle.edit", ["鐗╂枡"])
-      : $t("ui.actionTitle.create", ["鐗╂枡"]);
-  });
+const emit = defineEmits(['success']);
+const formData = ref<MdmItemApi.Item>();
 
-  const [Form, formApi] = useVbenForm({
-    commonConfig: {
-      componentProps: {
-        class: "w-full",
-      },
-      labelWidth: 110,
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
     },
-    layout: "horizontal",
-    schema: useFormSchema(),
-    showDefaultActions: false,
-    wrapperClass: "grid-cols-2",
-  });
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
 
-  const [Modal, modalApi] = useVbenModal({
-    async onConfirm() {
-      const { valid } = await formApi.validate();
-      if (!valid) {
-        return;
-      }
-      modalApi.lock();
-      const data = (await formApi.getValues()) as MdmItemApi.Item;
-      try {
-        await (formData.value?.id ? updateItem(data) : createItem(data));
-        await modalApi.close();
-        emit("success");
-        message.success($t("ui.actionMessage.operationSuccess"));
-      } finally {
-        modalApi.unlock();
-      }
-    },
-    async onOpenChange(isOpen: boolean) {
-      if (!isOpen) {
-        formData.value = undefined;
-        return;
-      }
-      const data = modalApi.getData<MdmItemApi.Item>();
-      if (!data || !data.id) {
-        return;
-      }
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    const data = (await formApi.getValues()) as MdmItemApi.Item;
+    try {
+      await (formData.value?.id ? updateItem(data) : createItem(data));
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    const data = modalApi.getData<MdmItemApi.Item>();
+    // 娓呴櫎鍗曚綅缂撳瓨锛岀‘淇濊幏鍙栨渶鏂版暟鎹�
+    clearUnitListCache();
+    // 鍔犺浇鏈�鏂板垎绫绘暟鎹�
+    const categoryRes = await getItemTypeSimpleList();
+    const categoryTreeData = buildCategoryTree(categoryRes || []);
+    // 璁剧疆 schema锛坒ormApi 宸插垵濮嬪寲锛�
+    formApi.setState({ schema: useFormSchema(formApi, categoryTreeData) });
+    if (data?.id) {
+      // 缂栬緫妯″紡
       modalApi.lock();
       try {
         formData.value = await getItem(data.id);
-        // 缂栬緫鍥炴樉鏃讹紝syncMes 榛樿涓� false
-        await formApi.setValues({ ...formData.value, syncMes: false });
+        await formApi.setValues(formData.value);
       } finally {
         modalApi.unlock();
       }
-    },
-  });
+    } else {
+      // 鏂板妯″紡
+      formData.value = undefined;
+      await formApi.resetForm();
+    }
+  },
+});
 </script>
 
 <template>
-  <Modal class="w-[1000px]"
-         :title="getTitle">
+  <Modal class="w-[1000px]" :title="formData?.id ? $t('ui.actionTitle.edit', ['鐗╂枡']) : $t('ui.actionTitle.create', ['鐗╂枡'])">
     <Form class="mx-4" />
   </Modal>
-</template>
\ No newline at end of file
+</template>

--
Gitblit v1.9.3