Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-07 beb6e85c9b054e8edced241c3367814a0a19d70c

 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html

@@ -199,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>
@@ -338,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 () {
        },
@@ -474,12 +525,14 @@
                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,
                }