Skip to content

S
SuperMan
Commit 6265eb73 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents a93f630b 9b84890d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1884 additions and 84 deletions
src/components/FinancialModule/ServiceCommission/ServiceCommissiondetails.vue
View file @ 6265eb73
......@@ -193,6 +193,14 @@
}
},
watch: {
msg:{
handler(newValue, oldValue) {
this.getList()
},
deep: true,
},
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
......@@ -213,16 +221,17 @@
this.msg.Type = this.$route.query.Type
}
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:""
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
this.isSearch = this.$route.query.isSearch?this.$route.query.isSearch:false
}
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
} else {
this.disabled = true;
if(!this.$route.query.UserId){
this.msg.UserId = Number(userInfo.EmployeeId)
}
this.getList();
}
this.getList()
this.getqishilist()
this.getCompanyList() //获取公司
this.getEmployee() //人员
......
src/components/FinancialModule/domestic/OPsalesCommissiondetails.vue
View file @ 6265eb73
......@@ -218,8 +218,10 @@
this.disabled = false;
} else {
this.disabled = true;
if(!this.$route.query.UserId){
this.msg.UserId = Number(userInfo.EmployeeId)
}
}
this.getList();
this.getqishilist()
this.getCompanyList() //获取公司
......
src/components/FinancialModule/domesticCommissionRuleTW.vue 0 → 100644
View file @ 6265eb73
This diff is collapsed.
src/components/FinancialModule/domesticCommissionTW.vue 0 → 100644
View file @ 6265eb73
This diff is collapsed.
src/components/FinancialModule/domesticCommissionUserTW.vue 0 → 100644
View file @ 6265eb73
<style>
.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 tr td {
padding: 8px 5px;
}
.domesticCommissionUser .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
</style>
<template>
<div class="flexOne domesticCommissionUser">
<div>
<ul class="opUl">
<li>
<em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
<el-option label="不限" :value="-1"></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>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
</el-select>
</li>
<li>
<em>公司</em>
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
</el-select>
</li>
<li>
<em>部门</em>
<el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName"
:value="item.DepartmentID"></el-option>
</el-select>
</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.BranchName}}</td>
<td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td>
<td>{{item.TCNumber}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.Periods}}</td>
<td>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('domesticCommissiondetailsTW',item)"
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="10">暂无数据</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 {
Month: moment().format("YYYY-MM"),
msg: {
pageIndex: 1,
pageSize: 20,
PeriodId: 0,
UserId: -1,
RB_Branch_Id: -1,
RB_Department_Id: -1,
OutBranchId:-1,
},
loading: false,
//数据源
dataList: [],
total: 0,
disabled: true,
PeriodsList: [],
BranchList: [],
searchList: [],
departMentList:[],
}
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
this.disabled = false;
}else{
this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId)
}
if (this.$route.query && this.$route.query.PeriodId) {
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getList();
// this.getqishilist()
this.getCompanyList()//获取公司
this.getEmployee()//人员
this.getDerpartMent()//部门
},
methods: {
getDerpartMent() {
//获取部门
this.apipost(
"admin_get_DepartmentGetList",
this.getDepartmentMsg,
res => {
if (res.data.resultCode == 1) {
this.departMentList = res.data.data;
} else { }
},
err => { }
);
},
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 => { }
);
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
};
this.apipost(
"admin_get_BranchGetList",
msg,
res => {
if (res.data.resultCode == 1) {
this.BranchList = res.data.data;
}
},
err => { }
);
},
getqishilist() {
this.apipost(
"sellcommission_GetGNCommissionPeriodsList",
{},
res => {
if (res.data.resultCode == 1) {
this.PeriodsList = res.data.data;
if (this.PeriodsList && this.PeriodsList.length > 0) {
// this.msg.Periods = Number(this.PeriodsList[0].Id)
}
} else {
this.Error(res.data.message);
}
},
null
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
goUrl(path, item) {
this.$router.push({
path: path,
query: {
PeriodId: this.$route.query.PeriodId,
UserId:item.UserId,
RB_Branch_Id:item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id,
blank: 'y',
tab: '国内提现详情'
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"sellcommission_GetTWCommissionDetailsListForUser",
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
);
},
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/domesticCommissiondetails.vue
View file @ 6265eb73
......@@ -150,7 +150,7 @@
</td> -->
</tr>
<tr v-if="dataList.length==0">
<td style="text-align:center" colspan="12">暂无数据</td>
<td style="text-align:center" colspan="13">暂无数据</td>
</tr>
</table>
<!-- 分页 -->
......
src/components/FinancialModule/domesticCommissiondetailsTW.vue 0 → 100644
View file @ 6265eb73
This diff is collapsed.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 6265eb73
......@@ -122,25 +122,6 @@
@click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
</div>
<ul>
<li>
<span>
<em>提成状态</em>
<el-select class="w150" v-model="queryMsg.QSendCommissionState" filterable
@change="getControlList()">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0" @change="resetPageIndex(),getControlList()"/>
</span>
</li>
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
......@@ -338,6 +319,29 @@
</el-checkbox-group>
</span>
</div>
<div class="comSearchDiv" style="display: flex;align-items: center;">
<span style="flex-shrink: 0;">提成状态</span>
<span style="display: flex;align-items: center;flex-wrap: wrap;">
<el-select class="w180 multiple_input" v-model="queryMsg.QSendCommissionState">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0"/>
<div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">出境</span>
</div>
</span>
</div>
<button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}
</button>
......@@ -406,11 +410,6 @@
</li>
</ul>
</div>
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">出境</span>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading">
<ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
......@@ -469,12 +468,12 @@
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div>
<div class="TC_TravelSalePlat clearfix"
v-if="item.Royalty">
v-if="item.Royalty" style="display: flex;flex-wrap: wrap;align-items: baseline;">
<span class="TC_neibu" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}} 期</span>
<span style="cursor: pointer;" v-for="x in item.Royalty.List"
@click="goRoyaltyUrl(item,item.Royalty,x)"
class="TC_neibu"
:style="{'background-color':x.Type==1?'#ff99cc':x.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
:style="{'background-color':item.Royalty.Type==1?'#ff99cc':item.Royalty.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
{{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
</span>
</div>
......@@ -1463,7 +1462,7 @@
name = 'ServiceCommissiondetails'
obj.UserId = item.UserId
obj.TCNUM = row.TCNUM
obj.Type = ''
obj.Type = 2
}
this.$router.push({
name: name,
......@@ -1766,7 +1765,6 @@
})
})
this.$forceUpdate()
console.log( this.queryCommonData.dataList[0].Royalty,'------')
}
}
)
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 6265eb73
......@@ -94,25 +94,6 @@
@click="getCompanyCheck(item)">{{item.BName}}</span>
</div>
<ul>
<li>
<span>
<em>提成状态</em>
<el-select class="w150" v-model="queryMsg.QSendCommissionState" filterable
@change="getControlList()">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0" @change="resetPageIndex(),getControlList()"/>
</span>
</li>
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
......@@ -299,6 +280,29 @@
</el-select>
</span>
</div>
<div class="comSearchDiv" style="display: flex;align-items: center;">
<span style="flex-shrink: 0;">提成状态</span>
<span style="display: flex;align-items: center;flex-wrap: wrap;">
<el-select class="w180 multiple_input" v-model="queryMsg.QSendCommissionState">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0"/>
<div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">出境</span>
</div>
</span>
</div>
<button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}
</button>
......@@ -368,11 +372,7 @@
</li>
</ul>
</div>
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">出境</span>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading">
<ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
......@@ -420,12 +420,12 @@
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div>
<div class="TC_TravelSalePlat clearfix"
v-if="item.Royalty">
v-if="item.Royalty" style="display: flex;flex-wrap: wrap;align-items: baseline;">
<span class="TC_neibu" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}} 期</span>
<span style="cursor: pointer;" v-for="x in item.Royalty.List"
@click="goRoyaltyUrl(item,item.Royalty,x)"
class="TC_neibu"
:style="{'background-color':x.Type==1?'#ff99cc':x.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
:style="{'background-color':item.Royalty.Type==1?'#ff99cc':item.Royalty.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
{{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
</span>
</div>
......@@ -955,7 +955,7 @@
name = 'ServiceCommissiondetails'
obj.UserId = item.UserId
obj.TCNUM = row.TCNUM
obj.Type = ''
obj.Type = 2
}
this.$router.push({
name: name,
......
src/components/busManagement/BookAcar/addEditVehicle.vue
View file @ 6265eb73
......@@ -514,78 +514,67 @@
rules:{
UseCompName: [{
required: true,
// message: '请输入订车单位',
message: '请输入订车单位',
trigger: 'blur'
}],
UseName: [{
required: true,
// message: '请输入订车人名称',
message: '请输入订车人名称',
trigger: 'blur'
}],
PickUpInfo: [{
required: true,
// message: '请输入接机信息',
message: '',
message: '请输入接机信息',
trigger: 'blur'
}],
GoFlightInfo: [{
required: true,
// message: '请输入去程航班',
message: '',
message: '请输入去程航班',
trigger: 'change'
}],
BackFlightInfo: [{
required: true,
// message: '请输入回程航班',
message: '',
message: '请输入回程航班',
trigger: 'blur'
}],
PeopleNum: [{
required: true,
// message: '请输入用车人数',
message: '',
message: '请输入用车人数',
trigger: 'blur'
}],
UseDayNum: [{
required: true,
// message: '请输入行程天数',
message: '',
message: '请输入行程天数',
trigger: 'blur'
}],
StartDate:[{
required: true,
// message: '请选择开始日期',
message: '',
message: '请选择开始日期',
trigger: 'change'
}],
BusType: [{
required: true,
// message: '请选择用车类型',
message: '',
message: '请选择用车类型',
trigger: 'change'
}],
GuideInfo: [{
required: true,
// message: '请输入导游信息',
message: '',
message: '请输入导游信息',
trigger: 'blur'
}],
TeamName: [{
required: true,
// message: '请输入团队信息',
message: '',
message: '请输入团队信息',
trigger: 'blur'
}],
UseType: [{
required: true,
// message: '请选择用车类型',
message: '',
message: '请选择用车类型',
trigger: 'change'
}],
TripInfo: [{
required: true,
// message: '请输入行程信息',
message: '',
message: '请输入行程信息',
trigger: 'blur'
}],
},
......@@ -745,6 +734,12 @@
});
},
submit(){
for(let i=0;i<this.msg.details.length;i++){
if(!this.msg.details&&!this.msg.details[i].TripInfo){
this.Error('请输入行程信息')
return
}
}
this.$refs['msg'].validate((valid) => {
if (valid) {
this.setFormMsg()
......
src/router/config.js
View file @ 6265eb73
......@@ -4772,6 +4772,7 @@ export default {
title: '国内提成列表'
}
},
{
path: '/domesticCommissionUser',
name: 'domesticCommissionUser',
......@@ -4788,6 +4789,38 @@ export default {
title: '国内提成详情'
}
},
{
path: '/domesticCommissionRuleTW',
name: 'domesticCommissionRuleTW',
component: resolve => require(['@/components/FinancialModule/domesticCommissionRuleTW'], resolve),
meta: {
title: '台湾提成规则'
}
},
{
path: '/domesticCommissionTW',
name: 'domesticCommissionTW',
component: resolve => require(['@/components/FinancialModule/domesticCommissionTW'], resolve),
meta: {
title: '台湾提成列表'
}
},
{
path: '/domesticCommissionUserTW',
name: 'domesticCommissionUserTW',
component: resolve => require(['@/components/FinancialModule/domesticCommissionUserTW'], resolve),
meta: {
title: '台湾提成用户分组'
}
},
{
path: '/domesticCommissiondetailsTW',
name: 'domesticCommissiondetailsTW',
component: resolve => require(['@/components/FinancialModule/domesticCommissiondetailsTW'], resolve),
meta: {
title: '台湾提成详情'
}
},
{
path: '/ServiceTheRules',
name: 'ServiceTheRules',
......
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