From 5f77609d5118737e135c6ca3add168ad01aa52b6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 05 十一月 2024 16:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 web/src/views/modules/basicInfo/XhProductModel.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index e564467..7aa5a65 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -101,14 +101,15 @@
         this.dataForm.type = this.productType
 
         if (this.dataForm.type !== '1') {
-          this.$refs.SelectTyModel.$refs.dialog.init(null, {
+          /*this.$refs.SelectTyModel.$refs.dialog.init(null, {
             type: this.dataForm.type,
             id: this.dataForm.pid,
             shipId: this.shipId,
             namePath: this.namePath
-          })
+          })*/
+          this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, productType: parseInt(this.dataForm.type)+1 , pid: this.dataForm.pid,shipId: this.shipId})
         } else {
-          this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid})
+          this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid,shipId: this.shipId})
         }
       },
       addCell() {

--
Gitblit v1.9.1