From 92ff846fb659c62037a32b1d8c15eae9df9d9b54 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期一, 18 九月 2023 13:24:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/vue_mdc_430
---
src/mixins/JeecgListMixin.js | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 64399b4..375daf9 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -4,7 +4,7 @@
* data涓璾rl瀹氫箟 list涓烘煡璇㈠垪琛� delete涓哄垹闄ゅ崟鏉¤褰� deleteBatch涓烘壒閲忓垹闄�
*/
import { filterObj } from '@/utils/util';
-import { deleteAction, getAction,downFile,getFileAccessHttpUrl } from '@/api/manage'
+import { deleteAction, getAction, downFile, getFileAccessHttpUrl, httpAction } from '@/api/manage'
import Vue from 'vue'
import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
import store from '@/store'
@@ -175,7 +175,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -192,11 +196,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -215,10 +227,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -289,7 +309,11 @@
console.log("瀵煎嚭鍙傛暟",param)
downFile(this.url.exportXlsUrl,param).then((data)=>{
if (!data) {
- this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+ // this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"鏂囦欢涓嬭浇澶辫触"
+ });
return
}
if (typeof window.navigator.msSaveBlob !== 'undefined') {
--
Gitblit v1.9.3