Skip to content

C
confucius
Commit a0ccd92b authored by Mac's avatar Mac
Browse files
Options

修改

parent 0d0f506a
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 80 deletions
src/components/sale/b2bcustomerinfo/passbook.vue
View file @ a0ccd92b
......@@ -40,9 +40,18 @@
row-key="name"
v-if="tabs==1"
>
<template v-slot:body-cell-ClassName="props">
<template v-slot:body-cell-Status="props">
<q-td :props="props" style="padding-right: 0px">
{{ props.row.ClassName }} 【{{ props.row.ClassNo }}】
<span v-if="props.row.Status==-1">不返佣</span>
<span v-if="props.row.Status==0">待返佣</span>
<span v-if="props.row.Status==1">已返佣到账户</span>
<span v-if="props.row.Status==2">佣金已提现</span>
</q-td>
</template>
<template v-slot:body-cell-CommissionType="props">
<q-td :props="props" style="padding-right: 0px">
<span v-if="props.row.CommissionType==1">返佣</span>
<span v-if="props.row.CommissionType==2">幸福存折</span>
</q-td>
</template>
<template v-slot:bottom>
......@@ -102,28 +111,28 @@ export default {
data:{},
dataList: [],
columns: [
{
name: "BalanceTypeStr",
label: "类型",
field: "BalanceTypeStr",
{
name: "SchoolName",
label: "校区",
field: "SchoolName",
align: "left"
},
{
name: "Money",
label: "变更金额",
name: "OrderSourceTypeName",
label: "来源",
align: "left",
field: "Money"
field: "OrderSourceTypeName"
},
{
name: "Description",
label: "变更详情",
field: "Description",
name: "UserName",
label: "人员",
field: "UserName",
align: "left"
},
{
name: "ClassName",
label: "班级信息",
field: "ClassName",
name: "ClassNo",
label: "班号",
field: "ClassNo",
align: "left"
},
{
......@@ -133,27 +142,39 @@ export default {
align: "left"
},
{
name: "PeopleNum",
label: "订单人数",
field: "PeopleNum",
name: "StuName",
label: "学生",
field: "StuName",
align: "left"
},
{
name: "BalanceStateStr",
label: "返佣",
field: "BalanceStateStr",
name: "CommissionType",
label: "类型",
field: "CommissionType",
align: "left"
},
{
name: "RemitStr",
label: "提现",
field: "RemitStr",
name: "CommissionMoeny",
label: "金额",
field: "CommissionMoeny",
align: "left"
},
{
name: "Status",
label: "状态",
field: "Status",
align: "left"
},
{
name: "BatchName",
label: "期数",
field: "BatchName",
align: "left"
},
{
name: "UpdateTimeStr",
label: "更新时间",
field: "UpdateTimeStr",
name: "Remark",
label: "备注",
field: "Remark",
align: "left"
}
],
......
src/components/sale/b2bcustomerinfo/rakeback.vue
View file @ a0ccd92b
......@@ -40,11 +40,21 @@
row-key="name"
v-if="tabs==1"
>
<template v-slot:body-cell-ClassName="props">
<template v-slot:body-cell-Status="props">
<q-td :props="props" style="padding-right: 0px">
{{ props.row.ClassName }} 【{{ props.row.ClassNo }}】
<span v-if="props.row.Status==-1">不返佣</span>
<span v-if="props.row.Status==0">待返佣</span>
<span v-if="props.row.Status==1">已返佣到账户</span>
<span v-if="props.row.Status==2">佣金已提现</span>
</q-td>
</template>
<template v-slot:body-cell-CommissionType="props">
<q-td :props="props" style="padding-right: 0px">
<span v-if="props.row.CommissionType==1">返佣</span>
<span v-if="props.row.CommissionType==2">幸福存折</span>
</q-td>
</template>
<template v-slot:bottom>
<q-pagination
class="full-width justify-end"
......@@ -103,27 +113,27 @@ export default {
dataList: [],
columns: [
{
name: "BalanceTypeStr",
label: "类型",
field: "BalanceTypeStr",
name: "SchoolName",
label: "校区",
field: "SchoolName",
align: "left"
},
{
name: "Money",
label: "变更金额",
name: "OrderSourceTypeName",
label: "来源",
align: "left",
field: "Money"
field: "OrderSourceTypeName"
},
{
name: "Description",
label: "变更详情",
field: "Description",
name: "UserName",
label: "人员",
field: "UserName",
align: "left"
},
{
name: "ClassName",
label: "班级信息",
field: "ClassName",
name: "ClassNo",
label: "班号",
field: "ClassNo",
align: "left"
},
{
......@@ -133,27 +143,39 @@ export default {
align: "left"
},
{
name: "PeopleNum",
label: "订单人数",
field: "PeopleNum",
name: "StuName",
label: "学生",
field: "StuName",
align: "left"
},
{
name: "CommissionType",
label: "类型",
field: "CommissionType",
align: "left"
},
{
name: "BalanceStateStr",
label: "返佣",
field: "BalanceStateStr",
name: "CommissionMoeny",
label: "金额",
field: "CommissionMoeny",
align: "left"
},
{
name: "RemitStr",
label: "提现",
field: "RemitStr",
name: "Status",
label: "状态",
field: "Status",
align: "left"
},
{
name: "BatchName",
label: "期数",
field: "BatchName",
align: "left"
},
{
name: "UpdateTimeStr",
label: "更新时间",
field: "UpdateTimeStr",
name: "Remark",
label: "备注",
field: "Remark",
align: "left"
}
],
......
src/pages/financial/returnPassbook/PassbookperiodsList.vue
View file @ a0ccd92b
......@@ -50,9 +50,9 @@
</el-select>
</div>
</div> -->
<div v-if='isgenerate==true'>
<div class="block" style="display:flex">
<span style="margin-right: 5px;">选择月份</span>
<div style="display:flex;justify-content: space-between;width: 100%;align-items: center;" >
<div class="block" style="display:flex;">
<span style="margin-right: 5px;">月份筛选</span>
<el-date-picker
v-model="msg.Month"
value-format="yyyy-MM"
......@@ -62,7 +62,10 @@
>
</el-date-picker>
<q-btn :loading="loading1" color="primary" size="11px" label="生成提成" @click="scCommission" style="margin-left:10px"/>
</div>
<div v-if='isgenerate==true'>
<q-btn :loading="loading1" color="primary" size="11px" label="生成幸福存折" @click="scCommission" style="height:28px"/>
<div style="font-size: 10px;color: #666;">*默认生成上月幸福存折</div>
</div>
</div>
......@@ -162,7 +165,7 @@
})
var myDate=new Date();
myDate.setMonth(myDate.getMonth()-1);
this.msg.Month = myDate.getFullYear() + "-" + (myDate.getMonth()+1)
// this.msg.Month = myDate.getFullYear() + "-" + (myDate.getMonth()+1)
},
mounted() {
......
src/pages/financial/returnPassbook/ReturnUserList.vue
View file @ a0ccd92b
......@@ -190,7 +190,11 @@
:filters="UserNamelist"
:filter-method="filterHandler"
></el-table-column>
<el-table-column prop="OrderSourceType" label="类型"></el-table-column>
<el-table-column prop="OrderSourceType" label="类型">
<template slot-scope="scope">
{{getOrderSourceType(scope.row.OrderSourceType)}}
</template>
</el-table-column>
<el-table-column
prop="StudentCount"
label="学生数量"
......@@ -257,7 +261,7 @@ export default {
Status: '-2',
OrderSourceType: '-1',
OrderSourceId: 0,
Q_SelectNormal: '0'
Q_SelectNormal: '2'
},
pageCount: 0,
persistent: false,
......@@ -353,6 +357,15 @@ export default {
}
})
},
getOrderSourceType(Id){
let Name = ''
this.customFromList.forEach(x=>{
if(x.Id == Id){
Name = x.Name
}
})
return Name
},
//筛选转介人
filterStudent(val, update, abort) {
update(() => {
......
src/pages/financial/returnPassbook/ReturnperiodsList.vue
View file @ a0ccd92b
......@@ -50,9 +50,9 @@
</el-select>
</div>
</div> -->
<div v-if='isgenerate==true'>
<div style="display:flex;justify-content: space-between;width: 100%;align-items: center;" >
<div class="block" style="display:flex">
<span style="margin-right: 5px;">选择月份</span>
<span style="margin-right: 5px;">月份筛选</span>
<el-date-picker
v-model="msg.Month"
value-format="yyyy-MM"
......@@ -62,8 +62,13 @@
>
</el-date-picker>
<q-btn :loading="loading1" color="primary" size="11px" label="生成提成" @click="scCommission" style="margin-left:10px"/>
</div>
<div>
<q-btn v-if='isgenerate==true' :loading="loading1" color="primary" size="11px" label="生成返佣" @click="scCommission" style="height:28px"/>
<div style="font-size: 11px;color: #666;">*默认生成上月返佣</div>
</div>
</div>
</div>
......@@ -166,7 +171,7 @@
})
var myDate=new Date();
myDate.setMonth(myDate.getMonth()-1);
this.msg.Month = myDate.getFullYear() + "-" + (myDate.getMonth()+1)
// this.msg.Month = myDate.getFullYear() + "-" + (myDate.getMonth()+1)
},
mounted() {
......
src/pages/financial/returnPassbook/returnpassbookStatistics.vue
View file @ a0ccd92b
......@@ -261,11 +261,7 @@
style="width: 100%"
>
<el-table-column prop="SchoolName" label="校区" width="150"></el-table-column>
<el-table-column prop="OrderSourceType" label="来源">
<template slot-scope="scope">
{{getOrderSourceType(scope.row.OrderSourceType)}}
</template>
</el-table-column>
<el-table-column prop="OrderSourceTypeName" label="来源"></el-table-column>
<el-table-column prop="UserName" label="人员"></el-table-column>
......@@ -438,7 +434,8 @@ export default {
this.msg.BatchId = (this.$route.query.preriodId).toString()
}
if (this.$route.query && this.$route.query.CommissionType) {
this.msg.CommissionType = this.$route.query.CommissionType
this.msg.CommissionType = this.$route.query.CommissionType;
this.msg.Q_SelectNormal = 2
this.isNormal = true
}
......@@ -487,20 +484,12 @@ export default {
getlaiyuan() {
if (this.msg.OrderSourceType == -1) {
this.msg.OrderSourceId = 0
this.getList()
} else {
this.msg.OrderSourceId = ''
}
this.getList()
},
getOrderSourceType(Id){
let Name = ''
this.customFromList.forEach(x=>{
if(x.Id == Id){
Name = x.Name
}
})
return Name
},
//获取客户来源
getCustomFrom() {
CreateTypeList({}).then(res => {
......
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