~jiangyouyao/beauty-erp.git

			@@ -66,7 +66,7 @@
			<el-dialog title="本次结算分销订单" :visible.sync="dialogFormVisible">
			<el-form :model="formSelect">
			<el-form-item label="结算金额：" :label-width="formLabelWidth">
			<div style="font-size: 30px;color: red">￥{{formSelect.jsje}}</div>
			<div style="font-size: 30px;color: #ff0000">￥{{formSelect.jsje}}</div>
			</el-form-item>
			<el-form-item label="结算订单：" :label-width="formLabelWidth">
			<div style="font-size: 20px;">{{formSelect.jsdds}}单</div>
			@@ -89,8 +89,20 @@
			<el-button type="primary" @click="updateSetOrderDone()">确定</el-button>
			</div>
			</el-dialog>

			<el-col>
			<el-form ref="form" :model="form" inline >
			<el-form-item label="订单状态" prop="ddType">
			<el-select v-model="form.ddType" placeholder="订单状态">
			<el-option
			v-for="item in ddTypeList"
			:key="item.value"
			:label="item.label"
			:value="item.value"
			>
			</el-option>
			</el-select>
			</el-form-item>
			<el-form-item label="结算状态" prop="orderType">
			<el-select v-model="form.orderType" placeholder="结算状态">
			<el-option
			@@ -103,28 +115,34 @@
			</el-select>
			</el-form-item>
			<el-form-item prop="userName" >
			<el-input v-model="form.userName" placeholder="请输入推广员名称"></el-input>
			</el-form-item>
			<el-form-item prop="userName" >
			<el-input v-model="form.userName" placeholder="选择订单时间范围"></el-input>
			</el-form-item>
			<el-form-item prop="userName" >
			<el-input v-model="form.userName" placeholder="请输入会员姓名"></el-input>
			</el-form-item>
			<el-form-item prop="userName" >
			<el-input v-model="form.userName" placeholder="请输入结算编号"></el-input>
			</el-form-item>
			<el-form-item prop="userName" >
			<el-input v-model="form.userName" placeholder="请输入订单号"></el-input>
			</el-form-item>
			<el-form-item prop="userName" >
			<el-input v-model="form.userName" placeholder="请输入客户名称"></el-input>
			</el-form-item>
			<el-form-item prop="tgy" >
			<el-input v-model="form.tgy" placeholder="请输入推广员名称"></el-input>
			</el-form-item>
			<el-form-item prop="ddsj" >
			<el-date-picker
			v-model="form.ddsj"
			type="datetimerange"
			:picker-options="pickerOptions"
			range-separator="至"
			start-placeholder="开始日期"
			end-placeholder="结束日期"
			align="right">
			</el-date-picker>
			</el-form-item>
			<el-form-item prop="jsbh" >
			<el-input v-model="form.jsbh" placeholder="请输入结算编号"></el-input>
			</el-form-item>
			<el-form-item prop="ddh" >
			<el-input v-model="form.ddh" placeholder="请输入订单号"></el-input>
			</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 class="table-style" >
			<el-table ref="multipleTable"
			:data="fxyList.rows"
			@@ -142,6 +160,20 @@
			<el-table-column
			prop="actualBalance"
			label="实付金额（元）">
			</el-table-column>
			<el-table-column
			label="订单状态">
			<template slot-scope="scope">
			<span v-if="scope.row.orderState == 1">待付款</span>
			<span v-if="scope.row.orderState == 2">待配送</span>
			<span v-if="scope.row.orderState == 3">待收货</span>
			<span v-if="scope.row.orderState == 4">待评价</span>
			<span v-if="scope.row.orderState == 5">已评价</span>
			<span v-if="scope.row.orderState == 6">申请退款</span>
			<span v-if="scope.row.orderState == 7">退款成功</span>
			<span v-if="scope.row.orderState == 8">退款拒绝</span>
			<span v-if="scope.row.orderState == 9">已取消</span>
			</template>
			</el-table-column>
			<el-table-column
			prop="address"
			@@ -176,7 +208,7 @@
			</el-table-column>
			<el-table-column
			prop="settleNo"
			label="结算编号">
			label="结算编号" width="150">
			</el-table-column>
			<el-table-column
			prop="settleTime"
			@@ -186,12 +218,7 @@
			prop="settler"
			label="结算人">
			</el-table-column>
			<el-table-column label="操作" width="240">
			<template slot-scope="scope">
			<el-row style="display:flex;">
			<el-button type="primary" size="mini" @click="openExaminesaleMan(scope.row)">查看订单</el-button>
			</el-row>
			</template>
			<el-table-column label="操作">
			</el-table-column>
			</el-table>
			</el-row>
			@@ -212,6 +239,17 @@
			<el-row style="display:flex;align-items: center;text-align: right;">
			<el-col>
			<el-form ref="formOrder" :model="formOrder" inline >
			<el-form-item prop="jssj" >
			<el-date-picker
			v-model="formOrder.jssj"
			type="datetimerange"
			:picker-options="pickerOptions"
			range-separator="至"
			start-placeholder="开始日期"
			end-placeholder="结束日期"
			align="right">
			</el-date-picker>
			</el-form-item>
			<el-form-item prop="userName">
			<el-input v-model="formOrder.userName" placeholder="请输入结算人姓名"></el-input>
			</el-form-item>
			@@ -295,20 +333,48 @@
			data: {
			activeName: 'first',
			height:'calc(100vh - 240px)',
			//基本数据
			//--基本数据
			basicdetail:{},
			//--时间选择
			pickerOptions: {
			shortcuts: [{
			text: '最近一周',
			onClick(picker) {
			const end = new Date();
			const start = new Date();
			start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
			picker.$emit('pick', [start, end]);
			}
			}, {
			text: '最近一个月',
			onClick(picker) {
			const end = new Date();
			const start = new Date();
			start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
			picker.$emit('pick', [start, end]);
			}
			}, {
			text: '最近三个月',
			onClick(picker) {
			const end = new Date();
			const start = new Date();
			start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
			picker.$emit('pick', [start, end]);
			}
			}]
			},


			//选中操作
			//--批量审核选中操作
			multipleSelection: [],
			orderIds:"",
			orderNums:0,
			orderNumsDones:0,
			dialogFormVisible: false,
			formSelect: {
			jsje: '',
			jsdds: '',
			jsrs: '',
			jsfs: 2,
			jsfs: 1,
			bz: ''
			},
			formLabelWidth: '120px',
			@@ -320,9 +386,26 @@
			{value:2,label:'已结算'},
			{value:3,label:'已退款'}
			],
			ddTypeList:[
			{value:'',label:'全部'},
			{value:1,label:'待付款'},
			{value:2,label:'待配送'},
			{value:3,label:'待收货'},
			{value:4,label:'待评价'},
			{value:5,label:'已评价'},
			{value:6,label:'申请退款'},
			{value:7,label:'退款成功'},
			{value:8,label:'退款拒绝'},
			{value:9,label:'已取消'}
			],
			form:{
			userName:'',
			orderType:'',
			ddType:'',
			ddsj: '',
			tgy:'',
			jsbh:'',
			ddh:'',
			order:'',
			sort:''
			},
			@@ -335,6 +418,7 @@
			//--结算记录
			formOrder:{
			userName:'',
			jssj:'',
			order:'',
			sort:''
			},
			@@ -356,6 +440,7 @@
			let _this = this;
			_this.loadFenxiaoOrderBasic();
			_this.loadFenxiaoOrderList();
			_this.loadSetOrderList();
			},
			//--基础数据
			loadFenxiaoOrderBasic() {
			@@ -383,14 +468,23 @@
			callback: function (data) {
			_this.orderLevelList.rows = data.rows;
			_this.orderLevelList.total = data.total;
			_this.loadFenxiaoOrderBasic();
			}
			});
			},
			//查询参数
			getRequestParamOrder(){
			let _this = this;
			let startTime = '';
			let endTime = '';
			if(_this.formOrder.jssj.length > 0){
			startTime = _this.formOrder.jssj[0];
			endTime = _this.formOrder.jssj[1];
			}
			return {
			userName:_this.formOrder.userName,
			startTime:startTime,
			endTime:endTime,
			order:_this.formOrder.order,
			sort:_this.formOrder.sort,
			}
			@@ -425,14 +519,28 @@
			callback: function (data) {
			_this.fxyList.rows = data.rows;
			_this.fxyList.total = data.total;
			_this.loadFenxiaoOrderBasic();
			}
			});
			},
			//查询参数
			getRequestParam(){
			let _this = this;
			let startTime = '';
			let endTime = '';
			if(_this.form.ddsj.length > 0){
			startTime = _this.form.ddsj[0];
			endTime = _this.form.ddsj[1];
			}
			return {
			orderType:_this.form.orderType,
			ddType:_this.form.ddType,
			tgy:_this.form.tgy,
			userName:_this.form.userName,
			jsbh:_this.form.jsbh,
			startTime:startTime,
			endTime:endTime,
			ddh:_this.form.ddh,
			order:_this.form.order,
			sort:_this.form.sort,
			}
			@@ -474,19 +582,23 @@
			let submitDate = "";
			let orderNum = 0;
			let orderBalance = 0;
			let orderNumsDone = 0;
			let name = [];
			for (let i = 0; i < _this.multipleSelection.length; i++) {
			let order = _this.multipleSelection[i];
			//待审核的计算到弹出框
			let ordersetType = order.settleType;
			if(ordersetType == 1){
			let orderState = order.orderState;
			if(orderState == 4 \|\| orderState == 5){
			let orderId = order.id;
			name.push(order.customUserId);
			orderNum = orderNum + 1;
			orderBalance = orderBalance + order.profitBalance;
			submitDate = submitDate +orderId+",";
			}else{
			orderNumsDone = orderNumsDone + 1;
			}
			}
			_this.orderNumsDones = orderNumsDone;
			_this.orderIds = submitDate;
			_this.orderNums = orderNum;
			_this.formSelect.jsdds = orderNum;
			@@ -512,7 +624,12 @@
			},
			//批量结算
			setOrderDone() {
			if(this.orderNums > 0){
			if(this.orderNumsDones > 0){
			this.$message({
			message: '订单状态【待评价】和【已评价】才允许结算',
			type: 'warning'
			});
			}else if(this.orderNums > 0){
			this.dialogFormVisible = true;
			}else{
			this.$message({
			@@ -525,6 +642,11 @@
			let _this = this;
			let obj = {
			orderIds: _this.orderIds,
			setType: _this.formSelect.jsfs,
			manCount: _this.formSelect.jsrs,
			orderCount: _this.formSelect.jsdds,
			amount: _this.formSelect.jsje,
			remark: _this.formSelect.bz,
			}
			AjaxProxy.requst({
			app: _this,
			@@ -533,6 +655,7 @@
			callback: function (data) {
			_this.$message.success(data.info);
			_this.loadFenxiaoOrderList();
			_this.dialogFormVisible = false;
			}
			});
			},