From 43f344512cd01552f591b082b8990a20b09b4799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Fri, 12 Jul 2024 13:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/level.ts          |  3 +--
 src/styles/common.scss           |  3 +++
 src/utils/http/axios/index.ts    |  2 +-
 src/views/system/level/index.vue |  6 +++---
 src/views/system/user/columns.ts | 12 +++++-------
 src/views/system/user/index.vue  |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/api/system/level.ts b/src/api/system/level.ts
index 80a592c..56d51fc 100644
--- a/src/api/system/level.ts
+++ b/src/api/system/level.ts
@@ -71,7 +71,6 @@ export function levelBatchDelete(data:any) {
 export function levelExport() {
   return http.request({
     url: '/level/export',
-    method: 'GET',
-    responseType: 'blob'
+    method: 'GET'
   });
 }
\ No newline at end of file
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 0f4c22d..8d714fe 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -167,3 +167,6 @@ body .n-modal {
 .el-pagination .el-select .el-input {
   width: 100px;
 }
+.el-table .el-table__body td .cell:empty::after {
+  content: "-";
+}
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 63ac051..6e99b70 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -61,7 +61,7 @@ const transform: AxiosTransform = {
     //  这里 code，result，message为 后台统一的字段，需要修改为项目自己的接口返回格式
     const { code, data, msg } = res.data;
     // 请求成功
-    const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.SUCCESS;
+    const hasSuccess = data && code === ResultEnum.SUCCESS;
     // 是否显示提示信息
     if (isShowMessage) {
       if (hasSuccess && (successMessageText || isShowSuccessMessage)) {
diff --git a/src/views/system/level/index.vue b/src/views/system/level/index.vue
index 7054032..935b042 100644
--- a/src/views/system/level/index.vue
+++ b/src/views/system/level/index.vue
@@ -208,8 +208,8 @@ function onSelectionChange(value){
 const onSuccess = (file: UploadFile) => {
   upload.value!.clearFiles();
   closeLoading();
-  if (file.code == 200) {
-    message("导入成功");
+  if (file.code == 0) {
+    message("导入成功,"+file.msg);
     reloadTable()
   } else {
     message(file.msg ? file.msg : "导入失败", "error");
@@ -224,7 +224,7 @@ const onError = () => {
 const handleExport = async()=>{
   exportLoading.value=true
   const data=await levelExport()
-  downloadByData(data, '职级信息.xlsx');
+  window.open(data)
   exportLoading.value=false
   message("导出成功");
 }
diff --git a/src/views/system/user/columns.ts b/src/views/system/user/columns.ts
index a74a58f..0dca58f 100644
--- a/src/views/system/user/columns.ts
+++ b/src/views/system/user/columns.ts
@@ -50,13 +50,11 @@ export const columns = [
     label: '用户角色',
     prop: 'role',
     render(record) {
-      return h(
-        ElTag,
-        {},
-        {
-          default: () => record.row.roles.length>0?record.row.roles[0].name:'',
-        },
-      );
+      let roleNames = ''
+      if(record.row.roles.length > 0){
+        roleNames = record.row.roles.map(role => role.name).join(',');
+      }
+      return h('span', roleNames || '-');
     },
   },
   {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e003247..149e83d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -227,7 +227,7 @@ const beforeUpload = (file: UploadFile) => {
 const onSuccess = (file: UploadFile) => {
   upload.value!.clearFiles();
   closeLoading();
-  if (file.code == 200) {
+  if (file.code == 0) {
     message("导入成功");
     reloadTable()
   } else {