Commit d796b569 authored by 吴春's avatar 吴春

提交代码

parent 4c42ca5d
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<!-- <el-table-column prop="Id" label="ID" ></el-table-column> --> <!-- <el-table-column prop="Id" label="ID" ></el-table-column> -->
<el-table-column prop="BatchName" label="周期" ></el-table-column> <el-table-column prop="BatchName" label="周期" ></el-table-column>
<el-table-column prop="TotalMoney" label="累计金额" > </el-table-column> <el-table-column prop="TotalMoney" label="累计金额" > </el-table-column>
<el-table-column prop="CreateByName" label="创建人" > </el-table-column> <el-table-column prop="CreateByName" label="创建人" > </el-table-column>
<el-table-column prop="CreateDate" label="创建时间" > </el-table-column> <el-table-column prop="CreateDate" label="创建时间" > </el-table-column>
<el-table-column label="操作" > <el-table-column label="操作" >
...@@ -138,6 +139,7 @@ ...@@ -138,6 +139,7 @@
Month:'', Month:'',
CommissionType:2, CommissionType:2,
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
listData:{}, listData:{},
......
...@@ -84,8 +84,13 @@ ...@@ -84,8 +84,13 @@
<!-- <el-table-column prop="Id" label="ID" ></el-table-column> --> <!-- <el-table-column prop="Id" label="ID" ></el-table-column> -->
<el-table-column prop="BatchName" label="周期" ></el-table-column> <el-table-column prop="BatchName" label="周期" ></el-table-column>
<el-table-column prop="TotalMoney" label="累计金额" > </el-table-column> <el-table-column prop="TotalMoney" label="累计金额" > </el-table-column>
<el-table-column prop="TotalEmployee" label="个人直客累计金额" > </el-table-column>
<el-table-column prop="TotalCustomer" label="同业录入累计金额" > </el-table-column>
<el-table-column prop="TotalInternal" label="内部介绍累计金额" > </el-table-column>
<el-table-column prop="TotalTrans" label="学员转介绍累计金额" > </el-table-column>
<el-table-column prop="CreateByName" label="创建人" > </el-table-column> <el-table-column prop="CreateByName" label="创建人" > </el-table-column>
<el-table-column prop="CreateDate" label="创建时间" > </el-table-column> <el-table-column prop="CreateDate" label="创建时间" > </el-table-column>
<el-table-column prop="FinanceIds" 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">
...@@ -93,12 +98,19 @@ ...@@ -93,12 +98,19 @@
<i class="iconfont icon-sousuo" <i class="iconfont icon-sousuo"
@click="goUrl(scope.row.Id)"></i> @click="goUrl(scope.row.Id)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="生成财务单据" placement="top">
<i class="iconfont icon-sousuo"
@click="setCommissionFinanace(scope.row.Id)"></i>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="制单" placement="top" v-if='iscMaker==true'> <!-- <el-tooltip class="item" effect="dark" content="制单" placement="top" v-if='iscMaker==true'>
<i class="iconfont icon-add" v-if='iscMaker==true' <i class="iconfont icon-add" v-if='iscMaker==true'
@click="generalFinancacls(scope.row)"></i> @click="generalFinancacls(scope.row)"></i>
</el-tooltip> --> </el-tooltip> -->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -119,6 +131,7 @@ ...@@ -119,6 +131,7 @@
} from '../../../api/school/index' } from '../../../api/school/index'
import{ import{
SetCommissionPeriodsFinanace,
getCommissionPeriodsPageList, getCommissionPeriodsPageList,
setSellCommissionRule, setSellCommissionRule,
setUserReturnCommission, setUserReturnCommission,
...@@ -144,6 +157,14 @@ ...@@ -144,6 +157,14 @@
Month:'', Month:'',
CommissionType:1, CommissionType:1,
}, },
msgFinance: {
BatchId: 0,
SchoolId: '-1',
Status: '-2',
OrderSourceType: '-1',
OrderSourceId: 0,
Q_SelectNormal: '2'
},
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
listData:{}, listData:{},
...@@ -189,6 +210,19 @@ ...@@ -189,6 +210,19 @@
} }
}) })
}, },
setCommissionFinanace(id){
this.loading = true;
this.msgFinance.BatchId=id;
SetCommissionPeriodsFinanace(this.msgFinance).then(res => {
if (res.Code == 1) {
this.getList()
}
this.loading1= false;
}).catch(err=>{
this.loading1= false;
})
},
scCommission(){//生成提成 scCommission(){//生成提成
if(this.loading1 == false){ if(this.loading1 == false){
this.loading1= true; this.loading1= true;
...@@ -225,6 +259,16 @@ ...@@ -225,6 +259,16 @@
blank: 'y', blank: 'y',
} }
}) })
},
goUrl(id ) {
this.$router.push({
path: '/financial/returnPassbook/ReturnUserList',
query: {
"id": id,
"CommissionType": 1,
blank: 'y',
}
})
}, },
handleCurrentChanges(val){ handleCurrentChanges(val){
this.msg.PageIndex= val; this.msg.PageIndex= val;
......
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