From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突

---
 src/views/technology/completeproductstructure/index.vue |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue
index 3a79e2b..4f88d88 100644
--- a/src/views/technology/completeproductstructure/index.vue
+++ b/src/views/technology/completeproductstructure/index.vue
@@ -295,6 +295,7 @@
         fun: ()=>{this.deleteAll()},
       })
     }
+    if(this.permissions.technology_completeproductstructure_bom_export){
     this.table.toolbar.push({
         text: 'BOM瀵煎嚭',
         type:'primary',
@@ -302,6 +303,7 @@
         permitArr: [],
         fun: ()=>{this.exportBomFun()},
       })
+    }
     if(this.permissions.technology_completeproductstructure_del){
         this.table.operator = [
           {

--
Gitblit v1.9.3