From 6dd9814a2f7582cf396c2e20de44e80faaac44a7 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Fri, 9 Aug 2024 21:06:40 +0800
Subject: [PATCH] =?UTF-8?q?[fix=20bug]=20=E6=A0=87=E7=AD=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=20?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/DictList.vue                      |  2 +-
 .../tags/modules/TagContentDictListDrawer.vue      | 14 +++++++-------
 src/views/system/tags/pages/TagContent.vue         |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue
index 312629a..73ef1d7 100644
--- a/src/views/system/DictList.vue
+++ b/src/views/system/DictList.vue
@@ -136,7 +136,7 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
-      canOpeFlag: process.env.VUE_APP_TAG_FLAG === '0', // 是否可以操作编辑和删除，开发环境可以
+      canOpeFlag: false, // process.env.VUE_APP_TAG_FLAG === '0', // 是否可以操作编辑和删除，开发环境可以
       dict: '',
       labelCol: {
         xs: { span: 8 },
diff --git a/src/views/system/tags/modules/TagContentDictListDrawer.vue b/src/views/system/tags/modules/TagContentDictListDrawer.vue
index f254061..22e337d 100644
--- a/src/views/system/tags/modules/TagContentDictListDrawer.vue
+++ b/src/views/system/tags/modules/TagContentDictListDrawer.vue
@@ -30,10 +30,10 @@
       </div>
       <div class="table-operator">
         <!--新增-->
-<!--        <a-button icon="plus" type="primary"  v-if="record.isReadOnly === IsReadOnlyEnums.configurable.value || record.isReadOnly === IsReadOnlyEnums.subConfigurable.value" @click="handleAdd" v-has="'sys:dict:operation'">{{ $t('newlyAdded') }}</a-button>-->
-        <a-button icon="plus" type="primary" @click="handleAdd" v-has="'sys:dict:operation'">{{ $t('newlyAdded') }}</a-button>
+<!--        <a-button icon="plus" type="primary"  v-if="dictRecord.isReadOnly === IsReadOnlyEnums.configurable.value || dictRecord.isReadOnly === IsReadOnlyEnums.subConfigurable.value" @click="handleAdd" v-has="'sys:dict:operation'">{{ $t('newlyAdded') }}</a-button>-->
+        <a-button icon="plus" type="primary" @click="handleAdd" v-if="dictRecord.isReadOnly === IsReadOnlyEnums.configurable.value || dictRecord.isReadOnly === IsReadOnlyEnums.subConfigurable.value" v-has="'sys:dict:operation'">{{ $t('newlyAdded') }}</a-button>
         <!--批量删除-->
-        <a-button type="primary" icon="delete" ghost v-if="record.isReadOnly === IsReadOnlyEnums.configurable.value || record.isReadOnly === IsReadOnlyEnums.subConfigurable.value" @click="batchDel" v-has="'sys:dict:operation'">{{ $t('batchDelete') }}</a-button>
+        <a-button type="primary" icon="delete" ghost v-if="dictRecord.isReadOnly === IsReadOnlyEnums.configurable.value || dictRecord.isReadOnly === IsReadOnlyEnums.subConfigurable.value" @click="batchDel" v-has="'sys:dict:operation'">{{ $t('batchDelete') }}</a-button>
       </div>
 
       <j-table
@@ -84,7 +84,7 @@ export default {
       title: this.$t('system.tag.dictionaryConfiguration'),
       width: 1000,
       confirmLoading: false,
-      record: {},
+      dictRecord: {}, // 数据字典的值
       commonColumns: [
         {
           // 英文名称
@@ -175,8 +175,8 @@ export default {
   },
   methods: {
     show (record) {
-      this.record = record
-      this.attributeType = Number(this.record.attributeType) // 标签类型，用于辨别是下拉框还是树形结构
+      this.dictRecord = record
+      this.attributeType = Number(this.dictRecord.attributeType) // 标签类型，用于辨别是下拉框还是树形结构
       // 不同的标签类型 调用不同的接口
       if (this.attributeType === TagsAttributeTypeEnums.SELECT.value) {
         this.url = { ...this.dictUrl }
@@ -202,7 +202,7 @@ export default {
       this.onClose()
     },
     handleAdd () {
-      this.$refs.modalForm.add(this.record.id)
+      this.$refs.modalForm.add(this.dictRecord.id)
       this.$refs.modalForm.title = this.$t('newlyAdded')
       this.$refs.modalForm.disableSubmit = false
     },
diff --git a/src/views/system/tags/pages/TagContent.vue b/src/views/system/tags/pages/TagContent.vue
index 083b185..9800f1f 100644
--- a/src/views/system/tags/pages/TagContent.vue
+++ b/src/views/system/tags/pages/TagContent.vue
@@ -120,7 +120,7 @@ export default {
           width: 100
         }
       ],
-      canOpeFlag: process.env.VUE_APP_TAG_FLAG === '0', // 是否可以操作编辑和删除，开发环境可以
+      // canOpeFlag: process.env.VUE_APP_TAG_FLAG === '0', // 是否可以操作编辑和删除，开发环境可以
       // dataSource: [],
       url: {
         list: 'sys/dict/tagDictPage',
@@ -150,7 +150,7 @@ export default {
           clickEvent: 'handleEdit',
           has: 'sys:dict:operation',
           show: (record) => {
-            return (this.canOpeFlag || record.isReadOnly === IsReadOnlyEnums.configurable.value)
+            return (record.isReadOnly === IsReadOnlyEnums.configurable.value)
           }
         },
         // 删除
@@ -159,7 +159,7 @@ export default {
           clickEvent: 'handleDelete',
           has: 'sys:dict:operation',
           show: (record) => {
-            return (this.canOpeFlag || record.isReadOnly === IsReadOnlyEnums.configurable.value)
+            return (record.isReadOnly === IsReadOnlyEnums.configurable.value)
           }
         }
       ]