Commit 9dfe2df9 authored by Mac's avatar Mac

1

parent a10397e9
...@@ -53,12 +53,16 @@ ...@@ -53,12 +53,16 @@
<div class="col-3"> <div class="col-3">
<q-input filled v-model="msg.OrderId" @keyup.enter.native="getList()" label="订单号" /> <q-input filled v-model="msg.OrderId" @keyup.enter.native="getList()" label="订单号" />
</div> --> </div> -->
<div class="col-3">
<q-btn :loading="loading1" color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/>
</div>
</div> </div>
</div> </div>
<template > <template >
<el-table <el-table
ref="filterTable" ref="filterTable"
:data="tableData" :data="tableData"
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}"
border border
style="width: 100%"> style="width: 100%">
<el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column> <el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
...@@ -68,7 +72,7 @@ ...@@ -68,7 +72,7 @@
<el-table-column prop="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney"> </el-table-column> <el-table-column prop="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney"> </el-table-column>
<el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column> <el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column>
<el-table-column prop="CommissionMoney" label="最终提成" sortable :sort-method="CommissionMoney"> </el-table-column> <el-table-column prop="CommissionMoney" label="最终提成" sortable :sort-method="CommissionMoney"> </el-table-column>
<el-table-column prop="Periods" label="周期"> </el-table-column> <!-- <el-table-column prop="Periods" label="周期"> </el-table-column> -->
<el-table-column label="操作" > <el-table-column label="操作" >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="_icon_btn"> <div class="_icon_btn">
...@@ -229,6 +233,9 @@ ...@@ -229,6 +233,9 @@
}, },
CommissionMoney(a,b){ CommissionMoney(a,b){
return a.CommissionMoney - b.CommissionMoney; return a.CommissionMoney - b.CommissionMoney;
},
goreturn(){
this.$router.go(-1);
} }
}, },
......
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
周期提成 订单提成查询 <q-btn :loading="loading1" color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -46,6 +47,7 @@ ...@@ -46,6 +47,7 @@
<el-table <el-table
ref="filterTable" ref="filterTable"
:data="tableData" :data="tableData"
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}"
border border
style="width: 100%"> style="width: 100%">
<el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column> <el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
...@@ -233,6 +235,9 @@ ...@@ -233,6 +235,9 @@
console.log(a,b) console.log(a,b)
return a.StudentCount - b.StudentCount; return a.StudentCount - b.StudentCount;
}, },
goreturn(){
this.$router.go(-1);
}
......
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
<template> <template>
<div class="page-body userCommissionDetails"> <div class="page-body userCommissionDetails">
<div class="page-search row items-center"> <div class="page-search row items-center">
<div style="margin-right: 10px;">
<q-btn :loading="loading1" color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/>
</div>
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList" <q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList"
...@@ -59,6 +62,7 @@ ...@@ -59,6 +62,7 @@
<el-table <el-table
ref="filterTable" ref="filterTable"
:data="tableData" :data="tableData"
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}"
border border
style="width: 100%"> style="width: 100%">
<el-table-column prop="SchoolName" label="校区" ></el-table-column> <el-table-column prop="SchoolName" label="校区" ></el-table-column>
...@@ -231,6 +235,9 @@ ...@@ -231,6 +235,9 @@
blank: 'y', blank: 'y',
} }
}) })
},
goreturn(){
this.$router.go(-1);
} }
}, },
......
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