Skip to content

S
SuperMan
Commit 6d52f331 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

op个人明细，领队导游往来账

parent e716f135
Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 47 deletions
src/components/FinancialModule/OPCommissionDetail.vue
View file @ 6d52f331
...@@ -41,9 +41,10 @@ export default { ...@@ -41,9 +41,10 @@ export default {
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
ParentId: 0, PeriodsId: 0,
OrderStr: "RB_Branch_Id asc", OrderStr: "RB_Branch_Id asc",
BName:-1 BName:-1,
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
...@@ -95,7 +96,6 @@ export default { ...@@ -95,7 +96,6 @@ export default {
} }
}, },
filterMethod(filters){ filterMethod(filters){
console.log("filter", filters);
let data = JSON.parse(JSON.stringify(this.dataListTwo)) let data = JSON.parse(JSON.stringify(this.dataListTwo))
let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo)) let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo))
if (filters.BName!='' && filters.BName!='__all__'){ if (filters.BName!='' && filters.BName!='__all__'){
...@@ -111,7 +111,6 @@ export default { ...@@ -111,7 +111,6 @@ export default {
data = dataListTwo data = dataListTwo
} }
this.dataList = data this.dataList = data
console.log(data)
}, },
customCompFunc(params) { customCompFunc(params) {
if (params.type === "see") { if (params.type === "see") {
...@@ -147,7 +146,6 @@ export default { ...@@ -147,7 +146,6 @@ export default {
item.value = x.BName; item.value = x.BName;
companyList.push(item); companyList.push(item);
}); });
console.log(companyList)
let company = { let company = {
field: "BName", field: "BName",
title: "公司", title: "公司",
...@@ -313,7 +311,6 @@ export default { ...@@ -313,7 +311,6 @@ export default {
this.isReady = true; this.isReady = true;
}, },
sortChange(param) { sortChange(param) {
// console.log("param",param)
// if(param.sumMoney==''){ // if(param.sumMoney==''){
if(param.BName!=''){ if(param.BName!=''){
this.msg.OrderStr='RB_Branch_Id '+param.BName this.msg.OrderStr='RB_Branch_Id '+param.BName
...@@ -348,7 +345,6 @@ export default { ...@@ -348,7 +345,6 @@ export default {
"sellcommission_GetOPCommissionDetailsList", "sellcommission_GetOPCommissionDetailsList",
this.msg, this.msg,
res => { res => {
// console.log("ressfasf",res);
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
...@@ -377,23 +373,22 @@ export default { ...@@ -377,23 +373,22 @@ export default {
}, },
//跳转 //跳转
getInfo(item) { getInfo(item) {
var dateStr = item.Periods; // var dateStr = item.Periods;
var year = dateStr.substring(0, 4); // var year = dateStr.substring(0, 4);
var month = dateStr.substring(4, 6); // var month = dateStr.substring(4, 6);
var nextMonthFirstDay = new Date(year, month, 1); // var nextMonthFirstDay = new Date(year, month, 1);
var oneDay = 1000 * 60 * 60 * 24; // var oneDay = 1000 * 60 * 60 * 24;
var entDay = new Date(nextMonthFirstDay - oneDay).Format("yyyy-MM-dd"); // var entDay = new Date(nextMonthFirstDay - oneDay).Format("yyyy-MM-dd");
var startDay = year + "-" + month + "-" + "01"; // var startDay = year + "-" + month + "-" + "01";
var userId = item.userId; // var userId = item.userId;
this.$router.push({ this.$router.push({
path: "enrollTotal", path: "OpComPersonDetails",
query: { query: {
EmployeeId: userId, EmployeeId: item.EmployeeId,
starTime: startDay, PeriodsId:this.msg.PeriodsId,
endTime: entDay,
blank:'y' blank:'y'
} }
}); });
...@@ -401,10 +396,10 @@ export default { ...@@ -401,10 +396,10 @@ export default {
}, },
mounted() { mounted() {
this.msg.pageSize = 10000; //不分页 this.msg.pageSize = 10000; //不分页
this.msg.ParentId = this.$route.query.ParentId; this.msg.PeriodsId = this.$route.query.PeriodsId?this.$route.query.PeriodsId:0;
let dt=new Date() let dt=new Date()
this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth()); this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth());
console.log(this.stringPerons)
this.getList(); this.getList();
this.getCompanyList(); this.getCompanyList();
}, },
......
src/components/FinancialModule/OPcommissionPeriods.vue
View file @ 6d52f331
...@@ -4,17 +4,31 @@ ...@@ -4,17 +4,31 @@
position: relative; position: relative;
top:1px; top:1px;
} }
.opUl li{
display: inline-block;
margin:10px 15px 10px 0;
}
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne">
<!-- <div class="query-box"> <div>
<ul> <ul class="opUl">
<li>
<em>选择月份</em>
<el-date-picker
v-model="Month"
value-format="yyyy-MM"
type="month"
placeholder="选择月">
</el-date-picker>
</li>
<li> <li>
<input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/> <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</el-button>
<!-- <input v-loading="btnLoading" type="button" class="normalBtn" @click="generateTable" value="生成提成"/> -->
</li> </li>
</ul> </ul>
</div> --> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>期数</th> <th>期数</th>
<th>提成总金额</th> <th>提成总金额</th>
...@@ -43,9 +57,11 @@ ...@@ -43,9 +57,11 @@
</template> </template>
<script> <script>
import moment from "moment"
export default { export default {
data() { data() {
return { return {
Month:moment().format("YYYY-MM"),
msg: { msg: {
PageIndex: 1, PageIndex: 1,
PageSize: 20 PageSize: 20
...@@ -55,6 +71,7 @@ ...@@ -55,6 +71,7 @@
dataList:[], dataList:[],
total:0, total:0,
currentPage: 1, currentPage: 1,
btnLoading:false,
} }
}, },
mounted() { mounted() {
...@@ -69,7 +86,7 @@ ...@@ -69,7 +86,7 @@
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
ParentId:id, PeriodsId:id,
blank: 'y', blank: 'y',
tab: '期数详情' tab: '期数详情'
} }
...@@ -85,7 +102,7 @@ ...@@ -85,7 +102,7 @@
this.loading = false; this.loading = false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
console.log(res); // console.log(res);
this.total = res.data.data.count; this.total = res.data.data.count;
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
...@@ -96,12 +113,16 @@ ...@@ -96,12 +113,16 @@
}, },
//生成提成报表 //生成提成报表
generateTable(){ generateTable(){
let msg = { if(!this.Month||this.Month==""){
UserId: 0 this.Error("请选择月份！")
return;
} }
this.btnLoading=true;
this.apipost( this.apipost(
"sellcommission_SetGenerateCommission",msg, "sellcommission_SetOPCommission",{Month:this.Month},
res => { res => {
this.btnLoading=false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.getList(); this.getList();
this.Success('报表生成成功') this.Success('报表生成成功')
......
src/components/FinancialModule/OpComPersonDetails.vue 0 → 100644
View file @ 6d52f331
<style scoped>
</style>
<template>
<div class="flexOne currentManage">
<div class="query-box">
<ul>
<li>
<span>
<em>员工</em>
<el-select filterable v-model='msg.EmployeeId' >
<el-option key="0" :value="0" label="不限"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>团队ID</em>
<el-input v-model="msg.TCID" placeholder="请输入内容"></el-input>
</span>
</li>
<li>
<span>
<em>团号</em>
<el-input v-model="msg.TCNUM" placeholder="请输入内容"></el-input>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button>
</li>
</ul>
</div>
<div class="cm_content _scrollbar">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>公司</th>
<th>部门</th>
<th>姓名</th>
<th>团号</th>
<th>提成金额</th>
<th>收客人数</th>
<th>期数</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index">
<td>{{item.BName}}</td>
<td>{{item.DepartmentName}}</td>
<td>{{item.CreateByStr}}</td>
<td>{{item.TCNUM}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.PeopleCount}}</td>
<td>{{item.Periods}}</td>
<td>
<el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<el-button type="primary" size='mini' circle icon="el-icon-view" @click="goUrl(item)"></el-button>
</el-tooltip>
</td>
<!-- <td>
<el-button-group size='mini'>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" @click="financeinfoRemove(item.ID,item.Name)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.szbweibi')" placement="top-start">
<el-button type="warning" class="iconfont" v-if="item.IsStandardCurrency!=1" @click="setStandardTips(item.ID,item.Name)">{{$t('Airticket.Air_ben')}}</el-button>
</el-tooltip>
</el-button-group>
</td> -->
</tr>
</table>
<div class="noData" v-if="DataList.length==0">
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
msg:{
pageIndex:1,
pageSize:14,
EmployeeId:0,
PeriodsId:"",
TCID:"",
TCNUM:"",
},
DataList:[],
loading:false,
currentPage:1,
total:0,
EmployeeList:[],
}
},created(){
this.msg.PeriodsId=this.$route.query.PeriodsId?this.$route.query.PeriodsId:this.msg.PeriodsId;
this.msg.EmployeeId=this.$route.query.EmployeeId?Number(this.$route.query.EmployeeId):this.msg.EmployeeId;
},
mounted(){
this.getEmployeeList();
this.getList();
},
methods: {
goUrl(item){
this.$router.push({
path: "productQuery",
query: {
id: item.TCID,
blank:'y'
}
});
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.currentPage = 1;
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getList();
},
getList(){
this.loading=true;
this.apipost('sellcommission_GetOPCommissionSingleDetailsList', this.msg, res => {
this.loading=false;
// console.log("res",res)
if(res.data.resultCode == 1) {
this.DataList = res.data.data.pageData;
this.total=res.data.data.count;
} else {
this.Error(res.data.message);
}
}, err => {})
},
getEmployeeList () {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
}
this.apipost(
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data
}
},
err => {
}
)
},
},
}
</script>
src/components/FinancialModule/accDetail/GuideAccount.vue
View file @ 6d52f331
...@@ -60,6 +60,18 @@ ...@@ -60,6 +60,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="领队导游"> <el-form-item label="领队导游">
<el-select filterable v-model='msg.ClientID' > <el-select filterable v-model='msg.ClientID' >
...@@ -113,18 +125,7 @@ ...@@ -113,18 +125,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<!-- <el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-row> </el-row>
</el-form> </el-form>
<ul> <ul>
...@@ -157,6 +158,12 @@ ...@@ -157,6 +158,12 @@
<td></td> <td></td>
<td>{{moneyFormat(dataJson.Balance)}}</td> <td>{{moneyFormat(dataJson.Balance)}}</td>
</tr> --> </tr> -->
<tr v-show="DataList.length>5">
<td :colspan="9">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td>{{ dataJson.Income }}</td>
<td>{{ dataJson.Refund }}</td>
<td>{{ dataJson.Balance}}</td>
</tr>
<tr v-for="(item,index) in DataList" :key="index"> <tr v-for="(item,index) in DataList" :key="index">
<!-- <td> <!-- <td>
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)"> <input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
......
src/components/index.vue
View file @ 6d52f331
...@@ -899,7 +899,7 @@ ...@@ -899,7 +899,7 @@
</div> </div>
<div style="text-align:center"> <div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p> <p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/10" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a> <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/11" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -930,7 +930,7 @@ export default { ...@@ -930,7 +930,7 @@ export default {
data() { data() {
return { return {
tsState:false, tsState:false,
tsNumber:2, tsNumber:3,
saleRnkShow: false, saleRnkShow: false,
dialogTitleNot: '', dialogTitleNot: '',
outerVisibleNot: false, outerVisibleNot: false,
......
src/router/config.js
View file @ 6d52f331
...@@ -3451,7 +3451,7 @@ export default { ...@@ -3451,7 +3451,7 @@ export default {
name: 'OPcommissionPeriods', name: 'OPcommissionPeriods',
component: resolve => require(['@/components/FinancialModule/OPcommissionPeriods'], resolve), component: resolve => require(['@/components/FinancialModule/OPcommissionPeriods'], resolve),
meta: { meta: {
title: 'op提成期数' title: 'op提成'
} }
}, },
{ {
...@@ -3459,7 +3459,15 @@ export default { ...@@ -3459,7 +3459,15 @@ export default {
name: 'OPCommissionDetail', name: 'OPCommissionDetail',
component: resolve => require(['@/components/FinancialModule/OPCommissionDetail'], resolve), component: resolve => require(['@/components/FinancialModule/OPCommissionDetail'], resolve),
meta: { meta: {
title: 'op提成期数详情' title: 'op提成详情'
}
},
{
path: '/OpComPersonDetails',
name: 'OpComPersonDetails',
component: resolve => require(['@/components/FinancialModule/OpComPersonDetails'], resolve),
meta: {
title: 'op提成明细'
} }
}, },
{ {
......
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