From 29355eb630bee3ccbad463816f17fdfaa8ef5b8e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 01 十一月 2023 10:13:19 +0800
Subject: [PATCH] 优化pagination样式

---
 src/views/system/dict/data.vue |   55 +++++++++++++++++++++----------------------------------
 1 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 2a4c501..f6207dc 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -1,8 +1,8 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
          <el-form-item label="瀛楀吀鍚嶇О" prop="dictType">
-            <el-select v-model="queryParams.dictType" size="small">
+            <el-select v-model="queryParams.dictType" style="width: 200px">
                <el-option
                   v-for="item in typeOptions"
                   :key="item.dictId"
@@ -16,12 +16,12 @@
                v-model="queryParams.dictLabel"
                placeholder="璇疯緭鍏ュ瓧鍏告爣绛�"
                clearable
-               size="small"
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="鐘舵��" prop="status">
-            <el-select v-model="queryParams.status" placeholder="鏁版嵁鐘舵��" clearable size="small">
+            <el-select v-model="queryParams.status" placeholder="鏁版嵁鐘舵��" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -31,8 +31,8 @@
             </el-select>
          </el-form-item>
          <el-form-item>
-            <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
          </el-form-item>
       </el-form>
 
@@ -42,7 +42,6 @@
                type="primary"
                plain
                icon="Plus"
-               size="mini"
                @click="handleAdd"
                v-hasPermi="['system:dict:add']"
             >鏂板</el-button>
@@ -52,7 +51,6 @@
                type="success"
                plain
                icon="Edit"
-               size="mini"
                :disabled="single"
                @click="handleUpdate"
                v-hasPermi="['system:dict:edit']"
@@ -63,7 +61,6 @@
                type="danger"
                plain
                icon="Delete"
-               size="mini"
                :disabled="multiple"
                @click="handleDelete"
                v-hasPermi="['system:dict:remove']"
@@ -74,7 +71,6 @@
                type="warning"
                plain
                icon="Download"
-               size="mini"
                @click="handleExport"
                v-hasPermi="['system:dict:export']"
             >瀵煎嚭</el-button>
@@ -84,7 +80,6 @@
                type="warning"
                plain
                icon="Close"
-               size="mini"
                @click="handleClose"
             >鍏抽棴</el-button>
          </el-col>
@@ -96,8 +91,8 @@
          <el-table-column label="瀛楀吀缂栫爜" align="center" prop="dictCode" />
          <el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
             <template #default="scope">
-               <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
-               <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
+               <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+               <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
             </template>
          </el-table-column>
          <el-table-column label="瀛楀吀閿��" align="center" prop="dictValue" />
@@ -113,22 +108,10 @@
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
+         <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button
-                  size="mini"
-                  type="text"
-                  icon="Edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:dict:edit']"
-               >淇敼</el-button>
-               <el-button
-                  size="mini"
-                  type="text"
-                  icon="Delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:dict:remove']"
-               >鍒犻櫎</el-button>
+               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">淇敼</el-button>
+               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">鍒犻櫎</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -164,7 +147,7 @@
                   <el-option
                      v-for="item in listClassOptions"
                      :key="item.value"
-                     :label="item.label"
+                     :label="item.label + '(' + item.value + ')'"
                      :value="item.value"
                   ></el-option>
                </el-select>
@@ -193,7 +176,8 @@
 </template>
 
 <script setup name="Data">
-import { listType, getType } from "@/api/system/dict/type";
+import useDictStore from '@/store/modules/dict'
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
 import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
 
 const { proxy } = getCurrentInstance();
@@ -226,8 +210,8 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    dictName: undefined,
     dictType: undefined,
+    dictLabel: undefined,
     status: undefined
   },
   rules: {
@@ -250,8 +234,8 @@
 
 /** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
 function getTypeList() {
-  listType().then(response => {
-    typeOptions.value = response.rows;
+  getDictOptionselect().then(response => {
+    typeOptions.value = response.data;
   });
 }
 /** 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 */
@@ -295,7 +279,7 @@
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
   proxy.resetForm("queryRef");
-  queryParams.value.dictType = defaultDictType;
+  queryParams.value.dictType = defaultDictType.value;
   handleQuery();
 }
 /** 鏂板鎸夐挳鎿嶄綔 */
@@ -327,12 +311,14 @@
     if (valid) {
       if (form.value.dictCode != undefined) {
         updateData(form.value).then(response => {
+          useDictStore().removeDict(queryParams.value.dictType);
           proxy.$modal.msgSuccess("淇敼鎴愬姛");
           open.value = false;
           getList();
         });
       } else {
         addData(form.value).then(response => {
+          useDictStore().removeDict(queryParams.value.dictType);
           proxy.$modal.msgSuccess("鏂板鎴愬姛");
           open.value = false;
           getList();
@@ -349,6 +335,7 @@
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+    useDictStore().removeDict(queryParams.value.dictType);
   }).catch(() => {});
 }
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.3