From b6f26564c48850d24b7b87adb2ec45c9d482b598 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Mon, 31 Oct 2022 09:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=9A=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/ability/tag-data.vue | 59 +++++++++++----------
 back/src/views/modules/ability/tag.vue      |  6 +--
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/back/src/views/modules/ability/tag-data.vue b/back/src/views/modules/ability/tag-data.vue
index 0de073c9..113e5cb6 100644
--- a/back/src/views/modules/ability/tag-data.vue
+++ b/back/src/views/modules/ability/tag-data.vue
@@ -12,40 +12,43 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
+          </el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch')
+          }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="dictValue" :label="$t('dict.dictValue')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="dictLabel" :label="$t('dict.dictLabel')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" :label="$t('dict.sort')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="dictName" label="禁用/启用" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" :label="$t('dict.remark')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('dict.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column  :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column prop="dictValue" :label="$t('dict.dictValue')" header-align="center" align="center">
+        </el-table-column>
+        <el-table-column prop="dictLabel" :label="$t('dict.dictLabel')" header-align="center" align="center">
+        </el-table-column>
+        <el-table-column prop="sort" :label="$t('dict.sort')" sortable="custom" header-align="center" align="center">
+        </el-table-column>
+        <el-table-column prop="status" label="禁用/启用" header-align="center" align="center">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:dict:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:dict:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <span>{{ scope.row.status == 1 ? '启用' : '禁用' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" :label="$t('dict.remark')" header-align="center" align="center">
+        </el-table-column>
+        <el-table-column prop="createDate" :label="$t('dict.createDate')" sortable="custom" header-align="center"
+          align="center" width="180"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('sys:dict:update')" type="text" size="small"
+              @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:dict:delete')" type="text" size="small"
+              @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
@@ -59,7 +62,7 @@ import mixinViewModule from '@/mixins/view-module'
 // import AddOrUpdate from './dict-data-add-or-update'
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
         createdIsNeed: false,
@@ -78,13 +81,13 @@ export default {
   components: {
     // AddOrUpdate
   },
-  created () {
+  created() {
     this.dataForm.dictTypeId = this.$route.params.dictTypeId || '0'
     this.getDataList()
   },
   methods: {
     // 新增 / 修改
-    addOrUpdateHandle (id) {
+    addOrUpdateHandle(id) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id
diff --git a/back/src/views/modules/ability/tag.vue b/back/src/views/modules/ability/tag.vue
index cf7b5ec6..5af915c5 100644
--- a/back/src/views/modules/ability/tag.vue
+++ b/back/src/views/modules/ability/tag.vue
@@ -5,9 +5,9 @@
                 <el-form-item>
                     <el-input v-model="dataForm.dictName" placeholder="标签名称" clearable></el-input>
                 </el-form-item>
-                <el-form-item>
+                <!-- <el-form-item>
                     <el-input v-model="dataForm.dictLabel" placeholder="资源名称" clearable></el-input>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button @click="getDataList()">{{ $t('query') }}</el-button>
                 </el-form-item>
@@ -24,7 +24,7 @@
                         <el-button type="text" @click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button>
                     </template>
                 </el-table-column>
-                <el-table-column prop="dictName" label="描述" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="remark" label="描述" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
                 <el-table-column label="操作" fixed="right" header-align="center" align="center" width="280">
                     <template slot-scope="scope">