From 1c2da6dfb1e23fa38c58ada5d7e98f91ae2d738e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 11 九月 2024 14:19:21 +0800
Subject: [PATCH] 修改导出文件名称

---
 src/views/system/dict/data.vue |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 6960f2e..eff8acc 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -91,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" />
@@ -157,7 +157,7 @@
                   <el-radio
                      v-for="dict in sys_normal_disable"
                      :key="dict.value"
-                     :label="dict.value"
+                     :value="dict.value"
                   >{{ dict.label }}</el-radio>
                </el-radio-group>
             </el-form-item>
@@ -210,8 +210,8 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    dictName: undefined,
     dictType: undefined,
+    dictLabel: undefined,
     status: undefined
   },
   rules: {
@@ -238,6 +238,7 @@
     typeOptions.value = response.data;
   });
 }
+
 /** 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 */
 function getList() {
   loading.value = true;
@@ -247,11 +248,13 @@
     loading.value = false;
   });
 }
+
 /** 鍙栨秷鎸夐挳 */
 function cancel() {
   open.value = false;
   reset();
 }
+
 /** 琛ㄥ崟閲嶇疆 */
 function reset() {
   form.value = {
@@ -266,22 +269,26 @@
   };
   proxy.resetForm("dataRef");
 }
+
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
   getList();
 }
+
 /** 杩斿洖鎸夐挳鎿嶄綔 */
 function handleClose() {
   const obj = { path: "/system/dict" };
   proxy.$tab.closeOpenPage(obj);
 }
+
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
   proxy.resetForm("queryRef");
-  queryParams.value.dictType = defaultDictType;
+  queryParams.value.dictType = defaultDictType.value;
   handleQuery();
 }
+
 /** 鏂板鎸夐挳鎿嶄綔 */
 function handleAdd() {
   reset();
@@ -289,12 +296,14 @@
   title.value = "娣诲姞瀛楀吀鏁版嵁";
   form.value.dictType = queryParams.value.dictType;
 }
+
 /** 澶氶�夋閫変腑鏁版嵁 */
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.dictCode);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
+
 /** 淇敼鎸夐挳鎿嶄綔 */
 function handleUpdate(row) {
   reset();
@@ -305,6 +314,7 @@
     title.value = "淇敼瀛楀吀鏁版嵁";
   });
 }
+
 /** 鎻愪氦鎸夐挳 */
 function submitForm() {
   proxy.$refs["dataRef"].validate(valid => {
@@ -327,6 +337,7 @@
     }
   });
 }
+
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 function handleDelete(row) {
   const dictCodes = row.dictCode || ids.value;
@@ -338,6 +349,7 @@
     useDictStore().removeDict(queryParams.value.dictType);
   }).catch(() => {});
 }
+
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */
 function handleExport() {
   proxy.download("system/dict/data/export", {

--
Gitblit v1.9.3