~jiangyouyao/beauty-erp.git

			@@ -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>
			@@ -385,7 +406,6 @@
			tgtpSubmit(){
			let _this = this;
			let imageUrl = _this.imageUrl;
			alert(imageUrl);
			let data= {
			imageUrl:imageUrl,
			};
			@@ -400,8 +420,6 @@
			});
			},
			handleAvatarSuccess(res, file) {
			//this.imageUrl = URL.createObjectURL(file.raw);
			//alert(res.path);
			this.imageUrl = res.path;
			},
			beforeAvatarUpload(file) {
			@@ -441,29 +459,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,
			}
			@@ -488,7 +513,7 @@
			}).then(() => {
			//通过
			_this.delFyfaApply(row);
			_this.loadFyfaSetting();

			}).catch(action => {
			//不通过
			if(action === 'cancel'){
			@@ -512,6 +537,7 @@
			url: basePath + '/fenXiao/fenXiaoUser/delFyfaApply',
			callback: function (data) {
			_this.$message.success(data.info);
			_this.loadFyfaSetting();
			}
			});
			},
			@@ -577,11 +603,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();
			},
			//时间格式化