Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-17 0c60f5608fc8f738eb138e32f583c329ed5aa81d

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

@@ -99,7 +99,7 @@
                                        type="selection">
                                </el-table-column>
                                <el-table-column
                                        label="分销员" width="120">
                                        label="分销员" width="150">
                                    <template slot-scope="scope">
                                        <img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
                                        {{scope.row.nickname}}
@@ -111,7 +111,11 @@
                                </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"
@@ -154,7 +158,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>
@@ -209,7 +213,7 @@
                                    <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" 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>
@@ -574,11 +578,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();
            },
            //时间格式化