From 41297410366cbc0d78ef9153f2219b8079ac1838 Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Tue, 30 May 2023 17:18:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A8=E5=B9=BF=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../commissionDetails/memberRecharge.vue | 155 +++++++++++++++++
.../promotionEffect/memberRecharge.vue | 160 ++++++++++++++++++
.../src/views/system/dept/index.vue | 58 +++++++
3 files changed, 373 insertions(+)
create mode 100644 yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
create mode 100644 yudao-ui-admin/src/views/distribution/promotionEffect/memberRecharge.vue
diff --git a/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue b/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
new file mode 100644
index 000000000..2719477ae
--- /dev/null
+++ b/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+ {{ scope.row.parentOrganizationName }}
+ -{{ scope.row.nickname }}
+
+
+
+
+
+ {{ parseTime(scope.row.payTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin/src/views/distribution/promotionEffect/memberRecharge.vue b/yudao-ui-admin/src/views/distribution/promotionEffect/memberRecharge.vue
new file mode 100644
index 000000000..1e6cc06eb
--- /dev/null
+++ b/yudao-ui-admin/src/views/distribution/promotionEffect/memberRecharge.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.payTime) }}
+
+
+
+
+ {{ scope.row.parentOrganizationName }}
+ -{{ scope.row.nickname }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-admin/src/views/system/dept/index.vue b/yudao-ui-admin/src/views/system/dept/index.vue
index 8a822a874..a038dc017 100644
--- a/yudao-ui-admin/src/views/system/dept/index.vue
+++ b/yudao-ui-admin/src/views/system/dept/index.vue
@@ -20,6 +20,11 @@
新增
+
+ 导入
+
+
展开/折叠
@@ -104,6 +109,22 @@
取 消
+
+
+
+
+ 将文件拖到此处,或点击上传
+
+ 仅允许导入xls、xlsx格式文件。
+
+
+
+
@@ -115,6 +136,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {CommonStatusEnum} from '@/utils/constants'
import { getDictDatas, DICT_TYPE } from '@/utils/dict'
import {listSimpleUsers} from "@/api/system/user";
+import {getBaseHeader} from '@/utils/request';
export default {
name: "SystemDept",
@@ -141,6 +163,19 @@ export default {
refreshTable: true,
// 是否展开
expand: false,
+ submitLoading: false,
+ upload: {
+ // 是否显示弹出层(用户导入)
+ open: false,
+ // 弹出层标题(用户导入)
+ title: '商户导入',
+ // 是否禁用上传
+ isUploading: false,
+ // 设置上传的请求头部
+ headers: getBaseHeader(),
+ // 上传的地址
+ url: process.env.VUE_APP_BASE_API + '/admin-api/system/dept/batch/import'
+ },
// 查询参数
queryParams: {
name: undefined,
@@ -189,6 +224,29 @@ export default {
});
},
methods: {
+ submitFileForm() {
+ this.$refs.upload.submit();
+ },
+ /** 导入按钮操作 */
+ handleImport() {
+ this.upload.title = '推广员导入';
+ this.upload.open = true;
+ },
+ // 文件上传中处理
+ handleFileUploadProgress(event, file, fileList) {
+ this.upload.isUploading = true;
+ },
+ // 文件上传成功处理
+ handleFileSuccess(response, file, fileList) {
+ if (response.code !== 0) {
+ this.$modal.msgError(response.msg)
+ return;
+ }
+ this.upload.open = false;
+ this.upload.isUploading = false;
+ this.$refs.upload.clearFiles();
+ this.getList();
+ },
/** 查询组织列表 */
getList() {
this.loading = true;