Skip to content

S
SuperMan
Commit a14f8357 authored by liudong1993's avatar liudong1993
Browse files
Options

解决覆盖问题

parent b6b80610
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 43 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ a14f8357
......@@ -188,6 +188,7 @@
<el-radio :label="3">外币现金</el-radio>
<el-radio :label="4">资金池</el-radio>
<el-radio :label="5">平台虚拟账户</el-radio>
<el-radio :label="6">地接虚拟账户</el-radio>
<!-- <el-radio :label="3">资金池</el-radio> -->
</el-radio-group>
</div>
......@@ -521,7 +522,7 @@
</div>
<div class="_submit">
<div class="chosenNextBox">
<div v-if='resultCode==11019'>
<div v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
<label>下一步：<span class="red">{{msg.AuditDescription}}</span></label>
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请选择下一步审批人" :remote-method="remoteMethod" :loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
......@@ -652,6 +653,7 @@ export default {
timer:'',
leaderType:1,
resultCode:null,
EmployeeId:0
}
},methods:{
deleteRow(i,obj){
......@@ -1254,6 +1256,7 @@ export default {
},mounted(){
let userInfo = this.getLocalStorage();
this.department = userInfo.DepartName;
this.EmployeeId=userInfo.EmployeeId;
this.emplyeeName=userInfo.emName;
this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ a14f8357
......@@ -442,7 +442,7 @@
</div>
<div class="_submit">
<div class="chosenNextBox">
<div v-if='resultCode==11019'>
<div v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
<label>下一步：<span class="red">{{msg.AuditDescription}}</span></label>
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请选择下一步审批人" :remote-method="remoteMethod" :loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
......@@ -989,7 +989,7 @@ export default {
}
if (x.Type===4){
AccList.forEach(y=>{
if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池'){
if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'){
newAccList.push(y)
}
})
......
src/components/SalesModule/groupTourOrder.vue
View file @ a14f8357
......@@ -942,12 +942,12 @@
</el-col>
<el-col :span="4">
<el-form-item label="商务舱" prop="ESeatNum">
<el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
<el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="头等舱" prop="FSeatNum">
<el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
<el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4">
......@@ -1008,13 +1008,21 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="收款账户">
<el-select filterable v-model='addMsg.PlatformAccount' @change="changeSelect">
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="平台订单号" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods'
:disabled="isAllowUpdate==0"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay==1 && addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<!-- <el-col :span="4" v-if="addMsg.TradeWay==1 && addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
......@@ -1031,7 +1039,7 @@
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -1317,7 +1325,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i>
......@@ -1331,7 +1339,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_yellow">
<i class="iconfont icon-baomingrenshu"></i>
......@@ -1345,6 +1353,7 @@
</p>
</div>
</el-col>
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
......@@ -1357,7 +1366,7 @@
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<el-col :span="4" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
......@@ -1371,6 +1380,17 @@
</p>
</div>
</el-col>
<el-col :span="3" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>累计提成</span>
</div>
<p>
<span>提成金额：{{countData.SumCommissionMoney}};</span>
</p>
</div>
</el-col>
</el-row>
</div>
<!-- 表格 -->
......@@ -1522,7 +1542,7 @@
icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button v-if="item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
<el-button v-if="item.Status=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
style='background:green; border-color:green' icon="iconfont icon-bianji-smal"
@click='getRemarks(item)'></el-button>
</el-tooltip>
......@@ -1791,6 +1811,7 @@
ClientSource: '',
BrandId: '',
TradeWay: '2',
PlatformAccount:'',
PlatformOrder: '',
GuestNum: 0,
IsChildrenTour: '0',
......@@ -1890,6 +1911,7 @@
ssptList: [],
jyfsList: [],
ScenicRefundList: [],
PlatformAccountList:[],
ScenicRefundMoney: 0,
//显示修改业务员
showChangeSales: false,
......@@ -1921,7 +1943,8 @@
DueinMoney: 0,
PreferPrice: 0,
InteriorNum: 0,
B2BNum: 0
B2BNum: 0,
SumCommissionMoney:0
},
// 订单转团
transferData: {
......@@ -2308,6 +2331,17 @@
this.getTotalPrice()
this.getTicheng()
},
getPlatformAccount(typeIdtwo,platformAccount) {
let platBranchId=this.getLocalStorage().RB_Branch_id;
this.apipost('FinancialInstitutions_post_GetALLAccountList', {
TypeId: typeIdtwo,BranchId:platBranchId
}, res => {
if (res.data.resultCode == 1) {
this.PlatformAccountList = res.data.data;
this.addMsg.PlatformAccount=platformAccount;
}
}, err => {})
},
getScenicRefund (TCID) {
this.apipost(
'sellorder_get_GetScenicRefundList',
......@@ -2362,6 +2396,7 @@
this.showID = data
},
getRemarks (obj) {
console.log(obj,'ssss');
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
......@@ -2388,7 +2423,9 @@
let x = res.data.data.model
this.addMsg = x
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr
this.addMsg.PlatformAccount = ''
this.getScenicRefund(obj.tcid)
this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount);
this.SetOutCityId = res.data.data.SetOutCityId
this.reOutCityId = res.data.data.SetBackCityId
this.addMsg.CustomerType = x.CustomerType.toString()
......@@ -2404,6 +2441,7 @@
this.addMsg.BabyNum = x.BabyNum.toString()
this.IsChildrenTour = x.IsChildrenTour
this.IsBirdDiscount = x.IsBirdDiscount
this.stratPrice = res.data.data.modelPrice.GoAddPrice
if (this.stratPrice == 0) {
......@@ -2641,10 +2679,10 @@
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum)
this.addMsg.YSeatNum =
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)
var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
(Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
},
getTotalPrice () {
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
......@@ -2808,6 +2846,9 @@
}
this.getHouseNo()
},
changeSelect: function (){
this.$forceUpdate()
},
yzBigBed1 () {
let x =
Number(this.addMsg.AirticketNum) +
......@@ -2920,6 +2961,7 @@
this.addMsg.Commission = '0'
this.addMsg.BrandId = ''
this.addMsg.TradeWay = '2'
this.addMsg.PlatformAccount='';
this.addMsg.GuestNum = '0'
this.addMsg.IsChildrenTour = '0'
this.addMsg.OrderId = '0'
......
src/components/Ticketing/TicketManager.vue
View file @ a14f8357
......@@ -1579,9 +1579,9 @@
<el-button type="primary" icon="iconfont icon-img_delete_small" @click="DeleteAirticket(item.ID)"
style="margin-left:0;"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.TripItinerary==null||item.TripItinerary==''?'行程单上传':'行程单下载'"
<el-tooltip class="item" effect="dark" :content="item.TripItinerary==''?'行程单上传':'行程单下载'"
placement="top-start">
<el-button v-if="item.TripItinerary==null||item.TripItinerary==''" type="primary" icon="iconfont icon-upload"
<el-button v-if="item.TripItinerary==''" type="primary" icon="iconfont icon-upload"
style="margin-left:0;"
@click="outerVisible1=true,UploadItineraryMsg.ID=item.ID"></el-button>
<el-button v-else type="primary" icon="iconfont icon-xiazai2" style="margin-left:0;"
......@@ -2069,6 +2069,14 @@
<el-input v-model="sales.B2CPrice" @keyup.native="checkPrice(sales,'B2CPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="是否特惠" prop="IsDiscounts">
<el-select v-model="sales.IsDiscounts" :placeholder="$t('pub.pleaseSel')">
<el-option label="否" value="0" selected></el-option>
<el-option label="是" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
</ul>
</div>
......@@ -2255,7 +2263,8 @@
AirTicketId:0,
AirTicketNum:0,
B2BPrice:'',
B2CPrice:''
B2CPrice:'',
IsDiscounts:'0'
},
//1-一般导入，2-多航段导入
......@@ -2380,7 +2389,6 @@
this.Success("上传行程单成功!");
this.UploadItineraryMsg.ID = 0;
this.UploadItineraryMsg.TripItinerary = "";
this.getList();
}
this.outerVisible1 = false;
},
......@@ -3104,6 +3112,11 @@
this.sales.AirTicketNum = item.AirTicketScatterNum;
this.sales.B2BPrice = item.ScatterB2BPrice;
this.sales.B2CPrice = item.ScatterB2CPrice;
if(item.IsDiscounts!=null){
this.sales.IsDiscounts=item.IsDiscounts.toString();
}else{
this.sales.IsDiscounts='0';
}
},
//保存
saveSales(){
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a14f8357
......@@ -75,6 +75,9 @@
margin-right: 10px;
position: relative;
}
.TC_Content .avatar-uploader-icon{
height: auto;
}
</style>
<template>
<div class="TC_Content">
......@@ -330,6 +333,8 @@
<span v-if="item.IsB2B==0" title="内部团">内</span>
<span v-if="item.IsUnion==1&&item.UnionTypeStr==1" title="主" class="MainTeam">主</span>
<span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">联</span>
<span v-if="item.Status==2" title="结团">结团</span>
<span v-if="item.Status==1" title="销售">销售</span>
</div>
<div class="TCL-OutBranchName" title="销售公司">{{item.UnionBranchName}}</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
......@@ -501,6 +506,7 @@
<i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i> </p> <p>
<span>已报入</span>
<i>
{{item.OrderGuestNum}}
<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人
</i>
......@@ -511,7 +517,7 @@
</p>
<p class="travelnowrap">
<span>候补</span>
<span v-if="item.IsSubstitution==1" class="TCL-greenType">允许候补（候补{{item.SubstitutionCount}}人）</span>
<span v-if="item.IsSubstitution==1" class="TCL-greenType">允许候补（候补{{item.HBNum}}人）</span>
<span v-else class="TCL-redType">不允许候补</span>
</p>
<p>
......@@ -621,7 +627,11 @@
</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId)">
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">结团
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID)">
B2B预览
</el-dropdown-item>
<el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运
......@@ -642,7 +652,7 @@
<div class="TCL_remarkTitle">OP对内备注：</div>
<div class="TCL_Content">{{item.OPInnerRemark}}</div>
</div>
<div class="clearfix TCL-redType" v-if="item.DmcRemarkLast || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
<div class="clearfix TCL-redType" v-if="item.DmcRemarkLast || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
<div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
<a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
......@@ -1222,11 +1232,11 @@
}
})
},
goB2B(ConfigId) {
goB2B(ConfigId,tcid) {
var B2BDomain = this.CurrentUserInfo.B2BDomain
window.open(
'http://www.oytour.com/#/detailTwo/' +
encodeURIComponent(ConfigId) +
encodeURIComponent(ConfigId) + '/' + tcid +
'/preview',
'_blank'
)
......@@ -1479,7 +1489,7 @@
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WordTrip/";
this.UploadSelfFile(path, newArr, res => {
this.UploadSelfFileT(path, newArr, res => {
if (res.data.StatusCode == 1) {
that.queryCommonData.uploadLoading=true;
let uploadMsg = {
......@@ -1505,6 +1515,24 @@
}
})
},
//结团/正常
OutGroup(TCID,Status)
{
let msg = {
TCID: TCID,
Status: Status,
}
this.apipost('travel_post_SetPriceStatus', msg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getControlList()
this.queryCommonData.checkDialogAll = false
this.queryCommonData.ckedplat = []
} else {
this.Info(res.data.message)
}
})
},
},
filters: {
formatStartDate(value) {
......
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