~jiangyouyao/beauty-erp.git

			@@ -22,6 +22,14 @@
			</script>
			<script type="text/javascript" charset="utf-8"
			th:src="@{/plugin/beditor/lang/zh-cn/zh-cn.js}"></script>
			<style>
			.paginationStyle{
			background: #ffffff;
			padding: 10px 10px;
			margin: 0px 0px 10px 0px;
			text-align: right;
			}
			</style>
			</head>

			<body>
			@@ -29,111 +37,38 @@
			<el-row>
			<el-tabs v-model="activeName" >
			<el-tab-pane label="分销员管理" name="first">
			<el-row>
			<el-form ref="form" :model="form" inline >

			<el-form-item label="交易类型" prop="fenxiaoGrade">
			<el-select v-model="form.fenxiaoGrade" placeholder="请选择">
			<el-option
			v-for="item in fenxiaoGradeList"
			:key="item.value"
			:label="item.label"
			:value="item.value"
			>
			</el-option>
			</el-select>
			</el-form-item>

			<el-form-item label="分销员等级" prop="shenheState">
			<el-select v-model="form.shenheState" placeholder="请选择">
			<el-option
			v-for="item in shenheStateList"
			:key="item.value"
			:label="item.label"
			:value="item.value">
			</el-option>
			</el-select>
			</el-form-item>

			<el-row style="display:flex;align-items: center;">
			<el-col>
			<el-button type="primary" @click="submits()">新增分销员</el-button>
			</el-col>
			<el-col style="display:flex;align-items: center;">

			<el-select v-model="fenxiaoGrade" placeholder="分销员等级">
			<el-option label="初始等级" value="1"></el-option>
			<el-option label="合伙人" value="2"></el-option>
			<el-row style="display:flex;align-items: center;">
			<el-col>
			<el-button type="primary" @click="addSaleMan()">新增分销员</el-button>
			</el-col>
			<el-col>
			<el-form ref="form" :model="form" inline >
			<el-form-item label="审核状态" prop="shenheState">
			<el-select v-model="form.shenheState" placeholder="请选择">
			<el-option
			v-for="item in shenheStateList"
			:key="item.value"
			:label="item.label"
			:value="item.value"
			>
			</el-option>
			</el-select>
			<el-button type="primary" @click="search" >搜索</el-button>
			<el-button type="primary" @click="submits()">搜索</el-button>
			<el-button @click="resetForm('form')">重置</el-button>
			</el-col>
			</el-row>

			<el-button type="primary" @click="search" >搜索</el-button>
			<el-button @click="resetForm('form')">重置</el-button>
			</el-form>
			</el-form-item>
			<el-button type="primary" @click="search" >搜索</el-button>
			<el-button @click="resetForm('form')">重置</el-button>
			</el-form>
			</el-col>
			</el-row>
			<el-row>
			<template>
			<el-table
			ref="multipleTable"
			:data="fxy"
			tooltip-effect="dark"
			style="width: 100%"
			@selection-change="handleSelectionChange">
			<el-table id="proj" :data="fxyList.rows" :height="height" stripe @sort-change="sortChange">
			<el-table-column
			type="selection"
			width="55">
			</el-table-column>
			<el-table-column
			prop="name"
			label="分销员姓名"
			width="180">
			</el-table-column>
			<el-table-column
			prop="name"
			label="分销员姓名"
			width="180">
			</el-table-column>
			<el-table-column
			prop="name"
			label="邀请人"
			width="180">
			</el-table-column>
			<el-table-column
			prop="name"
			label="下级客户数"
			width="180">
			</el-table-column>
			<el-table-column
			prop="name"
			label="累计收益"
			width="180">
			</el-table-column>
			<el-table-column
			prop="name"
			label="待结算"
			width="180">
			</el-table-column>
			<el-table-column
			prop="name"
			label="等级"
			width="180">
			</el-table-column>
			<el-table-column
			prop="date"
			label="加入时间"
			width="180">
			</el-table-column>
			<el-table-column
			prop="name"
			label="状态"
			width="180">
			</el-table-column>
			<el-table-column
			prop="name"
			label="来源"
			prop="userId"
			label="id"
			width="180">
			</el-table-column>
			<el-table-column
			@@ -147,6 +82,18 @@
			</el-table-column>
			</el-table>
			</template>
			</el-row>
			<el-row class="paginationStyle" >
			<el-pagination background
			@size-change="changePageSize"
			@current-change="changeCurrentPage"
			:current-page="fxyList.currentPage"
			:page-sizes="[10, 20, 30, 50]"
			:page-size="fxyList.pageSize"
			layout="total, sizes, prev, pager, next, jumper"
			:total="fxyList.total">
			</el-pagination>
			</el-row>
			</el-tab-pane>
			<el-tab-pane label="分佣方案" name="second">
			<template>
			@@ -227,17 +174,17 @@
			<script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
			<script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script>
			<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
			<script type="text/javascript" th:src="@{/plugin/layer/layer.js}"></script>
			<script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>

			<script>
			//百度编辑器
			MUI.initImgUpload(".upload-input");

			var ue = {};
			var app = new Vue({
			el: '#app',
			data: {
			fxy:[],
			shenheState: "",
			fenxiaoGrade: "",
			tableData:[],
			tgwa: "",
			@@ -249,34 +196,29 @@
			mdjf:[],
			scjf:[],
			form:{
			name:null,
			datetimeArr:'',
			payMethod:'',
			flowType:'',
			orderNo:'',
			oprationMan:'',
			queryKey:'',
			shenheState:'',
			order:'',
			sort:''
			},
			//条件查询审核状态
			shenheStateList:[
			{value:'',label:'全部'},
			{value:'1',label:'已审核'},
			{value:'2',label:'未审核'},
			{value:'3',label:'未通过'}
			{value:1,label:'未审核'},
			{value:2,label:'通过'},
			{value:3,label:'未通过'}
			],
			shenheStateList:[
			{value:'',label:'全部'},
			{value:'1',label:'已审核'},
			{value:'2',label:'未审核'},
			{value:'3',label:'未通过'}
			],
			fxyList:{
			rows:[],
			total:0,
			pageSize:10,
			currentPage:1,
			},
			height:'calc(100vh - 240px)',
			},


			created: function () {
			this.loadInfo();
			window.addEventListener("keydown", this.keydown);
			//初始化编辑器
			ue = UE.getEditor('description');
			//百度编辑器
			@@ -310,16 +252,68 @@
			},
			loadParamSetting() {
			let _this = this;
			//加载配置
			let data=_this.getRequestParam();
			data.pageSize=_this.fxyList.pageSize;
			data.pageNum=_this.fxyList.currentPage;
			AjaxProxy.requst({
			app: _this,
			data: {},
			url: basePath + '/score/fenXiaoUser/fenXiaoUser',
			data:data,
			url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanApplyList',
			callback: function (data) {
			console.log("over");
			_this.fxyList.rows = data.rows;
			_this.fxyList.total=data.total;
			}
			});
			},
			getRequestParam(){
			let _this = this;
			return {
			shenheState:_this.form.shenheState,
			order:_this.form.order,
			sort:_this.form.sort,
			}
			},
			search:function(){
			this.fxyList.currentPage=1;
			this.loadInfo();
			},
			keydown(evt){
			if(evt.keyCode==13) {
			this.search();
			}
			},
			resetForm(formName) {
			this.$refs[formName].resetFields();
			},
			sortChange:function (column){
			if(column.order){
			if(column.order.indexOf("desc")){
			this.form.order="desc";
			}else{
			this.form.order="asc";
			}
			this.form.sort=column.prop;
			this.loadInfo();
			}
			},
			changePageSize(val) {
			this.table.pageSize = val;
			this.loadData();
			},
			changeCurrentPage(val) {
			this.table.currentPage = val;
			this.loadData();
			},
			//新增分销员页面
			addSaleMan(){
			layer.full(layer.open({
			type: 2,
			title: "选择会员",
			maxmin: true,
			area: [MUI.SIZE_L, '500px'],
			content : [ basePath + '/admin/redirect/fenxiao/fenxiao-apply']
			}));
			},

			submit() {
			}