From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/mixins/JeecgListMixin.js | 182 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 171 insertions(+), 11 deletions(-)
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 6e90b0a..b5986e5 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'
@@ -81,11 +81,10 @@
this.ipagination.current = 1;
}
var params = this.getQueryParams();//鏌ヨ鏉′欢
-
+ console.log('params',params)
if(!params){
return false;
}
-
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
@@ -149,7 +148,6 @@
});
return str;
},
-
onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
@@ -256,7 +254,6 @@
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title = "缂栬緫";
this.$refs.modalForm.disableSubmit = false;
-
},
handleAdd: function () {
this.$refs.modalForm.add();
@@ -355,17 +352,25 @@
this.$warning({
title: message,
content: (<div>
- <span>{msg}</span><br/>
- <span>鍏蜂綋璇︽儏璇� <a href={href} target="_blank" download={fileName}>鐐瑰嚮涓嬭浇</a> </span>
- </div>
+ <span>{msg}</span><br/>
+ <span>鍏蜂綋璇︽儏璇� <a href={href} target="_blank" download={fileName}>鐐瑰嚮涓嬭浇</a> </span>
+ </div>
)
})
} else {
- this.$message.success(info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`)
+ // this.$message.success(info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`)
+ this.$notification.success({
+ message:'娑堟伅',
+ description:info.file.response.message || `${info.file.name} 鏂囦欢涓婁紶鎴愬姛`
+ });
}
this.loadData()
} else {
- this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+ // this.$message.error(`${info.file.name} ${info.file.response.message}.`);
+ this.$notification.error({
+ message:'娑堟伅',
+ description:`${info.file.name} ${info.file.response.message}.`
+ });
}
} else if (info.file.status === 'error') {
this.loading = false;
@@ -387,7 +392,11 @@
})
}
} else {
- this.$message.error(`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `);
+ // this.$message.error(`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `);
+ this.$notification.error({
+ message:'娑堟伅',
+ description:`鏂囦欢涓婁紶澶辫触: ${info.file.msg} `
+ });
}
}
},
@@ -411,6 +420,157 @@
let url = getFileAccessHttpUrl(text)
window.open(url);
},
+
+ /**
+ * 鍗曟嵁鎵归噺鎻愪氦
+ */
+ handleSubmitBatch: function() {
+ if (!this.url.submitBatch) {
+ this.$message.error('璇疯缃畊rl.submitBatch灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ return
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ let httpurl = this.url.submitBatch
+ let method = 'post'
+ var params = { ids: ids }
+
+ const that = this
+ httpAction(httpurl, params, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.loading = false
+
+ })
+
+ }
+ },
+ /**
+ * 鎵归噺鎾ゅ洖宸叉彁浜ょ殑璁板綍
+ */
+ handleRevocationBatch: function() {
+ if (!this.url.revocationBatch) {
+ this.$message.error('璇疯缃畊rl.revocationBatch灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ return
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ let httpurl = this.url.revocationBatch
+ let method = 'post'
+ var params = { ids: ids }
+
+ const that = this
+ httpAction(httpurl, params, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+
+ }
+ },
+ /**
+ * 鍗曟嵁鎻愪氦
+ */
+ handleSubmit: function() {
+ if (!this.url.submit) {
+ this.$message.error('璇疯缃畊rl.submit灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length != 1) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ return
+ } else {
+ var id = this.selectedRowKeys[0]
+ let httpurl = this.url.submit
+ let method = 'post'
+ var params = { id: id }
+
+ const that = this
+
+ this.$confirm({
+ title: '纭鎻愪氦锛�',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ httpAction(httpurl, params, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.loading = false
+
+ })
+ }
+ })
+
+
+ }
+ },
+ /**
+ * 鎾ゅ洖宸叉彁浜ょ殑璁板綍
+ */
+ handleRevocation: function() {
+ if (!this.url.revocation) {
+ this.$message.error('璇疯缃畊rl.revocation灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length != 1) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ return
+ } else {
+ var id = this.selectedRowKeys[0]
+ let httpurl = this.url.revocation
+ let method = 'post'
+ var params = { id: id }
+
+ const that = this
+ this.$confirm({
+ title: '纭鎾ゅ洖锛�',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+
+ httpAction(httpurl, params, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+ }
+ })
+ }
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3