导入导出

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'
   });
 }

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: "-";
+}

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)) {

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("导出成功");
 }

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 || '-');
     },
   },
   {

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 {