Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提成详情

Browse Source
This commit is contained in:
xiezhijun
2021-03-27 19:29:15 +08:00
parent b1d2c60f4f
commit 4bee383358
6 changed files with 298 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
stdiet-ui/src/components/OrdercommissDetail/index.vue
View File

@ -5,19 +5,53 @@
:close-on-press-escape="false"
:visible.sync="visible"
@closed="handleOnClosed"
size="63%"
size="65%"
>
<div class="order_drawer_wrapper" height="84%">
<div class="order_drawer_wrapper" >
<div style="margin-left:40px">
<el-form
ref="queryForm"
:inline="true"
v-show="true"
label-width="100px"
>
<el-form-item label="服务时间范围" prop="dateScope">
<el-date-picker
v-model="serverDateScope"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="small" @click="fetchOrderList">搜索</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQueryForm">重置</el-button>
</el-form-item>
</el-form>
</div>
<div
class="header"
style="float: right; margin-bottom: 20px; margin-right: 60px"
class="order_total_data"
>
<span style="font-size：14px;margin-top:-200px"
<span class="order_total_data_span_right20">
当前页总服务金额：{{totalServerAmount}}元
</span>
<span class="order_total_data_span_right20"
>当前页总提成：{{ totalCommission }}元</span
>
<span class="order_total_data_span_right20"
>已发放总提成：{{ totalSendCommission }}元</span
>
<span class="order_total_data_span"
>未发放总提成：{{ totalNotSendCommission }}元</span
>
</div>
<el-table :data="orderList" v-loading="loading">
<div style="width:100%;height:80%;overflow: auto">
<el-table :data="orderList" v-loading="loading" stripe>
<el-table-column
label="订单成交时间"
prop="orderTime"
@ -31,7 +65,7 @@
width="100"
></el-table-column>
<el-table-column
label="订单金额"
label="服务金额"
prop="orderAmount"
align="center"
width="100"
@ -77,7 +111,7 @@
label="暂停天数"
prop="pauseTotalDay"
align="center"
width="100"
width="80"
></el-table-column>
<el-table-column
@ -87,7 +121,7 @@
width="100"
></el-table-column>
<el-table-column
label="当月总额"
label="当月成交额"
prop="monthOrderTotalAmount"
align="center"
width="100"
@ -96,7 +130,7 @@
label="提成比例"
prop="commissionRate"
align="center"
width="100"
width="80"
>
<template slot-scope="scope">
{{ scope.row.commissionRate + "%" }}
@ -108,7 +142,7 @@
align="center"
width="100"
>
<template slot-scope="scope">
<template slot-scope="scope">
{{ scope.row.orderCommission }}
<el-popover
placement="top-start"
@ -117,7 +151,8 @@
trigger="hover"
>
<div
v-for="(item, index) in scope.row.everyYearMonthServerCommission"
v-for="(item, index) in scope.row
.everyYearMonthServerCommission"
:key="index"
>
{{ item }}
@ -126,10 +161,36 @@
</el-popover>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="100"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleOnDetailClick(scope.row)"
>订单详情</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<!--<div style="float: right; margin-right: 40px">
<span style="font-size：14px;margin-top:-200px;margin-right:20px">
当前页总服务金额：{{totalServerAmount}}元
</span>
<span style="font-size：14px;margin-top:-200px;margin-right:20px"
>当前页总提成：{{ totalCommission }}元</span
>
<span style="font-size：14px;margin-top:-200px;margin-right:20px"
>已发放总提成：{{ totalSendCommission }}元</span
>
<span style="font-size：14px;margin-top:-200px"
>未发放总提成：{{ totalNotSendCommission }}元</span
>
</div>-->
<pagination
v-show="total > 0"
:total="total"
@ -139,16 +200,22 @@
:pageSizes="[10, 15, 30, 50, 100]"
>
</pagination>
</div>
</el-drawer>
<order-detail ref="orderDetailRef" />
</div>
</template>
<script>
import { orderDetailDay } from "@/api/custom/commision";
import OrderDetail from "@/components/OrderDetail";
export default {
name: "OrdercommissDetail",
components: {},
components: {
"order-detail": OrderDetail,
},
data() {
return {
visible: false,
@ -158,60 +225,98 @@ export default {
orderList: [],
queryParam: {},
total: 0,
totalServerAmount: 0,
totalCommission: 0,
serverDayList: ["1月：30", "2月：20"],
totalSendCommission: 0,
totalNotSendCommission: 0,
serverDateScope: null,
};
},
computed: {},
methods: {
showDrawer(data) {
this.data = data;
this.serverDateScope = null;
if (!this.data) {
return;
}
(this.queryParam = {
this.queryParam = {
pageNum: 1,
pageSize: 10,
}),
(this.queryParam.userId = this.data.userId);
},
this.queryParam.userId = this.data.userId;
this.queryParam.reviewStatus = this.data.reviewStatus;
this.queryParam.endTime = this.data.endTime;
this.title = `「${this.data.name}」订单提成列表`;
this.title = `「${this.data.name}`;
if (this.data.yearMonth) {
this.title += " 截止" + `${this.data.yearMonth}`;
}
if (this.queryParam.reviewStatus) {
this.title +=
this.queryParam.reviewStatus == "yes" ? " 已审核" : " 未审核";
}
this.title += " 订单提成列表」";
this.visible = true;
this.fetchOrderList();
},
fetchOrderList() {
this.loading = true;
this.queryParam.serverScopeStartTime = this.serverDateScope && this.serverDateScope.length > 0 ? this.serverDateScope[0] : null;
this.queryParam.serverScopeEndTime = this.serverDateScope && this.serverDateScope.length > 0 ? this.serverDateScope[1] : null;
orderDetailDay(this.queryParam).then((res) => {
//console.log(res);
if (res.code == 200) {
this.orderList = this.dealOrderList(res.list);
this.total = res.total;
this.totalServerAmount = res.totalServerAmount;
this.totalCommission = res.totalCommission;
this.totalSendCommission = res.totalSendCommission;
this.totalNotSendCommission = res.totalNotSendCommission;
}
this.loading = false;
});
},
handleOnClosed() {
this.data = undefined;
this.serverDateScope = null;
},
dealOrderList(orderList) {
//处理每个月的服务天数
orderList.forEach((item, index) => {
let everyYearMonthServerDayArray = [];
for (let yearMonth in item.everyYearMonthServerDay) {
everyYearMonthServerDayArray.push(yearMonth.slice(0, 4) +"-" + yearMonth.slice(4) + "：" + item.everyYearMonthServerDay[yearMonth] + "天");
everyYearMonthServerDayArray.push(
yearMonth.slice(0, 4) +
"-" +
yearMonth.slice(4) +
"：" +
item.everyYearMonthServerDay[yearMonth] +
"天"
);
}
item.everyYearMonthServerDay = everyYearMonthServerDayArray;
let everyYearMonthServerCommissionArray = [];
for (let commissYearMonth in item.everyYearMonthServerCommission) {
everyYearMonthServerCommissionArray.push(commissYearMonth.slice(0, 4) +"-" +commissYearMonth.slice(4) +"：" + item.everyYearMonthServerCommission[commissYearMonth]);
everyYearMonthServerCommissionArray.push(
commissYearMonth.slice(0, 4) +
"-" +
commissYearMonth.slice(4) +
"：" +
item.everyYearMonthServerCommission[commissYearMonth]
+ (item.everyYearMonthCommissionSendFlag[commissYearMonth] ? ' 已发放' : ' 未发放')
);
}
item.everyYearMonthServerCommission = everyYearMonthServerCommissionArray;
});
return orderList;
},
resetQueryForm(){
this.serverDateScope = null;
this.fetchOrderList();
},
handleOnDetailClick(data) {
this.$refs.orderDetailRef.showDialog(data.orderId);
},
},
};
</script>
@ -223,4 +328,23 @@ export default {
.order_drawer_wrapper {
height: calc(100vh - 77px);
}
.order_total_data {
float: right;
margin-right: 40px;
margin-bottom:20px
}
.order_total_data_span_right20 {
font-size:16px;
margin-top:-200px;
margin-right:20px;
}
.order_total_data_span {
font-size:16px;
margin-top:-200px;
}
</style>

6
stdiet-ui/src/views/custom/commision/detail_day/index.vue
View File

@ -157,11 +157,11 @@
@click="openFormDialog('查看发放计划', scope.row)"
>查看发放计划</el-button
>
<el-button
<!--<el-button
type="text"
@click="handleDetailClick(scope.row)"
>查看订单详情</el-button
>
>-->
</template>
</el-table-column>
@ -419,7 +419,7 @@ export default {
dayjs(this.month).startOf("month").format("YYYY-MM-DD"),
dayjs(this.month).endOf("month").format("YYYY-MM-DD"),
];
this.$refs["ordercommissDetailRef"].showDrawer(this.addDateRange({'name': row.nickName, 'userId': row.userId, 'reviewStatus': this.queryParams.reviewStatus}, dateRange));
this.$refs["ordercommissDetailRef"].showDrawer(this.addDateRange({'yearMonth': dayjs(this.month).endOf("month").format("YYYY-MM-DD"),'name': row.nickName, 'userId': row.userId, 'reviewStatus': this.queryParams.reviewStatus}, dateRange));
},
getSummaries(param) {
//param 是固定的对象，里面包含 columns与 data参数的对象 {columns: Array[4], data: Array[5]},包含了表格的所有的列与数据信息