Skip to content

S
SuperMan
Commit 9793b5a7 authored by 吴春's avatar 吴春
Browse files
Options

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

parents b2628d9b cdf36de0
Hide whitespace changes
Inline Side-by-side
Showing with 195 additions and 54 deletions
src/components/FinancialModule/RecPayQuery.vue
View file @ 9793b5a7
......@@ -480,6 +480,7 @@
<el-table-column prop="" :label="$t('fnc.jine')">
<template slot-scope="scope">
<span>
<p v-if="scope.row.IsForeignCurrency==1" style="line-height:20px">原币：<span>{{scope.row.WBMoney}}{{scope.row.CurrencyName}}</span></p>
<p style="line-height:20px">{{scope.row.Type==1?$t('fnc.yingshou'):$t('fnc.yingfu')}}：<span>{{scope.row.Money}}</span></p>
<p style="line-height:20px">{{scope.row.Type==1?$t('fnc.shishou'):$t('fnc.shifu')}}：<span>{{scope.row.PayMoney}}</span></p>
<p v-if="scope.row.IsAdvanceFinance==1" style="line-height:20px">{{$t('objFill.balanceout')}}：<span>{{scope.row.MatchMoney}}</span>
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 9793b5a7
......@@ -504,8 +504,8 @@ tr._item_list td:last-child {
<!-- <el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
<el-option value="10" v-if="isShowType" label="景点门票"></el-option>
<el-option value="11" v-if="isShowType" label="餐厅美食"></el-option> -->
<el-option value="13" label="机票折让收入"></el-option>
<el-option value="14" label="单机票收入"></el-option>
<!-- <el-option value="13" label="机票折让收入"></el-option>
<el-option value="14" label="单机票收入"></el-option> -->
<el-option value="15" v-if="isShowType" label="手配费收入"></el-option>
<el-option value="16" v-if="isShowType" label="单项机票"></el-option>
<el-option value="17" v-if="isShowType" label="单项酒店"></el-option>
......@@ -516,6 +516,7 @@ tr._item_list td:last-child {
<el-option value="22" label="车行收入"></el-option>
<el-option value="23" label="欧洲单团分润收入"></el-option>
<el-option value="24" label="欧洲损失分摊"></el-option>
<el-option value="25" label="CRM直客部外丟團"></el-option>
</el-select>
<el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150" v-if="isShowGrounding==false">
<el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
......@@ -766,6 +767,7 @@ Vue.component("TCIDJump", {
<span style="cursor: pointer" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===23" @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===24" @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===25">{{rowData.TCID}}</span>
</div>
`,
......@@ -915,6 +917,7 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===23" @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===24" @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===25" @click="goHand('planeTicketOrder',rowData,16)">{{rowData.TCNUM}}</span>
</div>`,
props: {
rowData: {
......@@ -2351,6 +2354,9 @@ export default {
if(this.msg.LineId==-24){
this.msg.DataType="24";
}
if(this.msg.LineId==-25){
this.msg.DataType="25";
}
let userInfo = this.getLocalStorage();
if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
this.isShowType = false;
......
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ 9793b5a7
......@@ -161,6 +161,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 width='200'>{{$t('pub.pubRemark')}}</th>
......@@ -183,6 +184,7 @@
<td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.UserId,item.UserName)">{{item.Rate?item.Rate+'%':'-'}}</span></td>
<td>{{item.OrderProfit}}</td>
<td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
<td>{{item.WaitCommissionMoney?item.WaitCommissionMoney:'-'}}</td>
<td><span v-if="item.IssueNum<3" style="padding-left:5px;color:blue;cursor: pointer;text-decoration: underline;" @click="goUrlUser('TradeTicketDetails',item)">第{{item.IssueNum}}次提成</span>
<span v-else-if="item.IssueNum>=3" style="padding-left:5px;color:red;cursor: pointer;text-decoration: underline;" @click="goUrlUser('TradeTicketDetails',item)">第{{item.IssueNum}}次提成</span></td>
......
src/components/FinancialModule/TradeCommission/TicketUserDetails.vue
View file @ 9793b5a7
......@@ -207,6 +207,7 @@
<th>总提成</th>
<th>公司提成</th>
<th>期数</th>
<th style="width:230px">备注</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
......@@ -214,11 +215,11 @@
<td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td>
<td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
<td>{{item.PeopleMoney?item.PeopleMoney:'-'}}</td>
<td>{{item.PeopleMoney?item.PeopleMoney:'-'}}<span v-if="item.WaitPeopleMoney">(待发 {{item.WaitPeopleMoney}})</span></td>
<td>{{item.EuropePNum?item.EuropePNum:'-'}}</td>
<td>{{item.EuropeMoney?item.EuropeMoney:'-'}}</td>
<td>{{item.EuropeMoney?item.EuropeMoney:'-'}}<span v-if="item.WaitEuropeMoney">(待发 {{item.WaitEuropeMoney}})</span></td>
<td>{{item.OtherPNum?item.OtherPNum:'-'}}</td>
<td>{{item.OtherMoney?item.OtherMoney:'-'}}</td>
<td>{{item.OtherMoney?item.OtherMoney:'-'}}<span v-if="item.WaitOtherMoney">(待发 {{item.WaitOtherMoney}})</span></td>
<td v-if="userInfo.RB_Group_id=2&&userInfo.RB_Branch_id==0"
:style="{'color': item.BonusMoney?'#409EFF':''}"
:class="[item.BonusMoney?'cursor-p':'']"
......@@ -230,8 +231,9 @@
</td>
<td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
<td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.UserId,item.UserName)">{{item.Periods}}</span></td>
<td>{{item.Description}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<el-tooltip v-if="item.IsReissue != 1" class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('TradeTicketDetails',item)"
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
......
src/components/FinancialModule/TradeCommission/components/GroupLeaderReward.vue
View file @ 9793b5a7
......@@ -106,7 +106,7 @@ export default {
watch: {
obj: {
handler(newValue,onldValue) {
this.msg.EmpId = newValue.EmployeeId?newValue.EmployeeId:0
this.msg.EmpId = newValue.UserId?newValue.UserId:0
this.msg.PeriodsId = newValue.PeriodsId?newValue.PeriodsId:0
this.isShow = true
this.getList()
......@@ -117,7 +117,7 @@ export default {
},
mounted() {
if(this.obj){
this.msg.EmpId = this.obj.EmployeeId?this.obj.EmployeeId:0
this.msg.EmpId = this.obj.UserId?this.obj.UserId:0
this.msg.PeriodsId = this.obj.PeriodsId?this.obj.PeriodsId:0
this.isShow = true
this.getList()
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 9793b5a7
......@@ -1576,7 +1576,7 @@
this.msg && this.msg.detailList && this.msg.detailList.forEach((item, i) => {
yballPrice += Number(item.UnitPrice)
})
this.yballPriceTo = yballPrice
this.yballPriceTo = this.RoundItUp(parseFloat(yballPrice).toFixed(2))
if(this.orderObj.Money&&this.orderObj.Money2){
let Money = ((this.orderObj.Money*100)+(this.orderObj.Money2*100))/100
if (Money != this.yballPriceTo) {
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 9793b5a7
......@@ -122,8 +122,8 @@
</td>
<td>
<template v-if="EditBtn||LineId==90">
<el-input class='w135' v-model='childItem.UsePeopleNum'
@keyup.native="checkInteger(childItem,'UsePeopleNum')" type="text"></el-input>
<el-input class='w135' v-model='childItem.UsePeopleNum' @input='calculationPrice(subItem)'
@keyup.native="checkInteger(childItem,'UsePeopleNum')" type="text"></el-input>
</template>
<template v-else>
{{childItem.UsePeopleNum}}
......@@ -131,7 +131,7 @@
</td>
<td>
<template v-if="EditBtn||LineId==90">
<el-input class='w135' v-model='childItem.PeoplePrice'
<el-input class='w135' v-model='childItem.PeoplePrice' @input='calculationPrice(subItem)'
@keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
</template>
<template v-else>
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 9793b5a7
......@@ -111,6 +111,15 @@
</el-select>
</span>
</li>
<li>
<span>
<em>团队类型</em>
<el-select filterable :placeholder="$t('sm.company')" v-model="queryMsg.TeamType">
<el-option v-for='item in teamTypeList' :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
......@@ -189,11 +198,11 @@
<th width="80">机票状态</th>
<th width="100">{{$t('leader.leader_Leader')}}</th>
<th width="100">{{$t('leader.leader_Guide')}}</th>
</tr>
<tbody v-for="(item,index) in DataList" :key="index">
<tr>
<td rowspan="2" :data-TCID="item.TCID" :data-AirTicketId="item.AirTicketId">{{item.Num}}</td>
<td rowspan="2" :data-TCID="item.TCID" :data-AirTicketId="item.AirTicketId">{{item.Num}}
</td>
<td
:class="{'Rs_Start1':item.StartCityNum==1,'Rs_Start2':item.StartCityNum==2,'Rs_Start3':item.StartCityNum==3,
'Rs_Start4':item.StartCityNum==4,'Rs_Start5':item.StartCityNum==5,'Rs_Start6':item.StartCityNum==6,
......@@ -204,7 +213,32 @@
<td>{{item.StartDateStr}} {{item.AlCode}}</td>
<td>
<span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'"
@click="goUrlTCList('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span>
@click="goUrlTCList(item)">{{item.TCID}}</span>
<br />
<template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName!=''">
<span style="font-weight:blod;">{{item.PriceTeamTypeName}}(<template v-if="item.OrderLeaderGuestNum>0">
<el-tooltip class="item" effect="dark" content="需要领队" placement="top">
<font>V</font>
</el-tooltip>
</template><template v-else>
<el-tooltip class="item" effect="dark" content="不需要领队" placement="top">
<font>S</font>
</el-tooltip>
</template>)</span>
</template>
<template v-else>
<span style="font-weight:blod;">{{item.TeamTypeName}}(<template v-if="item.OrderLeaderGuestNum>0">
<el-tooltip class="item" effect="dark" content="需要领队" placement="top">
<font>V</font>
</el-tooltip>
</template>
<template v-else>
<el-tooltip class="item" effect="dark" content="不需要领队" placement="top">
<font>S</font>
</el-tooltip>
</template>)
</span>
</template>
</td>
<td>{{item.InOut}}</td>
<td>{{item.InOutTime}}</td>
......@@ -292,8 +326,26 @@
QEndDate: "",
TicketStartNum: "",
TicketEndNum: "",
uid: "0"
uid: "0",
TeamType: -1, //0-常规团，1-小包团，2-当地游
},
teamTypeList: [{
Id: -1,
Name: "全部"
},
{
Id: 0,
Name: "散拼"
},
{
Id: 1,
Name: "小包团"
},
{
Id: 2,
Name: "当地游"
},
],
//数据列表
DataList: [],
currentPage: 0,
......@@ -301,11 +353,23 @@
};
},
methods: {
goUrlTCList(path, TCNUMS, title) {
goUrlTCList(item) {
var title = "";
var path = "";
if (item.TeamType == 0) {
title = "团控列表";
path = "TravelControlList";
} else if (item.TeamType == 1) {
title = "小包团列表";
path = "TravelControlListSale";
} else if (item.TeamType == 2) {
title = "当地游列表";
path = "oneDayTrip";
}
this.$router.push({
name: path,
query: {
tcmun: TCNUMS,
tcmun: item.TCNUM,
blank: "y",
tab: title
}
......@@ -398,7 +462,11 @@
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
this.DataList.forEach(item => {
switch (item.StartCityName) {
var NStartCityName = "";
if (item.OutBranchName && item.OutBranchName != '') {
NStartCityName = item.OutBranchName.replace("印象", "");
}
switch (NStartCityName) {
case "成都":
item.StartCityNum = 1;
break;
......@@ -414,25 +482,25 @@
case "武汉":
item.StartCityNum = 5;
break;
case "贵阳":
case "郑州":
item.StartCityNum = 6;
break;
case "南昌":
case "上海":
item.StartCityNum = 7;
break;
case "兰州":
case "南宁":
item.StartCityNum = 8;
break;
case "票务":
item.StartCityNum = 9;
break;
case "长沙":
case "欧洲":
item.StartCityNum = 10;
break;
case "微途":
item.StartCityNum = 11;
break;
case "厦门":
case "长沙":
item.StartCityNum = 12;
break;
case "南京":
......
src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue
View file @ 9793b5a7
......@@ -114,6 +114,15 @@
</el-select>
</span>
</li>
<li>
<span>
<em>团队类型</em>
<el-select filterable :placeholder="$t('sm.company')" v-model="queryMsg.TeamType">
<el-option v-for='item in teamTypeList' :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
......@@ -159,8 +168,10 @@
<tr>
<th width="50">{{$t('salesModule.Xu')}}</th>
<th width="80">{{$t('Operation.Op_chutuan')}}</th>
<th width='200'>系列</th>
<th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="80">{{$t('Operation.Op_jinchudian')}}</th>
<th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
<th width="50">{{$t('Operation.Op_price')}}</th>
......@@ -179,7 +190,36 @@
'Rs_Start7':item.StartCityNum==7,'Rs_Start8':item.StartCityNum==8,'Rs_Start9':item.StartCityNum==9,
'Rs_Start10':item.StartCityNum==10,'Rs_Start11':item.StartCityNum==11,'Rs_Start12':item.StartCityNum==12,'Rs_Start13':item.StartCityNum==13}">
{{item.StartCityName}} ({{item.OutBranchName}})</td>
<td>{{item.LtName}}</td>
<td>
<span>{{item.TCNUM}}({{item.TCID}})</span>
<br />
<template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName!=''">
<span style="font-weight:blod;">{{item.PriceTeamTypeName}}(<template v-if="item.OrderLeaderGuestNum>0">
<el-tooltip class="item" effect="dark" content="需要领队" placement="top">
<font>V</font>
</el-tooltip>
</template><template v-else>
<el-tooltip class="item" effect="dark" content="不需要领队" placement="top">
<font>S</font>
</el-tooltip>
</template>)</span>
</template>
<template v-else>
<span style="font-weight:blod;">{{item.TeamTypeName}}(<template v-if="item.OrderLeaderGuestNum>0">
<el-tooltip class="item" effect="dark" content="需要领队" placement="top">
<font>V</font>
</el-tooltip>
</template>
<template v-else>
<el-tooltip class="item" effect="dark" content="不需要领队" placement="top">
<font>S</font>
</el-tooltip>
</template>)
</span>
</template>
</td>
<td>{{item.StartDateStr}}</td>
<td>{{item.InOut}}</td>
<td>{{item.InOutTime}}</td>
......@@ -252,8 +292,26 @@
OutBranchId: -1,
QStartDate: "",
QEndDate: "",
uid: "0"
uid: "0",
TeamType: -1, //0-常规团，1-小包团，2-当地游
},
teamTypeList: [{
Id: -1,
Name: "全部"
},
{
Id: 0,
Name: "散拼"
},
{
Id: 1,
Name: "小包团"
},
{
Id: 2,
Name: "当地游"
},
],
//数据列表
DataList: [],
currentPage: 0,
......@@ -313,45 +371,49 @@
this.total = res.data.data.count
this.DataList = res.data.data.pageData;
this.DataList.forEach(item => {
switch (item.StartCityName) {
case '成都':
item.StartCityNum = 1
var NStartCityName = "";
if (item.OutBranchName && item.OutBranchName != '') {
NStartCityName = item.OutBranchName.replace("印象", "");
}
switch (NStartCityName) {
case "成都":
item.StartCityNum = 1;
break;
case '昆明':
item.StartCityNum = 2
case "昆明":
item.StartCityNum = 2;
break;
case '重庆':
item.StartCityNum = 3
case "重庆":
item.StartCityNum = 3;
break;
case '西安':
item.StartCityNum = 4
case "西安":
item.StartCityNum = 4;
break;
case '武汉':
item.StartCityNum = 5
case "武汉":
item.StartCityNum = 5;
break;
case '贵阳':
item.StartCityNum = 6
case "郑州":
item.StartCityNum = 6;
break;
case '南昌':
item.StartCityNum = 7
case "上海":
item.StartCityNum = 7;
break;
case '兰州':
item.StartCityNum = 8
case "南宁":
item.StartCityNum = 8;
break;
case '票务':
item.StartCityNum = 9
case "票务":
item.StartCityNum = 9;
break;
case '长沙':
item.StartCityNum = 10
case "欧洲":
item.StartCityNum = 10;
break;
case '微途':
item.StartCityNum = 11
case "微途":
item.StartCityNum = 11;
break;
case '厦门':
item.StartCityNum = 12
case "长沙":
item.StartCityNum = 12;
break;
case '南京':
item.StartCityNum = 13
case "南京":
item.StartCityNum = 13;
break;
}
})
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 9793b5a7
......@@ -100,7 +100,7 @@
<td>
<template v-if="EditBtn||LineId==90">
<el-input class='w135' v-model='childItem.PeoplePrice'
@keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
@keyup.native="checkPrice(childItem,'PeoplePrice')" @input='calculationPrice(subItem)' type="text"></el-input>
</template>
<template v-else>
<span class="spanlink" v-if='childItem.PeoplePrice==0'
......@@ -116,7 +116,7 @@
<td>
<template v-if="EditBtn||LineId==90">
<el-input class='w135' v-model='childItem.DiscountPrice'
@keyup.native="checkPrice(childItem,'DiscountPrice')" type="text"></el-input>
@keyup.native="checkPrice(childItem,'DiscountPrice')" @input='calculationPrice(subItem)' type="text"></el-input>
</template>
<template v-else>
<span class="spanlink" v-if='childItem.DiscountPrice==0'
......
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