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 | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 3cd2f03..af4db4d 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -71,6 +71,8 @@
return {
url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`,
productType: '',
+ shipId: '',
+ namePath:'',
dataForm: {
name: '',
type: '',
@@ -86,17 +88,27 @@
AddOrUpdate,
SelectTyModel
},
+ mounted() {
+ this.$refs.ProductModelTree.getProductList()
+ },
methods: {
add() {
this.dataForm.type = this.productType
if (this.dataForm.type !== '1') {
- this.$refs.SelectTyModel.$refs.dialog.init(null, {type: this.dataForm.type, id: this.dataForm.pid})
+ this.$refs.SelectTyModel.$refs.dialog.init(null, {
+ type: this.dataForm.type,
+ id: this.dataForm.pid,
+ shipId: this.shipId,
+ namePath: this.namePath
+ })
} else {
this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid})
}
},
addCell() {
- this.$refs.AddOrUpdate.$refs.dialog.init(null, {type: 10, pid: this.dataForm.pid})
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {
+ type: 10, pid: this.dataForm.pid, shipId: this.shipId
+ })
},
cellStyle({column}) {
if (column.label === '鍚嶇О') {
@@ -104,20 +116,22 @@
}
},
refreshData(param) {
- if (param==='import'){
+ if (param === 'import') {
this.$refs.tableObj.query()
this.$refs.ProductModelTree.getProductList()
- }else if(param==='tree'){
+ } else if (param === 'tree') {
this.$refs.ProductModelTree.getProductList()
- } else{
+ } else {
this.$refs.tableObj.query()
}
},
onProductSelected(data) {
console.log(data, 'onProductSelected')
+ this.shipId = data.shipId
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()
}
@@ -132,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