Skip to content

S
SuperMan
Commit bce215bb authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 2cbe0f64 c54c9930
Show whitespace changes
Inline Side-by-side
Showing with 1688 additions and 308 deletions
src/assets/utils/AuthCode.js
View file @ bce215bb
......@@ -28,6 +28,7 @@ var AuthCode = {
IsSanKeTicket:"IsSanKeTicket",//是否有散客票权限
F_Disbursement_Schedule:'F_Disbursement_Schedule',//财务团队用款计划权限
F_Advance_Match:'F_Advance_Match',//预付款冲抵
S_Travel_AirLoss:'S_Travel_AirLoss' //设为损失
S_Travel_AirLoss:'S_Travel_AirLoss', //设为损失
S_CheckAllOrder:'s_CheckAllOrder' //查看所有订单
};
export default AuthCode;
\ No newline at end of file
src/components/FinancialModule/FinancialDocuments.vue
View file @ bce215bb
......@@ -485,12 +485,12 @@ input[type="number"] {
<div class="page_fnDm" @keyup.enter="resetPageIndex(),getPageList()">
<ul class="_nav clearfix">
<!-- <li :class="active==5?'_active':''" @click="active=5,msg.Conditon=5,getPageList()">全部</li> -->
<li :class="active==1?'_active':''" @click="active=1, msg.Conditon=1, BOSSBtn = false, getPageList()">{{$t('ios.wfqide')}}</li>
<li :class="active==1?'_active':''" @click="active=1, msg.Conditon=1, BOSSBtn = false, getPageList(0,1)">{{$t('ios.wfqide')}}</li>
<li :class="active==3?'_active':''" @click="active=3, msg.Conditon=3, getPageList()">{{$t('ios.dwspide')}}</li>
<li :class="active==2?'_active':''" @click="active=2, msg.Conditon=2, BOSSBtn = false, getPageList()" >{{$t('ios.wspide')}}</li>
<li :class="active==6?'_active':''" @click="active=6, msg.Conditon=6, BOSSBtn = false, getPageList()">{{$t('ios.wzfeide')}}</li>
<li :class="active==7?'_active':''" @click="active=7, msg.Conditon=7, BOSSBtn = false, getPageList()">{{$t('ios.bbhuide')}} <span v-if="rejectNum !=='' && rejectNum>=0" style="color:red">({{rejectNum}})</span></li>
<li :class="active==4?'_active':''" @click="active=4, msg.Conditon=4, BOSSBtn = false, getPageList()">{{$t('ios.csgwode')}}</li>
<li :class="active==2?'_active':''" @click="active=2, msg.Conditon=2, BOSSBtn = false, getPageList(0,1)" >{{$t('ios.wspide')}}</li>
<li :class="active==6?'_active':''" @click="active=6, msg.Conditon=6, BOSSBtn = false, getPageList(0,1)">{{$t('ios.wzfeide')}}</li>
<li :class="active==7?'_active':''" @click="active=7, msg.Conditon=7, BOSSBtn = false, getPageList(0,1)">{{$t('ios.bbhuide')}} <span v-if="rejectNum !=='' && rejectNum>=0" style="color:red">({{rejectNum}})</span></li>
<li :class="active==4?'_active':''" @click="active=4, msg.Conditon=4, BOSSBtn = false, getPageList(0,1)">{{$t('ios.csgwode')}}</li>
<li class="hight_query" style="float:right;">
<span>
......@@ -2102,7 +2102,7 @@ export default {
err => {}
);
},
getPageList(t) {
getPageList(t,active) {
// 获取列表数据
this.loading = true;
this.checkAllList = [];
......@@ -2119,6 +2119,11 @@ export default {
} else {
this.checkboxShow = false;
}
if(active){
this.total = 0
this.DataList = [];
this.msg.pageIndex = 1
}
if (!this.msg.ClientID) this.msg.ClientID = 0;
if (!this.msg.ClientType) this.msg.ClientType = 0;
if (!this.msg.CurrencyId) this.msg.CurrencyId = 0;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ bce215bb
......@@ -1791,6 +1791,16 @@
tab: "同业提成详情"
}
});
} else if (GetDetail.OtherType == 73) {//OP提成详情
this.$router.push({
name: 'OpComPersonDetails',
query: {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y",
tab: "同业提成明细"
}
});
} else {
this.$router.push({
name: 'CommissionDetail',
......
src/components/FinancialModule/OPExtraReward/CommissionRule.vue
View file @ bce215bb
......@@ -114,14 +114,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="团签奖励" prop="TravelVisaMoney">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.TravelVisaMoney" clearable></el-input>
<span class="Impression-ratio-right">/人</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8" v-if="form.SingleVisaWay">
<el-form-item :label="form.SingleVisaWay==1?'人头奖金':'提成比例'" prop="SingleVisaRate"
:rules="form.SingleVisaWay==1?rules.SingleVisaRate2:rules.SingleVisaRate">
......@@ -132,7 +124,15 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="签证奖励" prop="TravelVisaZLMoney">
<el-form-item label="团签奖励" prop="TravelVisaMoney">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.TravelVisaMoney" clearable></el-input>
<span class="Impression-ratio-right">/人</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="助理奖励" prop="TravelVisaZLMoney">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.TravelVisaZLMoney" clearable></el-input>
<span class="Impression-ratio-right">/人</span>
......@@ -424,7 +424,7 @@
SingleVisaRate: item.SingleVisaRate,
TravelVisaMoney: item.TravelVisaMoney,
TravelVisaZLMoney: item.TravelVisaZLMoney,
CountryId: item.CountryId>0?item.CountryId:null,
CountryId: item.CountryId>0||item.CountryId==0?item.CountryId:null,
ProfitList: item.ProfitList,
ExtraList: item.ExtraList,
}
......@@ -452,7 +452,7 @@
// 点击确定
RulesOk(formName) {
this.form.LineIds = this.form.LineIdList.join(',')
this.form.CountryId = this.form.CountryId?this.form.CountryId:-1
// this.form.CountryId = this.form.CountryId||this.form.CountryId==0?this.form.CountryId:-1
this.$refs[formName].validate((valid) => {
if (valid) {
this.ruleLoading = true
......@@ -538,8 +538,8 @@
},
// 线路
getLineList() {
this.apipost("line_post_GetAllList_V2", {
LineDirection: 0
this.apipost("line_post_GetAllList_V3", {
IsShow: -1
}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
......
src/components/FinancialModule/OPRules.vue
View file @ bce215bb
......@@ -116,14 +116,15 @@
<el-form-item label="描述">
<el-input class="w220" v-model="form.Description"></el-input>
</el-form-item>
<el-form-item label="线控" prop="XKEmployeeIdList">
<!-- XKEmployeeIdList -->
<el-form-item label="线控" prop="">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.XKEmployeeIdList">
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="助理" prop="ZLEmployeeIdList">
<!-- ZLEmployeeIdList -->
<el-form-item label="助理" prop="">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.ZLEmployeeIdList">
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
......
src/components/FinancialModule/OpCommission/OPCommissionDetail.vue 0 → 100644
View file @ bce215bb
<style scoped>
.CM_look {
padding: 4px !important;
position: relative;
top: 1px;
}
.opUl li {
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommissionUser .opUl li input{
height: 34px !important;
}
.domesticCommissionUser .singeRowTable{
/* position: absolute; */
}
.domesticCommissionUser .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommissionUser .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
.text-fixed{
/* height: 100%;
position: absolute;
left: 0;
top: 0; */
}
.cursor-p{
cursor: pointer;
}
.cursor-p:hover{
color: #409EFF;
}
.ITUDWageMoney-box{
margin-top: 20px;
margin-bottom: 10px;
}
.ITUDschedule-Box-box{
display: flex;
flex-direction: row;
justify-content: space-between;
}
.ITUDschedule-box{
flex: 1;
display: flex;
flex-direction: column;
}
.ITUD-title{
margin-top: 10px;
margin-bottom: 10px;
}
.progress-box{
flex: 1;
display: flex;
flex-direction: row;
}
.relative-position{
flex: 1;
margin-right: 0;
position: relative;
}
/deep/.relative-position .el-progress-bar__outer{
border-radius: 0 !important;
}
/deep/.relative-position .el-progress-bar__inner{
border-radius: 0 !important;
}
.ITUD-text-box{
position: relative;
}
.ITUD-text{
position: absolute;
z-index: 999;
color: red;
}
.rate-box {
position: absolute;
top: 30px;
left: 50%;
transform: translateX(-50%);
color: #000;
z-index: 9;
display: flex;
flex-wrap: wrap;
justify-content: center;
}
.sanjiao {
width: 0;
height: 0;
margin-left: 5%;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
border-bottom: 3px solid #CACACA;
}
.rate {
min-width: 20px;
padding: 2px 6px;
background-color: #CACACA !important;
display: flex;
justify-content: center;
align-items: center;
color: #666666;
font-size: 0.62vw;
font-family: PingFang SC;
border-radius: 7px;
line-height:12px;
white-space:nowrap;
}
.active-rate{
background-color: #FF7262 !important;
color: #FFFFFF !important;
}
.clickCp{
cursor: pointer;
color: #2961fe;
}
</style>
<template>
<div class="flexOne domesticCommissionUser">
<div class="productQuerySearch">
<ul class="opUl">
<li>
<em>出团公司</em>
<el-select filterable size="mini" v-model='msg.OutBranchId'
@change='handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>期数</em>
<el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)" filterable>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in PeroidsList" :key="item.index" :label="item.Periods"
:value="item.ID"></el-option>
</el-select>
</li>
<li>
<em>所属公司</em>
<el-select filterable size="mini" v-model='msg.RB_Branch_Id'
@change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>部门</em>
<el-select filterable size="mini" v-model='msg.RB_Department_Id'
@change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</li>
<li>
<em>人员</em>
<el-select v-model="msg.EmployeeId" size="mini"
@change="handleCurrentChange(1)" :disabled="disabled" filterable>
<el-option label="不限" :value="-1"></el-option>
<el-option label="微途" :value="-2"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
:value="item.empId"></el-option>
</el-select>
</li>
<li style="position: fixed;right: 0;top: 51px;">
<input type="button" class="normalBtn" value="导出" @click="exportExcel">
</li>
</ul>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>公司</th>
<th>部门</th>
<th>员工姓名</th>
<th>人数</th>
<th>额外奖励</th>
<th>总提成</th>
<th>出团公司提成</th>
<th>期数</th>
<th>描述</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.BranchName}}</td>
<td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td>
<td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
<td>{{item.PeopleMoney?item.PeopleMoney:'-'}}</td>
<td>{{item.TotalCMoney?item.TotalCMoney:'-'}}</td>
<td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
<td>{{item.Periods}}</td>
<td>{{item.Description}}</td>
<td>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('OpComPersonDetails',item)"
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="11">暂无数据</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
components:{
},
data() {
return {
objNew:{},
outerVisible:false,//提成比例弹窗
Month: moment().format("YYYY-MM"),
msg: {
pageIndex: 1,
pageSize: 20,
PeriodId: -1,
EmployeeId: -1,
RB_Department_Id: -1,//部门ID
RB_Branch_Id: -1,//公司ID
OutBranchId: -1,//出团公司ID
},
loading: false,
//数据源
dataList: [],
total: 0,
disabled: true,
PeroidsList:[],
searchList: [],
departMentList:[],
titleList:[
{name:'不限',id:'-1'},
{name:'引流',id:'2'},
{name:'销售',id:'1'}
],
departmentList:[],
companyList: [],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
departmentMsg: {
RB_Group_Id: '0',
RB_Branch_Id:'0',
Status:'0',
ParentId:'-1',
Tier:'0',
},
disabled:true
}
},
created(){
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
this.GetCommissionPeroidsList()//期数
this.getEmployee()//人员
this.getDepartment()
this.getCompany()
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.OutBranchId = this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
this.disabled = false;
this.msg.OutBranchId = -1
this.msg.RB_Branch_Id = -1
// this.msg.RB_Department_Id = -1
this.msg.EmployeeId = -1
}else{
this.disabled = true;
}
},
methods: {
getDepartment() {
this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if(res.data.resultCode == 1) {
this.departmentList = res.data.data;
}
}, err => {})
},
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
},
GetCommissionPeroidsList() { //期数下拉
this.apipost(
"opcommission_GetNewOPCommissionPeroidsList",{},res => {
if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){
this.msg.PeriodId = this.PeroidsList[0].Id
}
this.getList()
} else {
this.Error(res.data.message);
}
}
);
},
getEmployee() {//所有人员下拉
let employeeMsg = {
RB_Group_id: "0",
RB_Branch_id: "-1",
departmentId: this.msg.RB_Department_Id>1?this.msg.RB_Department_Id:"0",
IsLeave: "-1"
}
this.apipost(
"app_get_company_employee",
employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
}
},
err => { }
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
goUrl(path, item) {
this.$router.push({
path: path,
query: {
PeriodId: this.$route.query.PeriodId,
OutBranchId: item.RB_Branch_Id,
UserId: item.EmployeeId,
blank: 'y',
tab: '同业提现详情'
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"opcommission_GetNewOPCommissionEmpPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
exportExcel() { //导出
let msg = JSON.parse(JSON.stringify(this.msg))
let userInfo = this.getLocalStorage();
msg.EmployeeIdUser = userInfo.EmployeeId
var fileName = "OP提成分组表.xls";
this.GetLocalFile("opcommission_GetNewOPCommissionEmpListToExcel", this.msg, fileName);
}
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/OpCommission/OPcommissionPeriods.vue 0 → 100644
View file @ bce215bb
<style scoped>
.CM_look {
padding: 4px !important;
position: relative;
top: 1px;
}
.opUl li {
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommission .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommission .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
/deep/.el-checkbox__input.is-checked .el-checkbox__inner{
background-color: #E95252!important;
border-color:#E95252!important;
}
/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner{
background-color: #E95252!important;
border-color:#E95252!important;
}
</style>
<template>
<div class="flexOne domesticCommission">
<div>
<ul class="opUl">
<li>
<em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId'
@change='handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>选择月份</em>
<el-date-picker v-model="Month" value-format="yyyy-MM" type="month" placeholder="选择月">
</el-date-picker>
</li>
<li v-show="btnShow">
<el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading"
@click="generateTable">生成提成</el-button>
</li>
</ul>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>期数</th>
<th>总追加工资</th>
<th>总提成</th>
<th>公司提成</th>
<th>财务单据</th>
<th>操作信息</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Periods}}</td>
<td>
<p> {{item.SumWage>0?'+' + item.SumWage:item.SumWage}}</p>
</td>
<td>{{item.SumPrice}}</td>
<td>{{item.BranchCommission}}</td>
<td>
<template v-if="item.FinanceIdList.length>0">
<span v-for="(x,y) in item.FinanceIdList">
<span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
{{x}}
</span>
{{item.FinanceIdList.length == y+1 ?'':'、'}}
</span>
</template>
</td>
<td>
<div>{{item.CreateByStr}}</div>
<div>{{item.CreateStr}}</div>
</td>
<td>
<el-tooltip class="item" effect="dark" content="查看明细" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.Id)"
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
<el-tooltip v-if="cMaker==true" class="item" effect="dark" content="提成制单" placement="top">
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="当期利润" placement="top">
<el-button @click="goUrl('ImpressionCurrentProfit',item.Id,1)" type="danger" class="CM_look"
icon="iconfont icon-money" circle></el-button>
</el-tooltip> -->
</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="7">暂无数据</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
data() {
return {
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
companyList: [],
Month: moment().subtract(1, 'months').format("YYYY-MM"),
msg: {
pageIndex: 1,
pageSize: 20,
OutBranchId: -1
},
loading: false,
//数据源
dataList: [],
total: 0,
btnShow: false,
btnLoading: false,
cMaker: false,//是否可以制单
disabled: true
}
},
mounted() {
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.OutBranchId = userInfo.RB_Branch_id
if (ActionMenuCode.indexOf('F_DCommissionSend') != -1) {
this.btnShow = true;
}
if (ActionMenuCode.indexOf('home_DCommissionZD') != -1) {
this.cMaker = true;
}
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
this.disabled = false;
}else{
this.disabled = true;
}
this.getCompany()
this.getList()
},
methods: {
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
goUrl(path, id) {
let title = ''
title = '提成明细'
this.$router.push({
path: path,
query: {
PeriodId: id,
blank: 'y',
tab: title
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
'opcommission_GetNewOPCommissionPageList', this.msg,
res => {
if (res.data.resultCode == 1) {
this.loading = false;
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.loading = false;
this.Error(res.data.message)
}
},
err => {}
)
},
//生成提成报表
generateTable() {
if (!this.Month || this.Month == "") {
this.Error("请选择月份！")
return;
}
this.btnLoading = true;
this.apipost(
"opcommission_SetNewOPCommission", { Month: this.Month },
res => {
this.btnLoading = false;
if (res.data.resultCode == 1) {
this.handleCurrentChange(1);
this.Success('报表生成成功')
} else {
this.$confirm(res.data.message, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {})
.catch(() => {});
}
}
);
},
// 点击制单
YijianZD(item) {
let Money
if(this.msg.OutBranchId>-1){
if(item.BranchCommission>0){
Money=item.BranchCommission
}else{
this.Error("公司提成为0,不能制单!")
return;
}
}else{
Money=item.SumPrice
}
let obj = {
CostType: 16,
Money: Money,
CurrencyId: 1,
XSTC: 1,
OtherType:73,
ReFinanceId:item.ID,
isRB_Branch_Id: true
}
let query = {
blank: "y",
tab: "新增付款单据",
Type: 2,
IsUploadPic: 1,
orderObj: JSON.stringify(obj)
}
if(this.msg.OutBranchId>-1){
query.id = 30
query.Name = "分公司OP提成单"
}else{
query.id = 28
query.Name = "总部OP提成单"
}
this.$router.push({
path: "/addFinancialDocuments",
query
});
},
gofinancialdetail(item) {
let arr = item.split('-')
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: arr[0],
blank: 'y',
tab: '单据详情'
}
})
}
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/OpCommission/OpComPersonDetails.vue 0 → 100644
View file @ bce215bb
<style>
.CM_look {
padding: 4px !important;
position: relative;
top: 1px;
}
.opUl li {
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommissiondetails .opUl li input {
height: 34px !important;
}
.domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
.cursor-p{
cursor: pointer;
}
.cursor-p:hover{
color: #409EFF;
}
</style>
<template>
<div class="flexOne domesticCommissiondetails">
<div style="min-height: 70px;">
<ul class="opUl">
<li>
<em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId'
@change='handleCurrentChange(1)'>
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>期数</em>
<el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)" filterable>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in PeroidsList" :key="item.index" :label="item.Periods"
:value="item.ID"></el-option>
</el-select>
</li>
<li>
<em>所属公司</em>
<el-select filterable v-model='msg.RB_Branch_Id'
@change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>部门</em>
<el-select filterable v-model='msg.RB_Department_Id'
@change='getEmployee();handleCurrentChange(1)'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</li>
<li>
<em>人员</em>
<el-select v-model="msg.EmployeeId" size="mini"
@change="handleCurrentChange(1)" :disabled="disabled" filterable>
<el-option label="不限" :value="-1"></el-option>
<el-option label="微途" :value="-2"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
:value="item.empId"></el-option>
</el-select>
</li>
<li>
<em>团/订单ID</em>
<el-input maxlength="50" v-model="msg.TCID" class="permiss-input w200"
@change="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
</li>
<li>
<em>团号</em>
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
@change="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
</li>
<li>
<em>订单类型</em>
<el-select v-model="msg.OrderType" class="w200 HworkInput"
@change="handleCurrentChange(1)">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</li>
<li>
<em>提成方式</em>
<el-select v-model="msg.Way" class="w200 HworkInput"
@change="handleCurrentChange(1)">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in WayTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</li>
<li style="position: fixed;right: 3px;top: 51px;"><input type="button" class="normalBtn" value="导出" @click="exportExcel"></li>
</ul>
</div>
<!-- 统计版块 -->
<div class="groupTourOrder_count">
<el-row :gutter="20">
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<div class="groupTourOrder_count_item HT_total">
<div style="display: flex;justify-content: space-between;">
<span>统计</span>
<!-- <span style="color: red;">注：门票不计入人头奖励</span> -->
</div>
<p style="margin-top: 10px;">
<span>总人数：
{{dataObj.TotalNum}}
</span>
<span style="margin-left: 20px;">总提成：
{{dataObj.TotalMoney}}
</span>
</p>
</div>
</el-col>
</el-row>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;">
<tr>
<th style="width: 100px;">出团公司</th>
<th style="width: 80px;">类型</th>
<th style="width: 150px;">团号</th>
<th style="width: 100px;">所属公司</th>
<th style="width: 100px;">部门</th>
<th style="width: 100px;">姓名</th>
<th style="width: 100px;">线路</th>
<th style="width: 100px;">人数</th>
<th style="width: 100px;">利润</th>
<th style="width: 100px;">提成方式</th>
<th style="width: 120px;">提成比例/奖励</th>
<th style="width: 100px;">提成金额</th>
<th style="width: 100px;">期数</th>
<th width='200'>备注</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
<td>{{item.OrderTypeName}}</td>
<td><span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" v-if="item.TCNUM" @click="!disabled?goTuanDetails(item):''">{{item.TCNUM}}({{item.TCID}})</span></td>
<td>{{item.BranchName?item.BranchName:'-'}}</td>
<td>{{item.DeptName?item.DeptName:'-'}}</td>
<td>{{item.UserName}}</td>
<td>{{item.LineName}}</td>
<td style="width: 100px;">{{item.PeopleCount?item.PeopleCount:'-'}}</td>
<td>{{item.TCProfit?item.TCProfit:'-'}}</td>
<td>{{item.Way==1?'人头奖励':'利润比例'}}</td>
<td>{{item.Rate&&item.Way==2?item.Rate+'%':item.Rate&&item.Way==1?item.Rate+'':'-'}}</td>
<td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
<td>{{item.PeriodsReissue}}</td>
<td>{{item.Description?item.Description:'-'}}</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="18">暂无数据</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
components:{
},
data() {
return {
dataObj:{},
Month: moment().format("YYYY-MM"),
msg: {
pageIndex: 1,
pageSize: 20,
EmployeeId: -1,
PeriodId: -1,
OrderId:'',
OrderType: -1,
Way: -1,
TCNUM: '',
RB_Department_Id: -1,//部门ID
RB_Branch_Id: -1,//公司ID
OutBranchId: -1,//出团公司ID
},
loading: false,
//数据源
dataList: [],
total: 0,
btnShow: false,
PeroidsList:[],
searchList: [],
TotalMoney: 0,
TotalNum: 0,
disabled: true,
WayTypeList:[
{name:'不限',Id:'-1'},
{name:'人头奖励',Id:'1'},
{name:'利润比例',Id:'2'}
],
titleList:[
{name:'不限',id:'-1'},
{name:'引流',id:'2'},
{name:'销售',id:'1'}
],
OrderTypeList:[],
departmentList:[],
companyList: [],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
departmentMsg: {
RB_Group_Id: '0',
RB_Branch_Id:'0',
Status:'0',
ParentId:'-1',
Tier:'0',
},
S_CheckBranchOrder:false,
S_CheckAllOrder:false,
disabled:true
}
},
created(){
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
this.GetCommissionPeroidsList()//期数
this.getEmployee() //人员
this.getDepartment()
this.getCompany()
this.GetOrderTypeEnumList()
this.GetCommissionPeroidsList()//期数
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
// 判断是否销售
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) {
this.S_CheckBranchOrder = true
}
if (ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
this.S_CheckAllOrder = true
}
if (this.$route.query) { //不大于0的话用默认值
if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) {
}
}
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:''
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
this.disabled = false;
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):-1
// this.msg.RB_Department_Id = -1
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{
this.disabled = true;
}
},
methods: {
GetOrderTypeEnumList() {
this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderTypeList = res.data.data;
} else {
this.$message.error(res.data.message);
}
});
},
getDepartment() {
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if(res.data.resultCode == 1) {
this.departmentList = res.data.data;
}
}, err => {})
},
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
},
goTuanDetails(row) {
let name = ''
if (row.IsOneDayOrder == 1) {
name = 'groupTourOrderByTuanOne'
} else {
name = 'groupTourOrderByTuan'
}
this.$router.push({
name: name,
query: {
id: row.TCID,
tcmun: row.TCNUM,
blank: "y",
}
});
},
clickUrl(row,type){
let data = [{
path: "",
OrderId: row.OrderId,
Type: '',
PeriodId: this.msg.PeriodId
}]
let href
let url = this.domainManager().crmRoutingUrl;
if (row.OrderType == 1) {
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
data[0].path = 'myCustomerOrderAllType'
} else {
data[0].path = 'customerOrderAllType'
}
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
} else {
let name = ''
if (row.OrderType == 6) {
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
name = 'VisaProductEditOrder'
} else {
name = 'VisaProductEditOrderOP'
}
this.$router.push({
name: name,
});
} else if (row.OrderType == 2) { //跟团 一日游
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
if (row.TravelType == 1) {
name = 'groupTourOrder'
} else {
name = 'groupTourOrderOne'
}
} else {
name = 'enrollTotal'
}
} else if (row.OrderType == 3) { //酒店
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
name = 'singleProductHotelOrder'
} else {
name = 'singleProductHotelOrderOP'
}
} else if (row.OrderType == 4) { //门票
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
name = 'SingleticketOrderList'
} else {
name = 'SingleticketOrderListOP'
}
} else if (row.OrderType == 5) { //包车
if(row.CarType==''||row.CarType==null){
this.GetAdminCarOrderPageList(row,url,href,data)
}else{
if(!this.S_CheckBranchOrder && !this.S_CheckAllOrder){
name = 'CharterOrderList'
}else{
name= 'CharterOrderListOP'
}
data[0].Type = row.CarType==null||!row.CarType?4:row.CarType
}
} else if (row.OrderType == 7) { //jalan酒店
this.$message.info('jalan酒店暂不支持查看')
// if(!this.S_CheckBranchOrder && !this.S_CheckAllOrder){
// name = 'CharterOrderList'
// }else{
// name = 'CharterOrderListOP'
// }
}
if (name) {
this.$router.push({
name: name,
query: {
OrderId: row.OrderId,
PeriodId: this.msg.PeriodId,
blank: "y",
}
});
}
}
},
GetAdminCarOrderPageList(row, url, href, data) {
let msg = {
pageIndex: 1,
pageSize: 5,
OrderType: '',
OrderId: row.OrderId,
OrderNo: '',
SurName: '',
Name: '',
OrderStatus: 0,
StartTime: '',
EndTime: '',
OrderSTime: '',
OrderETime: '',
ProductName: '',
Mobile: '', //电话
IsSelectSale: 1,
EnterID: 0, //业务员
}
let name
this.apipost('CarSingle_post_GetAdminCarOrderPageList', msg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData
let OrderType
if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType
}
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
name = 'CharterOrderList'
} else {
name = 'CharterOrderListOP'
}
this.$router.push({
name: name,
query: {
OrderId: row.OrderId,
OrderType: OrderType ? OrderType : 4,
blank: "y",
}
});
}
})
},
// 订单统计
OrderStatistics(item){
let data = [
{
path: "customerOrder",
OrderId: item.OrderId
},
];
let href = this.domainManager().crmRoutingUrl +
"automaticLogin?token=" +
this.getLocalStorage().token +
"&data=" +
JSON.stringify(data);
window.open(href);
},
GetCommissionPeroidsList() { //期数下拉
this.apipost(
"opcommission_GetNewOPCommissionPeroidsList",{},res => {
if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){
this.msg.PeriodId = this.PeroidsList[0].Id
}
this.getList()
} else {
this.Error(res.data.message);
}
}
);
},
getEmployee() { //所有人员下拉
let employeeMsg = {
RB_Group_id: "0",
RB_Branch_id: "-1",
departmentId: "0",
IsLeave: "-1"
}
this.apipost(
"app_get_company_employee",
employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
}
},
err => {}
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
goUrl(path, id) {
this.$router.push({
path: path,
query: {
PeriodId: id,
blank: 'y',
tab: '期数详情'
}
});
},
//获取数据
getList() {
let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderId == '') {
msg.OrderId = 0
}
this.loading = true;
this.apipost(
"opcommission_GetNewOPCommissionDetailsPageList",
msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataObj = res.data.data
this.dataList = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count;
} else {
this.Error(res.data.message);
}
}
);
},
exportExcel() { //导出
let msg = JSON.parse(JSON.stringify(this.msg))
let userInfo = this.getLocalStorage();
msg.EmployeeIdUser = userInfo.EmployeeId
var fileName = "OP提成明细表.xls";
this.GetLocalFile("opcommission_GetNewOPCommissionDetailsListToExcel", msg, fileName);
}
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ bce215bb
......@@ -151,7 +151,7 @@
<th style="width: 100px;">线路</th>
<th style="width: 100px;">是否欧洲</th>
<th style="width: 100px;">订单人数</th>
<th style="width: 100px;">订单利润</th>
<th style="width: 100px;">团队总人数</th>
<th style="width: 100px;">团队利润</th>
<th style="width: 100px;">提成方式</th>
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ bce215bb
......@@ -1049,6 +1049,7 @@ export default {
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
},
AddFinancial(z){ //保存
// 手配费参数
if(this.is_HandFee){
if(!this.HandFee.BranchId){
......@@ -1225,6 +1226,7 @@ export default {
this.msg.ReTCID=this.czmsg.ReTCID;
}
// console.log(this.orderObj.OtherType,this.commissionObj,this.tradeObj,this.crmOrderObj,this.msg,'---')
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
//清除旅客名单数据
......@@ -1984,7 +1986,6 @@ export default {
this.tradeObj = JSON.parse(this.$route.query.tradeObj);
} else{
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
}
this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
......
src/components/SalesModule/Common/productOrderList.vue
View file @ bce215bb
......@@ -548,9 +548,9 @@
<div class="noData" v-else>
{{ $t("system.content_noData") }}
</div>
<el-dialog title="提示" :visible.sync="showDialog" width="70%" height="40%">
<el-dialog title="编辑" :visible.sync="showDialog" width="600px" height="40%">
<div v-if="!isVisa">
<span style="width: 10%; display: inline-block">团OP</span>
<span style="width: 15%; display: inline-block">团OP</span>
<el-select
style="width: 80%"
v-model="queryData.OPId"
......@@ -567,7 +567,7 @@
</el-select>
</div>
<div v-if="!isVisa" style="margin-top: 10px">
<span style="width: 10%; display: inline-block">助手</span>
<span style="width: 15%; display: inline-block">助手</span>
<el-select
style="width: 80%"
v-model="queryData.AssistantId"
......@@ -585,7 +585,7 @@
</el-select>
</div>
<div style="margin-top: 10px">
<span style="width: 10%; display: inline-block">签证OP</span>
<span style="width: 15%; display: inline-block">签证OP</span>
<el-select
style="width: 80%"
v-model="queryData.VisaOPId"
......@@ -601,7 +601,7 @@
</el-select>
</div>
<div style="margin-top: 10px">
<span style="width: 10%; display: inline-block">签证助手</span>
<span style="width: 15%; display: inline-block">签证助手</span>
<el-select
style="width: 80%"
v-model="queryData.VisaAssistantId"
......@@ -619,7 +619,7 @@
</el-select>
</div>
<div style="margin-top: 10px" v-if="editNum">
<span style="width: 10%; display: inline-block">签证人数</span
<span style="width: 15%; display: inline-block">签证人数</span
><el-input
type="number"
style="width: 80%; margin-left: 4px"
......@@ -628,7 +628,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="showDialog = false">取 消</el-button>
<el-button type="primary" @click="submitOP">确 定</el-button>
<el-button style="margin-right: 24px" type="primary" @click="submitOP">确 定</el-button>
</span>
</el-dialog>
</div>
......
src/components/rank/entryForm.vue
View file @ bce215bb
......@@ -71,45 +71,53 @@
<li>
<span>
<em>公司</em>
<el-select filterable v-model="msg.EnterId" class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
<el-select
filterable
v-model="queryMsg.RB_Branch_Id"
@change="getDepartment"
>
</el-option>
<el-option
:value="-1"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>部门</em>
<el-select filterable v-model="msg.EnterId" class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
<el-select
filterable
v-model="queryMsg.RB_Department_Id"
@change="getEmployee"
>
</el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in DepartmentList"
:label="item.DepartmentName"
:value="item.DepartmentID"
:key="item.DepartmentID"
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>人员</em>
<el-select filterable v-model="msg.EnterId" class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-select filterable v-model="queryMsg.EnterID" class>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
>
</el-option>
></el-option>
</el-select>
</span>
</li>
......@@ -117,32 +125,27 @@
<span>
<em>出团日期</em>
<el-date-picker
style="height: 34px"
value-format="yyyy-MM-dd"
v-model="DatelistBM"
v-model="queryMsg.tStartDates"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
@change="getDatesBM"
>
</el-date-picker>
range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')"
:end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
></el-date-picker>
</span>
</li>
<li>
<span>
<em>报名日期</em>
<el-date-picker
style="height: 34px"
value-format="yyyy-MM-dd"
v-model="DatelistBM"
v-model="queryMsg.qStartDates"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
@change="getDatesBM"
>
</el-date-picker>
range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')"
:end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"
></el-date-picker>
</span>
</li>
<li>
......@@ -159,61 +162,36 @@
<div class="groupTourOrder_count">
<el-row :gutter="20">
<template v-for="(item, index) in SummaryList">
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8">
<el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
<div class="groupTourOrder_count_item HT_total">
<div>
<span>{{ item.CurrencyName }}</span>
</div>
<p>
<!-- groupTourOrder_count_green -->
<span
>应收：
{{ item.Money.toFixed(2) }}
>销售额：
{{ (item.SumPreferPrice|| 0).toFixed(2) }}
</span>
<span
>实收：
{{ item.Income.toFixed(2) }}
>收款金额：
{{ (item.Income|| 0).toFixed(2) }}
</span>
<span
>退款：
{{ item.Refund.toFixed(2) }}
</span>
<span
<!-- <span
>手续费：
{{ item.PlatformTax.toFixed(2) }}
</span>
<span
>应收小费：
{{ item.PreferTipAmount.toFixed(2) }}
</span>
</span> -->
<span
>实收小费：
{{ item.IncomeTipAmount.toFixed(2) }}
>未收金额：
{{ (item.notInCome|| 0).toFixed(2) }}
</span>
<span
>成本：
{{ item.CostMoney.toFixed(2) }}
</span>
<span
>待收：
<span :style="{ color: item.DueInMoney > 0 ? 'red' : '' }">{{
item.DueInMoney.toFixed(2)
}}</span>
</span>
<span
>预期利润：
<span :style="{ color: item.OrderProfit > 0 ? 'red' : '' }">{{
item.OrderProfit.toFixed(2)
}}</span>
</span>
<span
>预期销售额：
{{ item.OrderSalesMoney.toFixed(2) }}
</span>
<span
>报名数：
<span style="color: #3a7cf7">{{ item.GuestNum }}人</span>
>正常收客数：
{{ item.TotalGuestNum }}
</span>
<!-- <span
>单项收客数：
{{ item.ZaiTuMoney }}
</span> -->
</p>
</div>
</el-col>
......@@ -252,6 +230,13 @@ export default {
components: { OrderList },
data() {
return {
pickerOptions: {
disabledDate(time) {
return time < new Date("2023-01-01");
},
},
CompanyList: [],
DepartmentList: [],
showWarningSearch: false,
TotalMsg: null,
MultipleChoiceList: [
......@@ -286,6 +271,35 @@ export default {
OrderList: [],
//默认高度
tableHeight: 0,
queryMsg: {
RB_Branch_Id: -1,
RB_Department_Id: 0,
EnterID: 0,
tStartDates: [],
qStartDates: [],
QueryType: 0,
},
getCompanyMsg: {
// 公司
RB_Group_Id: "0",
Status: "0",
},
getDepartmentMsg: {
// 部门
RB_Group_Id: "",
RB_Branch_Id: "",
Status: 0,
ParentId: -1,
Tier: 0,
},
employeeMsg: {
// 员工
GroupId: "",
BranchId: -1,
DepartmentId: 0,
PostId: 0,
IsLeave: 0,
},
msg: {
pageIndex: 1,
pageSize: 15,
......@@ -335,23 +349,6 @@ export default {
PostId: 0,
IsLeave: 0,
},
OrderStatusList: [
{ Name: "不限", Id: "0" },
{ Name: "正常", Id: "1" },
{ Name: "取消", Id: "2" },
],
QIsCollectList: [
{ Name: "不限", Id: "0" },
{ Name: "已收齐", Id: "1" },
{ Name: "未收齐", Id: "2" },
],
ticketingStatusList: [],
VisaList: [
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
],
LineList: [],
SummaryList: [],
};
},
......@@ -369,56 +366,49 @@ export default {
},
},
methods: {
GetOrderTypeEnumList() {
this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderTypeList = res.data.data;
let data = {
Name: "不限",
Id: "0",
};
this.OrderTypeList.unshift(data);
} else {
this.$message.error(res.data.message);
}
});
},
getLineList() {
getCompanyList() {
//获取公司列表
this.apipost(
"line_post_GetAllList",
{
LineDirection: 0,
},
"admin_get_BranchGetList",
this.getCompanyMsg,
(res) => {
console.log("getCompanyList", res);
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
this.CompanyList = res.data.data;
} else {
this.$message.error(res.data.message);
}
}
},
(err) => {}
);
},
// 获取出票状态枚举
GetTicketStatusEnumList() {
this.crmapipost("/api/Order/GetTicketStatusEnumList", {}, (res) => {
getDepartment(bool) {
//部门
if (bool) {
this.queryMsg.RB_Department_Id = 0;
this.queryMsg.EnterID = 0;
this.DepartmentList = [];
this.EmployeeList = [];
}
this.getDepartmentMsg.RB_Branch_Id = this.queryMsg.RB_Branch_Id;
if (this.queryMsg.RB_Branch_Id != -1) {
this.apipost(
"admin_get_DepartmentGetList",
this.getDepartmentMsg,
(res) => {
if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data;
} else {
this.$message.error(res.data.message);
this.DepartmentList = res.data.data;
}
});
},
// 获取订单状态枚举
GetOrderStatusEnumList() {
this.crmapipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderStatusList = res.data.data;
} else {
this.$message.error(res.data.message);
(err) => {}
);
}
});
},
getEmployee() {
getEmployee(bool) {
if (bool) {
this.queryMsg.EnterID = 0;
this.EmployeeList = [];
}
this.employeeMsg.DepartmentId = this.queryMsg.RB_Department_Id;
//员工
this.apipost(
"admin_get_EmployeeGetList",
......@@ -431,6 +421,20 @@ export default {
(err) => {}
);
},
GetOrderTypeEnumList() {
this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderTypeList = res.data.data;
let data = {
Name: "不限",
Id: "0",
};
this.OrderTypeList.unshift(data);
} else {
this.$message.error(res.data.message);
}
});
},
getDatesBM() {
if (this.DatelistBM) {
this.msg.StartTime = this.DatelistBM[0];
......@@ -492,19 +496,49 @@ export default {
let nowDate = myYear + "-" + myMonth + "-" + myToday;
return nowDate;
},
getParams() {
let param = {
pageIndex: this.msg.pageIndex,
pageSize: 15,
RB_Branch_Id:
this.queryMsg.RB_Branch_Id == -1 ? null : this.queryMsg.RB_Branch_Id,
RB_Department_Id:
this.queryMsg.RB_Department_Id == 0
? null
: this.queryMsg.RB_Department_Id,
EnterID: this.queryMsg.EnterID == 0 ? null : this.queryMsg.EnterID,
QStartDate:
this.queryMsg.tStartDates && this.queryMsg.tStartDates.length == 2
? this.queryMsg.tStartDates[0]
: null,
QEndDate:
this.queryMsg.tStartDates && this.queryMsg.tStartDates.length == 2
? this.queryMsg.tStartDates[1]
: null,
CStartDate:
this.queryMsg.qStartDates && this.queryMsg.qStartDates.length == 2
? this.queryMsg.qStartDates[0]
: null,
CEndDate:
this.queryMsg.qStartDates && this.queryMsg.qStartDates.length == 2
? this.queryMsg.qStartDates[1]
: null,
GroupBy: this.queryMsg.GroupBy,
QueryType: this.queryMsg.QueryType,
};
if (!param.QStartDate) {
param.QStartDate = "2023-01-01";
}
return param;
},
//获取酒店订单列表
GetList() {
this.loading = true;
let url = "CarSingle_post_GetGuestOrderStatisticsPageList";
// 销售 OP
if (this.pagesTitle == "销售") {
this.msg.IsMyOrder = "1";
} else {
this.msg.IsMyOrder = "0";
}
let url = "sellorder_get_GetSalesVolumeRankDetail";
let param = this.getParams();
this.apipost(
url,
this.msg,
param,
(res) => {
if (res.data.resultCode == 1) {
this.getSummaryData();
......@@ -523,13 +557,14 @@ export default {
);
},
getSummaryData() {
let param = this.getParams();
this.apipost(
"CarSingle_post_GetGuestOrderStatistics",
this.msg,
"sellorder_get_GetSalesVolumeRankDetailStatistics",
param,
(res) => {
if (res.data.resultCode == 1) {
let data = res.data.data;
this.SummaryList = data;
this.SummaryList = [data];
} else {
this.$message.error(res.data.message);
}
......@@ -560,17 +595,28 @@ export default {
// this.msg.EnterID = userInfo.EmployeeId;
},
mounted() {
this.Title = this.pagesTitle;
if (this.Title != "销售") {
this.getEmployee();
this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.getDepartmentMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.employeeMsg.employeeMsg = this.getLocalStorage().RB_Group_id;
const { BranchId = 0, EnterID = 0, RB_Department_Id = 0 } = this.$route.query;
console.log("this.$route.query.", this.$route);
this.queryMsg.RB_Branch_Id = Number(BranchId);
this.queryMsg.EnterID = Number(EnterID);
this.queryMsg.RB_Department_Id = Number(RB_Department_Id);
this.getCompanyList();
if (this.queryMsg.RB_Branch_Id >= 0) {
this.getDepartment(false);
}
if (this.queryMsg.RB_Department_Id) {
this.getEmployee(false);
}
this.Title = this.pagesTitle;
this.msg.StartTime = this.getBeforeDate(0, new Date());
this.msg.EndTime = this.getBeforeDate(0, new Date());
this.DatelistBM = [new Date(this.msg.StartTime), new Date()];
// this.GetOrderStatusEnumList()//订单状态
// this.GetTicketStatusEnumList()//出票状态
this.GetOrderTypeEnumList();
this.getLineList();
this.Datelist = this.getyMDOne();
this.userInfo = this.getLocalStorage();
this.GetList();
......
src/components/rank/salesVolumeRank.vue
View file @ bce215bb
......@@ -3,16 +3,30 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="$t('sm.Personalrank')" name="first"></el-tab-pane>
<el-tab-pane :label="$t('sm.derprank')" name="second"></el-tab-pane>
<el-tab-pane :label="$t('sm.companyrank')" name="third" v-if="authority.indexOf('Sales_Volume_Rank_Show')!=-1"></el-tab-pane>
<!--
v-if="authority.indexOf('Sales_Volume_Rank_Show') != -1" -->
<el-tab-pane
:label="$t('sm.companyrank')"
name="third"
v-if="S_CheckAllOrder"
></el-tab-pane>
<el-tab-pane :label="$t('sm.salerank')" name="four"></el-tab-pane>
</el-tabs>
<div class="query-box">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 0px 0 0;">
<el-col :span="4" v-show="activeName!='four'">
<el-row style="padding: 15px 0px 0 0">
<el-col :span="4" v-show="activeName != 'four'">
<el-form-item :label="$t('system.table_company')">
<el-select filterable v-model="msg.RB_Branch_Id" @change="getDepartment" class>
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-select
filterable
v-model="msg.RB_Branch_Id"
@change="getDepartment"
class
>
<el-option
:value="-1"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
......@@ -22,10 +36,21 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-show="activeName!='third'&&activeName!='four'">
<el-col
:span="4"
v-show="activeName != 'third' && activeName != 'four'"
>
<el-form-item :label="$t('admin.admin_Department')">
<el-select filterable v-model="msg.RB_Department_Id" @change="getEmployee" class>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-select
filterable
v-model="msg.RB_Department_Id"
@change="getEmployee"
class
>
<el-option
:value="0"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in DepartmentList"
:label="item.DepartmentName"
......@@ -35,10 +60,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-show="activeName=='first'">
<el-col :span="4" v-show="activeName == 'first'">
<el-form-item :label="$t('salesModule.Personnel')">
<el-select filterable v-model="msg.EnterID" class>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option
:value="0"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
......@@ -77,7 +105,9 @@
</el-form>
<ul class="clearfix">
<li class="hight_query">
<button class="hollowFixedBtn" @click="initData">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="initData">
{{ $t("pub.searchBtn") }}
</button>
</li>
</ul>
</div>
......@@ -85,7 +115,7 @@
v-if="isReady"
is-horizontal-resize
column-width-drag
style="width:100%"
style="width: 100%"
:columns="columns"
:table-data="tableData"
:filter-method="filterMethod"
......@@ -101,67 +131,61 @@
</div>
</template>
<script>
import Vue from 'vue'
// 自定义列组件
Vue.component('table-operation',{
template:`<span>
<a href="" @click.stop.prevent="update(rowData,index)">编辑</a>&nbsp;
<a href="" @click.stop.prevent="deleteRow(rowData,index)">删除</a>
<span>{{content}}</span>
import Vue from "vue";
import moment from 'moment'
// 自定义列组件
Vue.component("table-operation", {
template: `<span>
<a href="" @click.stop.prevent="update(rowData,index)">
<span>{{content}}</span></a>
`,
props:{
rowData:{
type:Object
props: {
rowData: {
type: Object,
},
field:{
type:String
field: {
type: String,
},
index: {
type: Number,
},
index:{
type:Number
}
},
data() {
return {
content: ''
}
content: "",
};
},
mounted() {
console.log('field', this.field)
this.content = this.rowData["SumPreferPrice"].toFixed(2)
if(this.field === 'income') {
this.content = this.rowData["SumPreferPrice"]
} else if(this.field === 'income') {
this.content = this.rowData["income"]
if (this.field === "SumPreferPrice") {
this.content = this.rowData["SumPreferPrice"];
} else if (this.field === "income") {
this.content = this.rowData["income"];
} else {
this.content = this.rowData.notInCome.toFixed(
2
)
this.content = this.rowData.notInCome.toFixed(2);
}
},
methods:{
update(){
// 参数根据业务场景随意构造
let params = {type:'edit',index:this.index,rowData:this.rowData};
this.$emit('on-custom-comp',params);
methods: {
update(rowData, index) {
this.$router.push({
path: "/salesVolumeRankEntryForm",
query: {
BranchId: rowData.BranchId,
EnterID: rowData.EnterID,
RB_Department_Id: rowData.RB_Department_Id,
blank: "y",
},
deleteRow(){
// 参数根据业务场景随意构造
let params = {type:'delete',index:this.index};
this.$emit('on-custom-comp',params);
}
}
})
});
},
},
});
export default {
data() {
return {
S_CheckAllOrder: false,
pickerOptions: {
disabledDate(time) {
return time<new Date('2018-12-31');
}
return time < new Date("2018-12-31");
},
},
activeName: "first",
columns: [],
......@@ -180,12 +204,12 @@ export default {
tStartDates: [],
qStartDates: [],
GroupBy: "EnterID",
QueryType:0
QueryType: 0,
},
getCompanyMsg: {
// 公司
RB_Group_Id: "0",
Status: "0"
Status: "0",
},
getDepartmentMsg: {
// 部门
......@@ -193,7 +217,7 @@ export default {
RB_Branch_Id: "",
Status: 0,
ParentId: -1,
Tier: 0
Tier: 0,
},
employeeMsg: {
// 员工
......@@ -201,15 +225,17 @@ export default {
BranchId: -1,
DepartmentId: 0,
PostId: 0,
IsLeave: 0
IsLeave: 0,
},
CompanyList: [],
DepartmentList: [],
EmployeeList: []
EmployeeList: [],
};
},
created() {},
mounted() {
this.settStartDates()
this.GetAuth()
this.initColumns();
this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.getDepartmentMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
......@@ -220,41 +246,49 @@ export default {
//this.pageSize = this.calcPageSize(40); 此页不需要分页
},
methods: {
GetAuth() {
var actionCode = this.$AuthCode.S_CheckAllOrder;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.S_CheckAllOrder = true;
}
});
},
initColumns() {
this.isReady = false;
let that = this;
let no = {
title: this.$t('active.ad_xuhao'),
title: this.$t("active.ad_xuhao"),
width: 50,
titleAlign: "center",
columnAlign: "center",
formatter: function(rowData, rowIndex, pagingIndex, field) {
formatter: function (rowData, rowIndex, pagingIndex, field) {
return rowIndex + 1;
},
isResize: false
isResize: false,
};
let account = {
field: "name",
title: this.$t('system.query_airName'),
title: this.$t("system.query_airName"),
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: ""
result: "",
// filterMultiple: false,
// filters: [{}],
// type: "text"
};
let sumMoney = {
field: "SumPreferPrice",
title: this.$t('sm.salemoney'),
title: this.$t("sm.salemoney"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "desc",
// componentName:'table-operation',
formatter: function(rowData, rowIndex, pagingIndex, field) {
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
......@@ -264,18 +298,18 @@ export default {
// } else {
return `${rowData["SumPreferPrice"].toFixed(2)}`;
//}
}
},
};
let moneyCount = {
field: "income",
title: this.$t('fnc.skjine'),
title: this.$t("fnc.skjine"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy:"",
// componentName:'table-operation',
formatter: function(rowData, rowIndex, pagingIndex, field) {
orderBy: "",
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
......@@ -285,18 +319,18 @@ export default {
// } else {
return `${rowData["income"]}`;
//}
}
},
};
let notIncome = {
field: "notInCome",
title: this.$t('fnc.wsjine'),
title: this.$t("fnc.wsjine"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
// componentName:'table-operation',
formatter: function(rowData, rowIndex, pagingIndex, field) {
componentName: "table-operation",
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["income"].length; i++) {
......@@ -308,52 +342,52 @@ export default {
2
)}</span>`;
//}
}
},
};
let pCount = {
field: "peopleCount",
title: this.$t('sm.sks'),
title: this.$t("sm.sks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: ""
orderBy: "",
};
let cCount = {
field: "CalcheCount",
title: this.$t('sm.exitsks'),
title: this.$t("sm.exitsks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: ""
orderBy: "",
};
let avgPCount = {
field: "avgPeopleCount",
title: this.$t('sm.personsks'),
title: this.$t("sm.personsks"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: ""
orderBy: "",
};
let customerNum = {
field: "totalGuestNum",
title: '单项收客数',
title: "单项收客数",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80
width: 80,
};
let unitPrice = {
field: "avgPrice",
title: this.$t('sm.keprice'),
title: this.$t("sm.keprice"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
formatter: function (rowData, rowIndex, pagingIndex, field) {
// if (that.authority.indexOf("Sales_Volume_Rank_Show") == -1) {
// let content = "";
// for (let i = 0; i < rowData["avgPrice"].length; i++) {
......@@ -363,15 +397,15 @@ export default {
// } else {
return rowData["avgPrice"].toFixed(2);
// }
}
},
};
let proportion = {
field: "zanBi",
title: this.$t('sm.xiaoshouzb'),
title: this.$t("sm.xiaoshouzb"),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80
width: 80,
};
this.columns = [];
......@@ -382,8 +416,8 @@ export default {
this.columns.push(notIncome);
this.columns.push(pCount);
this.columns.push(cCount);
if (this.activeName != "first" && this.activeName!='four') {
unitPrice.title = this.$t('sm.renxiaoshou');
if (this.activeName != "first" && this.activeName != "four") {
unitPrice.title = this.$t("sm.renxiaoshou");
this.columns.push(avgPCount);
}
this.columns.push(customerNum);
......@@ -416,13 +450,14 @@ export default {
? this.msg.qStartDates[1]
: null,
GroupBy: this.msg.GroupBy,
QueryType: this.msg.QueryType
QueryType: this.msg.QueryType,
};
if (!param.QStartDate) {
param.QStartDate = "2019-01-01";
}
this.apipost("sellorder_get_sellvolumerankNew", param, r => {
r.data.data.forEach(x => {
this.tableData = []
this.apipost("sellorder_get_sellvolumerankNew", param, (r) => {
r.data.data.forEach((x) => {
x.incomeVal = parseFloat(x.income);
x.avgPrice = parseFloat(x.avgPrice);
});
......@@ -435,20 +470,20 @@ export default {
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
(res) => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {
}
},
err => {}
(err) => {}
);
},
initAuthor() {
let msg = {
MenuUrl: "/salesVolumeRank"
MenuUrl: "/salesVolumeRank",
};
this.apipost("admin_get_GetActionCodeForUrlAndUser", msg, r => {
this.apipost("admin_get_GetActionCodeForUrlAndUser", msg, (r) => {
this.authority = r.data.data;
});
},
......@@ -463,12 +498,12 @@ export default {
this.apipost(
"admin_get_DepartmentGetList",
this.getDepartmentMsg,
res => {
(res) => {
if (res.data.resultCode == 1) {
this.DepartmentList = res.data.data;
}
},
err => {}
(err) => {}
);
}
},
......@@ -480,28 +515,34 @@ export default {
this.apipost(
"admin_get_EmployeeGetList",
this.employeeMsg,
res => {
(res) => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
},
err => {}
(err) => {}
);
},
settStartDates() {
let date = moment().format('yyyy-MM-DD')
let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
this.msg.tStartDates = [start, date]
console.log('settStartDates',date,start)
},
handleClick(tab, event) {
this.msg.EnterID = 0;
this.msg.QueryType=0;
this.msg.QueryType = 0;
if (this.activeName == "first") this.msg.GroupBy = "EnterID";
else if (this.activeName == "second")
this.msg.GroupBy = "RB_Department_Id";
else if (this.activeName == "third"){
else if (this.activeName == "third") {
this.msg.GroupBy = "RB_Branch_Id";
this.msg.RB_Department_Id = 0;
} else {
this.msg.RB_Department_Id = 0;
this.msg.RB_Branch_Id = -1;
this.msg.GroupBy = "EnterID";
this.msg.QueryType=4;
this.msg.QueryType = 4;
}
this.initColumns();
this.initData();
......@@ -551,8 +592,8 @@ export default {
}
}
},
filterMethod(filters) {}
}
filterMethod(filters) {},
},
};
</script>
<style>
......
src/router/config.js
View file @ bce215bb
......@@ -5072,7 +5072,7 @@ export default {
{
path: '/OPcommissionPeriods',
name: 'OPcommissionPeriods',
component: resolve => require(['@/components/FinancialModule/OPcommissionPeriods'], resolve),
component: resolve => require(['@/components/FinancialModule/OpCommission/OPcommissionPeriods'], resolve),
meta: {
title: 'op提成'
}
......@@ -5153,7 +5153,7 @@ export default {
{
path: '/OPCommissionDetail',
name: 'OPCommissionDetail',
component: resolve => require(['@/components/FinancialModule/OPCommissionDetail'], resolve),
component: resolve => require(['@/components/FinancialModule/OpCommission/OPCommissionDetail'], resolve),
meta: {
title: 'op提成详情'
}
......@@ -5161,7 +5161,7 @@ export default {
{
path: '/OpComPersonDetails',
name: 'OpComPersonDetails',
component: resolve => require(['@/components/FinancialModule/OpComPersonDetails'], resolve),
component: resolve => require(['@/components/FinancialModule/OpCommission/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