Skip to content

C
confucius
Commit 80375acf authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 23e12f74
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 207 deletions
src/components/sale/peerInfo/order.vue
View file @ 80375acf
...@@ -80,8 +80,6 @@ ...@@ -80,8 +80,6 @@
dialog: false, dialog: false,
data: {}, data: {},
loading: false, loading: false,
dateList: [], //报名时间
dateList2: [], //开班时间
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 8, pageSize: 8,
...@@ -108,7 +106,6 @@ ...@@ -108,7 +106,6 @@
//订单状态 //订单状态
OrderStateList: [], OrderStateList: [],
pageCount: 0, pageCount: 0,
CourseList: [], //关联课程下拉数据
classObjOption: null, classObjOption: null,
isShowClassInfo: false, //是否显示课程信息 isShowClassInfo: false, //是否显示课程信息
showone: false, showone: false,
...@@ -152,7 +149,6 @@ ...@@ -152,7 +149,6 @@
msg.OrderId = 0; msg.OrderId = 0;
} }
this.loading = true; this.loading = true;
console.log("msg",msg);
getMyOrderStatisticsPageList(msg) getMyOrderStatisticsPageList(msg)
.then(res => { .then(res => {
this.data = res.Data.PageData; this.data = res.Data.PageData;
......
src/components/sale/peerInfo/rakeback.vue
View file @ 80375acf
...@@ -18,28 +18,12 @@ ...@@ -18,28 +18,12 @@
<span>{{ data.UnSettlementMoney }}</span> <span>{{ data.UnSettlementMoney }}</span>
</div> </div>
</div> </div>
<q-tabs <q-tabs v-model="tabs" active-color="primary" align="left" style="width:180px;" class="q-my-xs">
v-model="tabs"
active-color="primary"
align="left"
style="width:180px;"
class="q-my-xs"
>
<q-tab :name="1" label="返佣明细" /> <q-tab :name="1" label="返佣明细" />
<q-tab :name="2" label="提现记录" /> <q-tab :name="2" label="提现记录" />
</q-tabs> </q-tabs>
<q-table <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
:pagination="msg" separator="none" :data="dataList" :columns="columns" row-key="name" v-if="tabs==1">
:loading="loading"
no-data-label="暂无相关数据"
flat
class="sticky-column-table"
separator="none"
:data="dataList"
:columns="columns"
row-key="name"
v-if="tabs==1"
>
<template v-slot:body-cell-Status="props"> <template v-slot:body-cell-Status="props">
<q-td :props="props" style="padding-right: 0px"> <q-td :props="props" style="padding-right: 0px">
<span v-if="props.row.Status==-1">不返佣</span> <span v-if="props.row.Status==-1">不返佣</span>
...@@ -54,203 +38,202 @@ ...@@ -54,203 +38,202 @@
<span v-if="props.row.CommissionType==2">幸福存折</span> <span v-if="props.row.CommissionType==2">幸福存折</span>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
<q-pagination <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
class="full-width justify-end" :input="true" @input="changePage" />
v-model="msg.pageIndex"
color="primary"
:max="pageCount"
:input="true"
@input="changePage"
/>
</template> </template>
</q-table> </q-table>
<withdraw v-if="tabs==2" :Type="1" :Id="Id"></withdraw> <withdraw v-if="tabs==2" :Type="1" :Id="Id"></withdraw>
</div> </div>
</template> </template>
<script> <script>
import { import {
getCustomerCommissionPassbook, getCustomerCommissionPassbook,
getCustomerCommissionStat, getCustomerCommissionStat,
GetCustomerBalanceDetailPage GetCustomerBalanceDetailPage
} from "../../../api/sale/peemanagement"; } from "../../../api/sale/peemanagement";
import { import {
getCommissionStatistics, getCommissionStatistics,
} from '../../../api/finance/index' } from '../../../api/finance/index'
import withdraw from './withdraw' import withdraw from './withdraw'
export default { export default {
components:{ components: {
withdraw withdraw
}, },
props: { props: {
Id: { Id: {
//1返佣 2幸福存折 //1返佣 2幸福存折
type: Number, type: Number,
default: 0 default: 0
} }
}, },
data() { data() {
return { return {
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
rowsPerPage: 10, rowsPerPage: 10,
BatchId:0, BatchId: 0,
SchoolId:'-1', SchoolId: '-1',
Status:'-2', Status: '-2',
OrderSourceType:0, OrderSourceType: 0,
OrderSourceId:0, OrderSourceId: 0,
Q_SelectNormal:0, Q_SelectNormal: 0,
CommissionType:1, CommissionType: 1,
ClassId:0, ClassId: 0,
OrderId:'', OrderId: '',
},
pageCount: 0,
data: {},
dataList: [],
columns: [
{
name: "SchoolName",
label: "校区",
field: "SchoolName",
align: "left"
},
{
name: "OrderSourceTypeName",
label: "来源",
align: "left",
field: "OrderSourceTypeName"
},
{
name: "UserName",
label: "人员",
field: "UserName",
align: "left"
},
{
name: "ClassNo",
label: "班号",
field: "ClassNo",
align: "left"
},
{
name: "OrderId",
label: "订单编号",
field: "OrderId",
align: "left"
},
{
name: "StuName",
label: "学生",
field: "StuName",
align: "left"
},
{
name: "CommissionType",
label: "类型",
field: "CommissionType",
align: "left"
},
{
name: "CommissionMoeny",
label: "金额",
field: "CommissionMoeny",
align: "left"
},
{
name: "Status",
label: "状态",
field: "Status",
align: "left"
}, },
pageCount: 0,
data: {},
dataList: [],
columns: [{
name: "SchoolName",
label: "校区",
field: "SchoolName",
align: "left"
},
{ {
name: "BatchName", name: "OrderSourceTypeName",
label: "期数", label: "来源",
field: "BatchName", align: "left",
align: "left" field: "OrderSourceTypeName"
}, },
{ {
name: "Remark", name: "UserName",
label: "备注", label: "人员",
field: "Remark", field: "UserName",
align: "left" align: "left"
} },
], {
tabs:1 name: "ClassNo",
}; label: "班号",
}, field: "ClassNo",
mounted() { align: "left"
this.getData(); },
this.getList(); {
}, name: "OrderId",
methods: { label: "订单编号",
getData() { field: "OrderId",
const msg = { align: "left"
OrderSourceType:2, },
OrderSourceId: this.Id, {
CommissionType: 1, name: "StuName",
}; label: "学生",
getCustomerCommissionStat(msg).then(res => { field: "StuName",
this.data = res.Data; align: "left"
}); },
}, {
//获取数据 name: "CommissionType",
getList() { label: "类型",
this.msg.OrderSourceId=this.Id field: "CommissionType",
this.loading = true; align: "left"
getCommissionStatistics(this.msg) },
.then(res => { {
this.loading = false; name: "CommissionMoeny",
if (res.Code == 1) { label: "金额",
this.dataList = res.Data.PageData.List; field: "CommissionMoeny",
this.pageCount = res.Data.PageCount; align: "left"
},
{
name: "Status",
label: "状态",
field: "Status",
align: "left"
},
{
name: "BatchName",
label: "期数",
field: "BatchName",
align: "left"
},
{
name: "Remark",
label: "备注",
field: "Remark",
align: "left"
} }
}) ],
.catch(() => { tabs: 1
this.loading = false; };
});
}, },
changePage(val) { mounted() {
this.msg.pageIndex = val; this.getData();
this.getList(); this.getList();
},
methods: {
getData() {
const msg = {
OrderSourceType: 2,
CategoryId: this.Id,
CommissionType: 1,
};
getCustomerCommissionStat(msg).then(res => {
this.data = res.Data;
});
},
//获取数据
getList() {
this.msg.CategoryId = this.Id
this.loading = true;
getCommissionStatistics(this.msg)
.then(res => {
this.loading = false;
if (res.Code == 1) {
this.dataList = res.Data.PageData.List;
this.pageCount = res.Data.PageCount;
}
})
.catch(() => {
this.loading = false;
});
},
changePage(val) {
this.msg.pageIndex = val;
this.getList();
}
} }
} };
};
</script> </script>
<style> <style>
.passbook ::-webkit-scrollbar { .passbook ::-webkit-scrollbar {
width: 5px; width: 5px;
height: 5px; height: 5px;
} }
.passbook ::-webkit-scrollbar-track {
background: #fff; .passbook ::-webkit-scrollbar-track {
border-radius: 2px; background: #fff;
} border-radius: 2px;
.passbook ::-webkit-scrollbar-thumb { }
background: #444;
border-radius: 10px; .passbook ::-webkit-scrollbar-thumb {
} background: #444;
.passbook ::-webkit-scrollbar-thumb:hover { border-radius: 10px;
background: #999; }
}
.passbook ::-webkit-scrollbar-corner { .passbook ::-webkit-scrollbar-thumb:hover {
background: #204754; background: #999;
} }
.passbook .stics {
padding: 5px 10px; .passbook ::-webkit-scrollbar-corner {
background: #dddee0; background: #204754;
border-radius: 4px; }
font-size: 14px;
color: #000000; .passbook .stics {
font-weight: bold; padding: 5px 10px;
white-space: nowrap; background: #dddee0;
} border-radius: 4px;
.passbook .stics-name { font-size: 14px;
color: #2d2d2d; color: #000000;
font-weight: 600; font-weight: bold;
margin-right: 10px; white-space: nowrap;
} }
</style>
.passbook .stics-name {
color: #2d2d2d;
font-weight: 600;
margin-right: 10px;
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment