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