From c379a8300c4e217c885822b6cf431faf35bed553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 2 Aug 2023 18:44:53 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BC=98=E5=8C=96ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/index.vue |  6 +--
 src/views/system/role/index.vue |  4 +-
 src/views/tool/gen/index.vue    | 72 ++++++++++++++++-----------------
 3 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 89ed779..b2980c4 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="字典名称" prop="dictName">
-        <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
       <el-form-item label="字典类型" prop="dictType">
         <el-input v-model="queryParams.dictType" placeholder="请输入字典类型" clearable @keyup.enter="handleQuery" />
       </el-form-item>
+      <el-form-item label="字典名称" prop="dictName">
+        <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="字典状态" clearable>
           <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 7c3d81c..1c017c1 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -330,7 +330,7 @@ function getRoleDeptTreeselect(roleId) {
 }
 // 角色状态修改
 function handleStatusChange(row) {
-  const text = row.status === '0' ? '启用' : '停用'
+  const text = row.status == '0' ? '启用' : '停用'
 
   proxy
     .$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', '警告', {
@@ -345,7 +345,7 @@ function handleStatusChange(row) {
       proxy.$modal.msgSuccess(text + '成功')
     })
     .catch(function () {
-      row.status = row.status === '0' ? '1' : '0'
+      row.status = row.status == 0 ? 1 : 0
     })
 }
 // 取消按钮
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 8bdebc4..1a2d115 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -26,51 +26,49 @@
       highlight-current-row
       height="400px">
       <el-table-column type="selection" align="center" width="55"></el-table-column>
-      <el-table-column label="#" type="index" width="50" align="center">
-        <template #default="scope">
-          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column prop="tableId" label="tableId" width="80" sortable="" />
       <el-table-column prop="dbName" label="数据库名" width="90" :show-overflow-tooltip="true" />
-      <el-table-column prop="tableId" label="id" width="70" sortable="" />
-      <el-table-column prop="tableName" label="表名" width="110" :show-overflow-tooltip="true" />
+      <el-table-column prop="tplCategory" label="生成模板" width="90" sortable="" />
+      <el-table-column prop="tableName" label="表名" width="120" :show-overflow-tooltip="true" />
       <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true" width="120" />
       <el-table-column prop="className" label="实体" :show-overflow-tooltip="true" />
       <el-table-column prop="createTime" label="创建时间" sortable />
       <el-table-column prop="updateTime" label="更新时间" sortable />
-      <el-table-column label="操作" align="center" width="220">
+      <el-table-column label="操作" align="center" width="200">
         <template #default="scope">
-          <el-button text icon="view" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']"> 预览 </el-button>
-          <el-button text icon="edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']"> 编辑 </el-button>
+          <el-button-group>
+            <el-button text icon="view" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']"> 预览 </el-button>
+            <el-button text icon="edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']"> 编辑 </el-button>
 
-          <el-dropdown @command="handleCommand($event, scope.row)">
-            <el-button text>
-              {{ $t('btn.more') }}
-              <el-icon class="el-icon--right">
-                <arrow-down />
-              </el-icon>
-            </el-button>
+            <el-dropdown @command="handleCommand($event, scope.row)">
+              <el-button text>
+                {{ $t('btn.more') }}
+                <el-icon class="el-icon--right">
+                  <arrow-down />
+                </el-icon>
+              </el-button>
 
-            <template #dropdown>
-              <el-dropdown-menu>
-                <div v-hasPermi="['tool:gen:code']">
-                  <el-dropdown-item command="generate">
-                    <el-button icon="download" link>生成代码</el-button>
-                  </el-dropdown-item>
-                </div>
-                <div v-hasPermi="['tool:gen:edit']">
-                  <el-dropdown-item command="sync">
-                    <el-button icon="refresh" link> 同步 </el-button>
-                  </el-dropdown-item>
-                </div>
-                <div v-hasPermi="['tool:gen:remove']">
-                  <el-dropdown-item command="delete">
-                    <el-button icon="delete" type="danger" link> 删除 </el-button>
-                  </el-dropdown-item>
-                </div>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <div v-hasPermi="['tool:gen:code']">
+                    <el-dropdown-item command="generate">
+                      <el-button icon="download" link>生成代码</el-button>
+                    </el-dropdown-item>
+                  </div>
+                  <div v-hasPermi="['tool:gen:edit']">
+                    <el-dropdown-item command="sync">
+                      <el-button icon="refresh" link> 同步 </el-button>
+                    </el-dropdown-item>
+                  </div>
+                  <div v-hasPermi="['tool:gen:remove']">
+                    <el-dropdown-item command="delete">
+                      <el-button icon="delete" type="danger" link> 删除 </el-button>
+                    </el-dropdown-item>
+                  </div>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
+          </el-button-group>
         </template>
       </el-table-column>
     </el-table>