From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html | 119 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 23 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
index cc2ebb2..2e975b3 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
@@ -23,6 +23,9 @@
<script type="text/javascript" charset="utf-8"
th:src="@{/plugin/beditor/lang/zh-cn/zh-cn.js}"></script>
<style>
+ .panel-body{
+ overflow: hidden;
+ }
.paginationStyle{
background: #ffffff;
padding: 10px 10px;
@@ -56,7 +59,7 @@
</head>
<body>
-<div class="ibox-content" id="app" v-cloak>
+<div class="panel-body" id="app" v-cloak>
<el-row>
<el-tabs v-model="activeName" >
<el-tab-pane label="分销员管理" name="first">
@@ -99,19 +102,25 @@
type="selection">
</el-table-column>
<el-table-column
- label="分销员" width="120">
+ label="分销员"
+ show-overflow-tooltip
+ width="150">
<template slot-scope="scope">
<img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
{{scope.row.nickname}}
</template>
</el-table-column>
<el-table-column
- prop="parentUser"
- label="邀请人">
+ prop="parentUserNow"
+ label="当前上级">
</el-table-column>
<el-table-column
prop="lowerLevelNum"
- label="下级客户数">
+ label="推广客户">
+ </el-table-column>
+ <el-table-column
+ prop="invitedNum"
+ label="邀请下级">
</el-table-column>
<el-table-column
prop="totalRevenue"
@@ -128,6 +137,7 @@
<el-table-column
prop="createTime"
label="加入时间"
+ show-overflow-tooltip
:formatter="formatDate">
</el-table-column>
<el-table-column
@@ -138,6 +148,10 @@
<span v-if="scope.row.applyStatus == 3">未通过</span>
<span v-if="scope.row.applyStatus == 4">系统删除</span>
</template>
+ </el-table-column>
+ <el-table-column
+ prop="parentUser"
+ label="注册邀请人">
</el-table-column>
<el-table-column
label="来源">
@@ -154,7 +168,7 @@
<el-button type="primary" v-if="scope.row.applyStatus == 1" size="mini" @click="openExamineSaleManApply(scope.row)">审核</el-button>
<el-button type="primary" v-if="scope.row.applyStatus == 2" size="mini" @click="openUpdateSaleManGrade(scope.row)">修改等级</el-button>
<el-button type="primary" size="mini" @click="openUpdateSaleManGrade(scope.row)">详情</el-button>
- <el-button type="primary" v-if="scope.row.applyStatus == 2" size="mini" @click="delSaleManGradeApply(scope.row)">删除</el-button>
+ <el-button type="danger" v-if="scope.row.applyStatus == 2" size="mini" @click="delSaleManGradeApply(scope.row)">删除</el-button>
</el-row>
</template>
</el-table-column>
@@ -185,6 +199,13 @@
</el-table-column>
<el-table-column
prop="sealesCommission"
+ label="自购返佣 %">
+ <template slot-scope="scope">
+ <el-input class="edit-input" v-model="scope.row.selfCommission" oninput ="value=value.replace(/[^0-9.]/g,'')" placeholder="自购返佣"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="sealesCommission"
label="推广提成 %">
<template slot-scope="scope">
<el-input class="edit-input" v-model="scope.row.sealesCommission" oninput ="value=value.replace(/[^0-9.]/g,'')" placeholder="推广提成"></el-input>
@@ -207,9 +228,9 @@
<el-table-column label="操作" width="240">
<template slot-scope="scope">
<el-row style="display:flex;">
- <el-button type="primary" v-if="scope.row.isDefault == 1" size="mini" @click="addFyfa()">新增</el-button>
+ <el-button type="primary" v-if="scope.row.isDefault == 1" size="mini" @click="addFyfaReady()">新增</el-button>
<el-button type="primary" size="mini" @click="updateFyfa(scope.row)">保存</el-button>
- <el-button type="primary" v-if="scope.row.isDefault == 2" size="mini" @click="delFyfa(scope.row)">删除</el-button>
+ <el-button type="danger" v-if="scope.row.isDefault == 2" size="mini" @click="delFyfa(scope.row)">删除</el-button>
</el-row>
</template>
</el-table-column>
@@ -324,7 +345,51 @@
this.loadInfo();
window.addEventListener("keydown", this.keydown);
//初始化编辑器
- ue = UE.getEditor('description');
+ ue = UE.getEditor('description', {
+ toolbars: [
+ [
+ 'anchor',
+ 'bold', //加粗
+ 'indent', //首行缩进
+ 'italic', //斜体
+ 'underline', //下划线
+ 'strikethrough', //删除线
+ 'subscript', //下标
+ 'fontborder', //字符边框
+ 'superscript', //上标
+ 'formatmatch', //格式刷
+ 'pasteplain', //纯文本粘贴模式
+ 'selectall', //全选
+ 'horizontal', //分隔线
+ 'removeformat', //清除格式
+ 'unlink', //取消链接
+ 'inserttitle', //插入标题
+ 'cleardoc', //清空文档
+ 'fontfamily', //字体
+ 'fontsize', //字号
+ 'paragraph', //段落格式
+ 'simpleupload', //单图上传
+ 'insertimage', //多图上传
+ 'link', //超链接
+ 'emotion', //表情
+ 'justifyleft', //居左对齐
+ 'justifyright', //居右对齐
+ 'justifycenter', //居中对齐
+ 'justifyjustify', //两端对齐
+ 'forecolor', //字体颜色
+ 'backcolor', //背景色
+ 'insertorderedlist', //有序列表
+ 'insertunorderedlist', //无序列表
+ 'fullscreen', //全屏
+ 'rowspacingtop', //段前距
+ 'rowspacingbottom', //段后距
+ 'imagecenter', //居中
+ 'lineheight', //行间距
+ 'customstyle', //自定义标题
+ 'autotypeset', //自动排版
+ 'background', //背景
+ ]
+ ]});
},
mounted: function () {
},
@@ -399,7 +464,7 @@
});
},
handleAvatarSuccess(res, file) {
- this.imageUrl = URL.createObjectURL(file.raw);
+ this.imageUrl = res.path;
},
beforeAvatarUpload(file) {
const isJPG = file.type === 'image/jpeg';
@@ -438,29 +503,36 @@
this.loadFyfaSetting();
},
//新增
- addFyfa(){
+ addFyfaReady(){
let _this = this;
- AjaxProxy.requst({
- app: _this,
- data:[],
- url: basePath + '/fenXiao/fenXiaoUser/addFyfa',
- callback: function (data) {
- _this.$message.success(data.info);
- _this.loadFyfaSetting();
- }
- });
+ let fyfaReady = {};
+ _this.fyfaList.rows.push(fyfaReady);
},
+ // addFyfa(){
+ // let _this = this;
+ // AjaxProxy.requst({
+ // app: _this,
+ // data:[],
+ // url: basePath + '/fenXiao/fenXiaoUser/addFyfa',
+ // callback: function (data) {
+ // _this.$message.success(data.info);
+ // _this.loadFyfaSetting();
+ // }
+ // });
+ // },
updateFyfa(row){
let _this = this;
let id = row.id;
let name = row.name;
let sealesCommission = row.sealesCommission;
+ let selfCommission = row.selfCommission;
let invitationCommission = row.invitationCommission;
let gradeCondition = row.gradeCondition;
let obj = {
id: id,
name: name,
sealesCommission: sealesCommission,
+ selfCommission: selfCommission,
invitationCommission: invitationCommission,
gradeCondition: gradeCondition,
}
@@ -485,7 +557,7 @@
}).then(() => {
//通过
_this.delFyfaApply(row);
- _this.loadFyfaSetting();
+
}).catch(action => {
//不通过
if(action === 'cancel'){
@@ -509,6 +581,7 @@
url: basePath + '/fenXiao/fenXiaoUser/delFyfaApply',
callback: function (data) {
_this.$message.success(data.info);
+ _this.loadFyfaSetting();
}
});
},
@@ -574,11 +647,11 @@
}
},
changePageSize(val) {
- this.table.pageSize = val;
+ this.fxyList.pageSize = val;
this.loadParamSetting();
},
changeCurrentPage(val) {
- this.table.currentPage = val;
+ this.fxyList.currentPage = val;
this.loadParamSetting();
},
//时间格式化
--
Gitblit v1.9.1