From ea744c63bf10f14fe5a51addf37083c384093e21 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 17:16:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/XhProductModel.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 418481b..af4db4d 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -72,6 +72,7 @@
url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`,
productType: '',
shipId: '',
+ namePath:'',
dataForm: {
name: '',
type: '',
@@ -97,7 +98,8 @@
this.$refs.SelectTyModel.$refs.dialog.init(null, {
type: this.dataForm.type,
id: this.dataForm.pid,
- shipId: this.shipId
+ shipId: this.shipId,
+ namePath: this.namePath
})
} else {
this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid})
@@ -129,6 +131,7 @@
this.dataForm.pid = data.id
this.dataForm.type = data.productType
this.productType = data.productType
+ this.namePath = data.namePath
if (data.productType !== '10') {
this.$refs.tableObj.query()
}
@@ -143,8 +146,8 @@
},
onDefault(defaultId) {
this.dataForm.pid = defaultId
- this.dataForm.type = 2
- this.productType = 2
+ this.dataForm.type = 1
+ this.productType = 1
this.$refs.tableObj.query()
},
}
--
Gitblit v1.9.1