From fe295552e5a3b010b5a6a60a1e2a94bc39b49d68 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 06 八月 2024 15:37:09 +0800
Subject: [PATCH] 修改

---
 web/src/views/modules/basicInfo/XhProductModel.vue |   47 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index c5155b1..aecf7aa 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -31,6 +31,7 @@
                       @selection-change="table.selectionChangeHandle"
                       :header-cell-style="{'text-align':'center'}">
               <el-table-column prop="name" label="鍚嶇О"/>
+              <el-table-column v-if="productType==='3'|| productType==='4'" prop="equipType" label="璁惧绫诲瀷"/>
               <zt-table-column-dict prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
               <el-table-column prop="operatImg" label="杩愯鍥剧墖" align="center">
                 <template v-slot="{ row }">
@@ -47,9 +48,9 @@
               </zt-table-column-handle>
             </el-table>
             <!-- 寮圭獥, 鏂板 / 淇敼 -->
-            <add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
-            <select-ty-model @refreshDataList="refreshData" ref="SelectTyModel"/>
-            <product-import @refreshDataList="refreshData" ref="ProductImport"/>
+            <add-or-update @refreshDataList="refreshData('product')" ref="AddOrUpdate"/>
+            <select-ty-model @refreshDataList="refreshData('tree')" ref="SelectTyModel"/>
+            <product-import @refreshDataList="refreshData('import')" ref="ProductImport"/>
           </zt-table-wraper>
         </div>
       </el-col>
@@ -69,7 +70,8 @@
     data() {
       return {
         url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`,
-        productType: '',
+        shipId: '',
+        namePath:'',
         dataForm: {
           name: '',
           type: '',
@@ -85,37 +87,54 @@
       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 === '鍚嶇О') {
           return 'text-align: left !important;'
         }
       },
-      refreshData() {
-        this.$refs.tableObj.query()
-        this.$refs.ProductModelTree.getProductList()
+      refreshData(param) {
+        if (param === 'import') {
+          this.$refs.tableObj.query()
+          this.$refs.ProductModelTree.getProductList()
+        } else if (param === 'tree') {
+          this.$refs.ProductModelTree.getProductList()
+        } 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
+        console.log(data.namePath,'data.namePath')
         if (data.productType !== '10') {
           this.$refs.tableObj.query()
         }
-        console.log(data.productType, ' data.productType')
-        console.log(this.productType, ' data.productType')
       },
       importData(row) {
         this.$refs.ProductImport.$refs.dialog.init(row)
@@ -125,8 +144,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