From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/dnc/base/modules/ProductStructure/Product/ProductModal.vue |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/views/dnc/base/modules/ProductStructure/Product/ProductModal.vue b/src/views/dnc/base/modules/ProductStructure/Product/ProductModal.vue
index e808a87..72a6960 100644
--- a/src/views/dnc/base/modules/ProductStructure/Product/ProductModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Product/ProductModal.vue
@@ -36,34 +36,47 @@
       this.$bus.$on('treeMenuItemMethodTrigger', this.triggerCorrespondingMethod)
     },
     methods: {
-      handleProductAdd(modalTitle) {
-        this.title = modalTitle
+      /**
+       * 娣诲姞浜у搧
+       */
+      handleProductAdd() {
         this.visible = true
         this.$nextTick(() => {
-          this.$refs.realForm.add()
+          if (this.$refs.realForm) this.$refs.realForm.add()
         })
       },
-      handleProductEdit(modalTitle) {
-        this.title = modalTitle
+
+      /**
+       * 缂栬緫浜у搧淇℃伅
+       */
+      handleProductEdit() {
         this.visible = true
         this.$nextTick(() => {
-          this.$refs.realForm.edit(this.currentTreeNodeInfo.entity)
+          if (this.$refs.realForm) {
+            this.$refs.realForm.edit({ id: this.currentTreeNodeInfo.id, ...this.currentTreeNodeInfo.entity })
+          }
         })
       },
+
       handleOk() {
         this.$refs.realForm.submitForm()
       },
+
       submitCallback() {
-        this.$emit('ok')
+        this.$emit('submitSuccess')
         this.visible = false
       },
+
       handleCancel() {
         this.$emit('close')
         this.visible = false
       },
 
       triggerCorrespondingMethod({ methodName, modalTitle }) {
-        if (this[methodName]) this[methodName](modalTitle)
+        if (this[methodName]) {
+          this[methodName](modalTitle)
+          this.title = modalTitle
+        }
       }
     }
   }

--
Gitblit v1.9.3