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/basic/customizeparamtemplatetype/index.vue |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/views/basic/customizeparamtemplatetype/index.vue b/src/views/basic/customizeparamtemplatetype/index.vue
index 7882777..1be2b9e 100644
--- a/src/views/basic/customizeparamtemplatetype/index.vue
+++ b/src/views/basic/customizeparamtemplatetype/index.vue
@@ -92,14 +92,7 @@
           }
         ],
         toolbar: [],
-        operator: [
-          {
-            text: '鍒犻櫎',
-            type: 'text',
-            size: 'small',
-            fun: this.deleteHandle
-          }
-        ],
+        operator: null,
         operatorConfig: {
           fixed: 'right',
           label: '鎿嶄綔',
@@ -119,6 +112,16 @@
     TableForm
   },
   created() {
+    if(this.permissions.basic_templatetyperelation_del){
+      this.table.operator = [
+          {
+            text: '鍒犻櫎',
+            type: 'text',
+            size: 'small',
+            fun: this.deleteHandle
+          }
+        ]
+    }
     this.getParamApplyDict()
   },
   methods: {
@@ -135,10 +138,6 @@
     },
     // 鍒犻櫎
     deleteHandle(row) {
-      if(!this.permissions.basic_templatetyperelation_del){
-        this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
-        return
-      }
       this.$confirm('鏄惁纭鍒犻櫎绫诲瀷鍚嶇О涓�' + row.templateTypeName, '鎻愮ず', {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',

--
Gitblit v1.9.3