From b970185536bc58742fc29946b50c487a2de52bac Mon Sep 17 00:00:00 2001
From: kknd97 <liujingwei@ln.chinamobile.com>
Date: 星期四, 20 十月 2022 14:27:02 +0800
Subject: [PATCH] update ruoyi-ui/src/views/system/user/index.vue. handleUpdate(row)方法中:this.form = response.data;语句 会导致【this.form.postIds = response.postIds;】和【this.form.roleIds = response.roleIds;】失效。 导致用户编辑对话框中,角色和部门多选框无法正常修改。 建议使用以下语句修改: this.$set(this.form, "postIds", response.postIds); this.$set(this.form, "roleIds", response.roleIds);

---
 ruoyi-ui/src/plugins/download.js |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index e1c6640..86e2031 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -2,6 +2,7 @@
 import { Message } from 'element-ui'
 import { saveAs } from 'file-saver'
 import { getToken } from '@/utils/auth'
+import errorCode from '@/utils/errorCode'
 import { blobValidate } from "@/utils/ruoyi";
 
 const baseURL = process.env.VUE_APP_BASE_API
@@ -15,12 +16,12 @@
       responseType: 'blob',
       headers: { 'Authorization': 'Bearer ' + getToken() }
     }).then(async (res) => {
-      const isLogin = await this.blobValidate(res.data);
+      const isLogin = await blobValidate(res.data);
       if (isLogin) {
         const blob = new Blob([res.data])
         this.saveAs(blob, decodeURI(res.headers['download-filename']))
       } else {
-        Message.error('无效的会话,或者会话已过期,请重新登录。');
+        this.printErrMsg(res.data);
       }
     })
   },
@@ -32,12 +33,12 @@
       responseType: 'blob',
       headers: { 'Authorization': 'Bearer ' + getToken() }
     }).then(async (res) => {
-      const isLogin = await this.blobValidate(res.data);
+      const isLogin = await blobValidate(res.data);
       if (isLogin) {
         const blob = new Blob([res.data])
         this.saveAs(blob, decodeURI(res.headers['download-filename']))
       } else {
-        Message.error('无效的会话,或者会话已过期,请重新登录。');
+        this.printErrMsg(res.data);
       }
     })
   },
@@ -54,12 +55,18 @@
         const blob = new Blob([res.data], { type: 'application/zip' })
         this.saveAs(blob, name)
       } else {
-        Message.error('无效的会话,或者会话已过期,请重新登录。');
+        this.printErrMsg(res.data);
       }
     })
   },
   saveAs(text, name, opts) {
     saveAs(text, name, opts);
+  },
+  async printErrMsg(data) {
+    const resText = await data.text();
+    const rspObj = JSON.parse(resText);
+    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+    Message.error(errMsg);
   }
 }
 

--
Gitblit v1.9.2