Skip to content

S
SuperMan
Commit ce94c200 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

更新代码

parent 1b258bcc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 456 additions and 147 deletions
src/components/FinancialModule/OPRules.vue
View file @ ce94c200
......@@ -42,7 +42,7 @@
<tr>
<th>公司名称</th>
<th style="width:20%">线路名称</th>
<th>系列名称</th>
<th>目的</th>
<th>线控</th>
<th>助理</th>
<th>分负责OP</th>
......@@ -106,6 +106,11 @@
<el-option label='全线' :value='-1' :key='-1'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
</el-select>
</el-form-item>
<el-form-item label="目的地" prop="LineIdList">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList">
<el-option v-for="item in PlaceList" :label='item.PlaceName' :value='item.PlaceID' :key='item.PlaceID'></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="系列" v-show="form.LineIdList.length==1 && form.LineIdList[0]!=-1">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList" >
......@@ -227,6 +232,8 @@ export default {
departmentList:[],
stateShow:true,
tips:'',
PlaceList:[],
PlaceShow:false,
}
},
created(){
......@@ -240,6 +247,7 @@ export default {
},
methods:{
Delete(item) {
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
......@@ -260,6 +268,7 @@ export default {
.catch(() => {});
},
addRule(){
this.PlaceShow=false;
this.ruleVisible=true;
this.form={
BranchId:"",
......@@ -277,6 +286,7 @@ export default {
}
},
SetRules(item){
this.ruleVisible=true;
this.form={
Id:item.Id,
......@@ -294,6 +304,8 @@ export default {
FManagerMoney:item.FManagerMoney,
FInternMoney:item.FInternMoney,
}
this.form.LtIdList=item.LtIdList;
this.PlaceShow=true;
this.departmentMsg.RB_Branch_Id=item.BranchId;
this.getLineTeamList();
......@@ -367,6 +379,7 @@ export default {
},
//获取系列列表
getLineTeamList() {
this.PlaceList =[];
if(this.form.LineIdList.indexOf(-1)!=-1){
this.form.LineIdList=[-1];
this.form.LtIdList = [];
......@@ -376,6 +389,10 @@ export default {
this.form.LtIdList = [];
return;
}
if(this.form.LineIdList.indexOf(-1)==-1 && this.form.LineIdList.length==1){
let id= this.form.LineIdList[0];
this.getLinePlaceList(id);
}
let msg = {
lineID: this.form.LineIdList[0],
}
......@@ -384,6 +401,20 @@ export default {
this.LineTeamList = res.data.data;
}
})
},
//获取目的地
getLinePlaceList(id) {
if(!this.PlaceShow){
this.form.LtIdList=[];
}
let msg = {
lineID: id,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.PlaceList = res.data.data;
}
})
},
getCompany() {
let userInfo = this.getLocalStorage()
......
src/components/Hotel/roomReservationsDetails.vue
View file @ ce94c200
......@@ -118,7 +118,6 @@
<td v-if="childIndex==0" :rowspan="6">
{{subItem.RealityHouseTypeCount}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<table class="hotelTable">
<tr>
......@@ -199,10 +198,24 @@
</td> -->
<!-- 单价/每人 -->
<td>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
:disabled="IsEditHotel==0?true:false">
</el-input>
<template v-if="childIndex==1">
<template v-if="CurrentUserInfo.EmployeeId == 615">
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
</template>
<template v-else>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
:disabled="(IsEditHotel==0||childItem.IsHaveStockPrice==1)?true:false">
</el-input>
</template>
</template>
<template v-else>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
:disabled="IsEditHotel==0?true:false">
</el-input>
</template>
</td>
<!-- 免减人数 -->
<td>
......@@ -583,7 +596,16 @@
this.list[this.findex].HotelOrderList[this.childIndex].NewHotelId = ckedObj.ID;
this.list[this.findex].HotelOrderList[this.childIndex].PayStyle = ckedObj.PayStyle;
this.list[this.findex].HotelOrderList[this.childIndex].PayStyleExt = ckedObj.PayStyle;
this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach(subItem => {
this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach((subItem,subIndex) => {
//判断是否有库存价格
if(subIndex==1 && ckedObj.CostPrice>0)
{
subItem.IsHaveStockPrice=1;
}
else
{
subItem.IsHaveStockPrice=0;
}
subItem.UnitPrice = ckedObj.CostPrice;
subItem.RebateRatio = ckedObj.RebateRatio;
});
......@@ -732,9 +754,8 @@
ID: subItem.NewHotelId
});
//默认成日元
if(subItem.CurrencyId==0)
{
subItem.CurrencyId=3;
if (subItem.CurrencyId == 0) {
subItem.CurrencyId = 3;
}
this.calculationPrice(subItem);
subItem.OrderDetailsList.forEach((x, index1) => {
......@@ -774,7 +795,7 @@
return item.ID === obj.CurrencyId; //筛选出匹配数据
});
}
//日元
let jpaObj = this.allCurrencyList.find(item => {
return item.ID === 3; //筛选出匹配数据
......@@ -805,13 +826,12 @@
else if (currentObj.ID == 3) {
obj.NewTotalPrice = "";
} else {
if(currentObj.CurrentRate>1)
{
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
}
else
{
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
if (currentObj.CurrentRate > 1) {
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) / currentObj.CurrentRate)
.toFixed(2);
} else {
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) * currentObj.CurrentRate)
.toFixed(2);
}
}
} else {
......
src/components/SalesModule/demandInquiry.vue
View file @ ce94c200
......@@ -72,7 +72,7 @@
placeholder="请选择"
v-for="item in AppCoustomer"
:key="item.customerId"
:label="item.customerName"
:label="`${item.customerName}(${item.contact})`"
:value="item.customerId">
</el-option>
</el-select>
......@@ -197,8 +197,10 @@ export default {
},
getAppCoustomer(){ // 获取客户列表
this.apipost('app_get_my_select_coustomer',{},res=>{
// console.log(res,"safaf")
if(res.data.resultCode==1){
this.AppCoustomer = res.data.data;
// console.log("this.AppCoustomer",this.AppCoustomer)
}else{
this.$message.error(res.data.message)
}
......
src/components/SalesModule/groupTourOrder.vue
View file @ ce94c200
......@@ -736,9 +736,9 @@
}
.GO_Contract{
color:blue;
display: block;
display: inline-block;
cursor: pointer;
max-width: 200px;
margin-right:20px;
}
.needfenshu{
margin-top: 10px;
......@@ -1846,8 +1846,14 @@
</span>
</div>
<span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
<span v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</span>
<!-- <div v-if="item.ContractNum.length==0">
<span class="GO_Contract" @click="goContract(item,{})">领取合同</span>
</div> -->
<!-- <div v-else>
<span v-for="sItem in childItem.ContractNum" class="GO_Contract" @click="goContract(item,sItem)">
{{sItem.Client_Name+''+sItem.ContractNum}}
</span>
</div> -->
</td>
</tr>
<tr>
......@@ -2394,11 +2400,12 @@
});
},
//跳转至领取合同
goContract(item){
goContract(item,sItem){
let routeData = this.$router.resolve({
name: 'TravelContractNew',
query: {
TCID: item.tcid,
guestId:sItem.GuestId,
orderID:item.orderId,
blank: 'y'
}
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ ce94c200
......@@ -871,9 +871,9 @@
}
.GO_Contract{
color:blue;
display: block;
display: inline-block;
cursor: pointer;
max-width: 200px;
margin-right: 20px;
}
.SQguestList{
display: flex;
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ ce94c200
......@@ -23,6 +23,12 @@
</el-select>
</span>
</li>
<li>
<span>
<em>合团号</em>
<el-input v-model='msg.CombinationNum'></el-input>
</span>
</li>
<li>
<span>
<em>团号</em>
......@@ -80,7 +86,7 @@
{{subItem.StartCityNames}}
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.TCNUMS}}
{{subItem.TCNUMS}}({{subItem.TCID}})
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.LeaderName}}
......@@ -94,7 +100,7 @@
{{subItem.StartCityNames}}
</td>
<td>
{{subItem.TCNUMS}}
{{subItem.TCNUMS}}({{subItem.TCID}})
</td>
<td>
{{subItem.LeaderName}}
......@@ -147,7 +153,8 @@
</div>
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
<p style="cursor: pointer;color:blue;" @click="isShowFinaceDailog=true,CurrentOutItem=outItem">生成单据</p>
<p style="cursor: pointer;color:blue;" @click="isShowFinaceDailog=true,CurrentOutItem=outItem">生成单据
</p>
<p style="cursor: pointer;color:blue;margin-top:5px;"
@click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)">
选择购物店</p>
......@@ -210,14 +217,15 @@
<template>
<el-form label-width="100px">
<el-form-item label="付款方式">
<el-select v-model="PayType">
<el-option label="常规付款" :value="1" :key="1"></el-option>
<el-option label="资金池付款" :value="2" :key="2"></el-option>
</el-select>
<el-select v-model="PayType">
<el-option label="常规付款" :value="1" :key="1"></el-option>
<el-option label="资金池付款" :value="2" :key="2"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="isShowFinaceDailog=false,CurrentOutItem={}">{{$t('pub.cancelBtn')}}</button>
<button class="hollowFixedBtn"
@click="isShowFinaceDailog=false,CurrentOutItem={}">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="CreateBill()">{{$t('pub.sureBtn')}}</button>
</div>
</template>
......@@ -229,7 +237,7 @@
data() {
return {
loading: false,
PayType:1,//付款方式
PayType: 1, //付款方式
msg: {
pageIndex: 1,
pageSize: 8,
......@@ -241,16 +249,18 @@
EndDate: '',
currentPage: 1,
total: 0,
CombinationNum:"",//合团号
TCNUM:"",//团号
},
LineList: [],
LineTeamList: [],
shopDataList: [],
CreateHandBillList: [],
zhuanjiaoBox: false,
isShowFinaceDailog:false,//是否显示生成财务单据对话框
isShowFinaceDailog: false, //是否显示生成财务单据对话框
CreateHandBillID: '',
CreateHandObj: {},
CurrentOutItem:{}//当前选中的团
CurrentOutItem: {} //当前选中的团
}
},
methods: {
......@@ -425,17 +435,27 @@
var nMsg = {
TCIDs: that.CurrentOutItem.TCIDs,
PayType:that.PayType,
PayType: that.PayType,
uid: that.getLocalStorage().EmployeeId
};
let fileName = "生成[" + that.CurrentOutItem.NewCombinationNum + "]购物店数据.xls";
that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
res => {
that.loading = false;
this.isShowFinaceDailog=false;
that.Success("导入成功!");
that.getList();
});
that.apipost("dmcstatistics_post_CheckShopDetailsDMCRate", nMsg, res => {
if (res.data.resultCode == 1) {
if (res.data.data == 0) {
that.Error("请检查汇率有为0的数据,请先在【操作】里面修改汇率再生成财务单据!");
that.loading = false;
that.isShowFinaceDailog = false;
} else {
let fileName = "生成[" + that.CurrentOutItem.NewCombinationNum + "]购物店数据.xls";
that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
res => {
that.loading = false;
this.isShowFinaceDailog = false;
that.Success("导入成功!");
that.getList();
});
}
}
});
});
},
},
......@@ -448,8 +468,9 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
// this.msg.StartDate='';
// this.msg.TCNUM='NRTCA08190613A';
this.msg.LineId=14;//默认日本线
// this.msg.StartDate = '';
// this.msg.TCNUM = 'NRTCA07190704A';
this.getLineList();
this.getList();
},
......@@ -464,7 +485,6 @@
.more_td>div {
height: 40px;
/*line-height: 40px;*/
border-bottom: 1px solid rgb(204, 204, 204);
}
......
src/components/ShoppingStore/ShoppingReimbursementDetails.vue
View file @ ce94c200
......@@ -10,14 +10,14 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; ">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading="loading">
<tr>
<th colspan="6">导游操作</th>
<th colspan="5">导游操作</th>
<th colspan="8">地接OP</th>
</tr>
<tr>
<th width="120" style="display:none;">进店团号</th>
<th width="180">店名</th>
<th width="90">公司</th>
<th width="120">进店时间</th>
<th width="120" style="display:none">进店时间</th>
<th width="80">进店人数</th>
<th width="100">总金额</th>
<th width="100">佣金领取状况</th>
......@@ -49,7 +49,7 @@
{{subItem.BName}} &nbsp;
<span @click="DeleteItem(subItem)" style="color:blue;cursor:pointer;text-decoration:underline;">删除</span>
</td>
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length" style="display:none">
<el-input v-model="item.ShopDetailsList[0].EnterTime" placeholder="2019-01-01"
@change="formatDateTime(item.ShopDetailsList[0].EnterTime,item)"></el-input>
<!--EnterTime 进店时间-->
......
src/components/TravelContractDetail.vue
View file @ ce94c200
......@@ -304,16 +304,16 @@
</style>
<template>
<div class="TD_MainContent">
<div class="TD_MainContent" v-loading="pdfLoading">
<div class="container-fluid">
<div class="block mtop15">
<div class="blockTitle">
<span class="icon"><i class="iconfont icon-wenjian"></i></span>
<h2>合同详情
<span>
<input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
<input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()" value="作废" style="display:none;" />
<input type="button" class="TCbtn-info" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()" value="客户签字" />
<input type="button" class="TCbtn-info" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
<input type="button" class="TCbtn-info" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
</span>
</h2>
</div>
......@@ -858,7 +858,8 @@
//查询参数
msg: {
TCID: 0,
orderID: 0
orderID: 0,
guestId:0
},
//数据源
dataList: [],
......@@ -910,6 +911,7 @@
let urlObj = this.domainManager();
let msg = {
TCID: this.$route.query.TCID,
GuestId: this.msg.guestId,
orderID: this.$route.query.orderID,
};
this.pdfLoading=true;
......@@ -923,6 +925,7 @@
"msg": msg
}
}).then(res => {
this.pdfLoading = false
if (res.data.resultCode === 1) {
let sign = title + "V2"
const a = document.createElement('a');
......@@ -933,7 +936,6 @@
} else {
this.Error('PDF获取失败');
}
this.pdfLoading = false
}).catch(err => {
})
......@@ -1411,6 +1413,7 @@
mounted() {
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.msg.guestId = this.$route.query.guestId;
this.getList();
this.GetTrip(0,this.msg.TCID);
}
......
src/components/TravelContractNew.vue
View file @ ce94c200
This diff is collapsed.
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ ce94c200
......@@ -122,21 +122,30 @@
},
//保存数据
SaveData() {
var currencyNumList = [];
if (this.CurrencyNumberListExt != null && this.CurrencyNumberListExt.length > 0) {
this.CurrencyNumberListExt.forEach((item, index) => {
item.currencyNumberList.forEach(subItem => {
currencyNumList.push(subItem);
});
});
}
var nObj = {
config: this.postData,
dayCostPriceList: this.dayCostPriceList,
otherPrice: this.otherPrice,
teamPrice: this.teamPrice,
CostCurrencyList: this.CostCurrencyList,
CostNumberList: this.CostNumberList
CostNumberList: this.CostNumberList,
CurrencyNumberListExt: currencyNumList
};
console.log("请求参数", nObj);
this.apipost(
"travel_post_SetConfigOffer_V2", nObj,
res => {
if (res.data.resultCode == 1) {
this.Success(res.date.message);
this.goUrl('newQuotation');
this.Success(res.data.message);
this.goUrl('newQuotation');
} else {
this.Error(res.data.message);
}
......@@ -161,9 +170,38 @@
"travel_get_GetMyTravelInfo_V2",
msg,
res => {
console.log("res.data.data", res.data);
if (res.data.resultCode == 1) {
var tempData = res.data.data;
if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID;
}
if (tempData.LineId && tempData.LineId > 0) {
this.postData.LineId = tempData.LineId;
}
if (tempData.LineteamId && tempData.LineteamId > 0) {
this.postData.LineteamId = tempData.LineteamId;
}
if (tempData.CSeat && tempData.CSeat > 0) {
this.postData.CSeat = tempData.CSeat;
}
if (tempData.FSeat && tempData.FSeat > 0) {
this.postData.FSeat = tempData.FSeat;
}
if (tempData.YSeat && tempData.YSeat > 0) {
this.postData.YSeat = tempData.YSeat;
}
if (tempData.LowNum && tempData.LowNum > 0) {
this.postData.LowNum = tempData.LowNum;
}
if (tempData.Title && tempData.Title != '') {
this.postData.Title = tempData.Title;
}
if (tempData.DayNum && tempData.DayNum > 0) {
this.postData.DayNum = tempData.DayNum;
}
if (tempData.NightNum && tempData.NightNum > 0) {
this.postData.NightNum = tempData.NightNum;
}
this.LineList = tempData.LineList;
if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
0) {
......@@ -175,21 +213,31 @@
if (tempData.teamPrice) {
this.teamPrice = tempData.teamPrice;
}
if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) {
this.CostNumberList = tempData.CostNumberList;
}
if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length >
0) {
this.CostCurrencyList = tempData.CostCurrencyList;
}
if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData
.CurrencyNumberListExt.length > 0) {
this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
}
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
},
created() {
this.getPostData();
},
components: {
DirectQuotation: DirectQuotation
}
}
};
</script>
</script>
\ No newline at end of file
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ ce94c200
......@@ -139,47 +139,20 @@
<div>{{item.CreateUserName}}</div>
</div>
</div>
<div>
<span v-if="item.TravelState==2" class="retract opbd" @click="revokeInfo(item.ID)">
<el-tooltip class="item" effect="dark" content="待审核" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-chehui"></i>
</el-tooltip>
</span>
<span class="openGroup opbd" v-if="item.TravelState==3&&item.OpenState==2" @click="goToOpenTravel('TravelManager',item.ID,item.OpenState)">
<span class="openGroup opbd" @click="goToOpenTravel('TravelManager2',item.ID,item.OpenState)">
开
</span>
<span class="openGroup opbd" v-if="item.TravelState==3&&item.OpenState==2">
<el-tooltip class="item" effect="dark" content="查看报价单" placement="top-start" popper-class="max-w250">
<span @click="goSubInfo('QuotationDetails',item.ID)">查</span>
</el-tooltip>
</span>
<span class="openGroup opbd" v-if="item.TravelState==5" @click="changeState(item.ID)">
<el-tooltip class="item" effect="dark" content="提交审核" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-img_bdsc"></i>
</el-tooltip>
</span>
<span class="bianji opbd" @click="goUrl('MakeQuotation',item.ID,false)" v-if="item.TravelState==4||item.TravelState==1||item.TravelState==5">
<span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)" >
<el-tooltip class="item" effect="dark" content="修改" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i>
</el-tooltip>
</span>
<span class="openGroup opbd" @click="goUrl('MakeQuotation',item.ID,true)">
<el-tooltip class="item" effect="dark" content="复制" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-copy"></i>
</el-tooltip>
</span>
<span class="openGroup opbd" @click="goUrlBo('CoastCountPage')">
<el-tooltip class="item" effect="dark" content="报价单" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-web-icon-"></i>
</el-tooltip>
</span>
<span class="QT-delete opbd" @click="delQuotation(item.ID)" v-if="item.TravelState==4||item.TravelState==1||item.TravelState==5">
<span class="QT-delete opbd" @click="delQuotation(item.ID)" >
<el-tooltip class="item" effect="dark" content="删除" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-shanchu"></i>
</el-tooltip>
</span>
</div>
</div>
</li>
......@@ -295,7 +268,7 @@
//初始化表格数据
getList() {
this.loading = true;
this.apipost("travel_get_GetTravelOfferPageList", this.queryData, res => {
this.apipost("travel_get_GetTravelOfferPageList_V2", this.queryData, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.queryData.total = res.data.data.count;
......@@ -467,7 +440,8 @@
name: path,
query: {
configId: configId,
openState: openState
openState: openState,
isOffer:1
}
});
} else {
......
src/components/administrative/ElectronicAudit.vue
View file @ ce94c200
......@@ -160,6 +160,7 @@ export default {
name: 'TravelContractDetail',
query: {
TCID: item.tcid,
guestId:item.guestId,
orderID: item.orderId,
blank: "y",
}
......
src/components/clientConfirm.vue
View file @ ce94c200
......@@ -276,11 +276,11 @@
<template>
<div class="dic_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 -->
<div v-show="signShow" class="signSpan">
<div v-show="signShow&&dataList.companySignature!=''" class="signSpan">
<div @click="goUrl" class="sign">
<!-- <span><span class="sp1"></span></p> -->
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem">签字</span>
<span style="font-size:2rem" >签字</span>
</div>
</div>
<!-- 开始进入弹窗 -->
......@@ -1522,7 +1522,8 @@
//查询参数
msg:{
TCID:0,
orderID:0
orderID:0,
guestId:0
},
//数据源
dataList:[],
......@@ -2077,6 +2078,7 @@
mounted() {
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.msg.guestId = this.$route.query.guestId;
var h = window.screen.height;
var cHeight=document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height=900+'px';
......
src/components/commonPage/commonShouSun.vue
View file @ ce94c200
......@@ -65,7 +65,7 @@
<tr>
<td>
<template v-if="Type==2">
<el-input class="w135" v-model="dataList.LossTicketMoney" @keyup.native="checkPrice(dataList,'LossTicketMoney'),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
<el-input class="w135" v-model="dataList.LossTicketMoney" @keyup.native="checkPrice(dataList,'LossTicketMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
</template>
<template v-else>
<span v-if="dataList.TicketIsSet==1">{{dataList.LossTicketMoney}}</span>
......@@ -74,7 +74,7 @@
</td>
<td>
<template v-if="Type==3">
<el-input class="w135" v-model="dataList.LossVisaMoney" @keyup.native="checkPrice(dataList,'LossVisaMoney'),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
<el-input class="w135" v-model="dataList.LossVisaMoney" @keyup.native="checkPrice(dataList,'LossVisaMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
</template>
<template v-else>
<span v-if="dataList.VisaIsSet==1">{{dataList.LossVisaMoney}}</span>
......@@ -83,7 +83,7 @@
</td>
<td>
<template v-if="Type==4">
<el-input class="w135" v-model="dataList.LossDiJieMoney" @keyup.native="checkPrice(dataList,'LossDiJieMoney'),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
<el-input class="w135" v-model="dataList.LossDiJieMoney" @keyup.native="checkPrice(dataList,'LossDiJieMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
</template>
<template v-else>
<span v-if="dataList.DiJieIsSet==1">{{dataList.LossDiJieMoney}}</span>
......@@ -92,7 +92,7 @@
</td>
<td>
<template v-if="Type==1">
<el-input class="w135" v-model="dataList.LossOPMoney" @keyup.native="checkPrice(dataList,'LossOPMoney'),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
<el-input class="w135" v-model="dataList.LossOPMoney" @keyup.native="checkPrice(dataList,'LossOPMoney',true),getTotalSun(dataList)" placeholder="请输入" type="text" ></el-input>
</template>
<template v-else>
<span v-if="dataList.OPIsSet==1">{{dataList.LossOPMoney}}</span>
......
src/components/index.vue
View file @ ce94c200
......@@ -1412,12 +1412,13 @@ export default {
};
document.addEventListener(visibilityChangeEvent, onVisibilityChange);
// console.log('initIM',this.firstMenuList.indexOf('IM'))
if(!localStorage.menu)
this.$store.dispatch("connect");
else{
if(!localStorage.menu){
//this.$store.dispatch("connect");
let aaa=0
}else{
this.firstMenuList=JSON.parse(localStorage.menu)
if(this.firstMenuList.indexOf('IM')!=-1){
this.$store.dispatch("connect");
//this.$store.dispatch("connect");
}
}
this.userInfo = this.getLocalStorage();
......
src/components/leaderPay2.vue
View file @ ce94c200
......@@ -1725,7 +1725,7 @@
}
Diningdest[i].row = row
}
console.log(Diningdest)
// console.log(Diningdest)
this.DiningDataList = this.unique(Diningdest, 'id');
// this.DiningDataList = Diningdest
//票
......@@ -1735,7 +1735,7 @@
ScenicList.push(res.data.data.ScenicList[i].ScenicStatisticsList[o])
}
}
console.log(ScenicList)
// console.log(ScenicList)
var Scenicmap = {},
Scenicdest = [];
for (var i = 0; i < ScenicList.length; i++) {
......@@ -1783,24 +1783,38 @@
HotelList.push(res.data.data.HotelOrderListReport[i].HotelOrderList[o])
}
}
var Hotelmap = {},
var Hotelmap = {},Hotelmap2 = {},
Hoteldest = [];
for (var i = 0; i < HotelList.length; i++) {
var ai = HotelList[i];
if (!Hotelmap[ai.CheckInDateStr]) {
Hoteldest.push({
CheckInDateStr: ai.CheckInDateStr,
NewHotelId: ai.NewHotelId,
data: [ai]
});
Hotelmap[ai.CheckInDateStr] = ai;
} else {
Hoteldest.push({
CheckInDateStr: ai.CheckInDateStr,
NewHotelId: ai.NewHotelId,
data: [ai]
});
Hotelmap[ai.CheckInDateStr] = ai;
Hotelmap2[ai.NewHotelId] = ai;
}
else if (Hotelmap[ai.CheckInDateStr] && !Hotelmap2[ai.NewHotelId]) {
Hoteldest.push({
CheckInDateStr: ai.CheckInDateStr,
NewHotelId: ai.NewHotelId,
data: [ai]
});
Hotelmap2[ai.NewHotelId] = ai;
}
else {
for (var j = 0; j < Hoteldest.length; j++) {
var dj = Hoteldest[j];
if (dj.CheckInDateStr == ai.CheckInDateStr && dj.NewHotelId == ai.NewHotelId) {
dj.data.push(ai);
break;
}
}
}
}
......@@ -1811,7 +1825,8 @@
}
Hoteldest[i].row = row
}
this.HotelDataList = Hoteldest
this.HotelDataList = Hoteldest;
console.log("this.HotelDataList",this.HotelDataList)
} else {
this.$message.error(res.data.message);
}
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ ce94c200
......@@ -84,8 +84,9 @@
},
data() {
return {
IsShowBtn:false,//是否显示按钮
IsShowBtn: false, //是否显示按钮
ConfigId: 0, //地址栏查询参数
IsHaveOffer: 0, //是否有报价单
NewConfigId: "", //configID加密后的字符串【预览使用】
TCNUM: '', //团控列表传过来的tcnum
NoticeParameters: {
......@@ -135,7 +136,7 @@
IsUpdateHotel: 0,
OpenTeamDescribe: "", //开团备注
IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息
DayNum:0,//行程天数
DayNum: 0, //行程天数
},
//行程
FeatureData: {
......@@ -238,10 +239,13 @@
/*获取组件配置信息【回调方法】*/
getConfig(configObj) {
this.PostConfig = configObj;
this.NoticeParameters.ConfigId = this.PostConfig.ConfigId;
this.NoticeParameters.CountryID = this.PostConfig.CountryID;
this.NoticeParameters.IsDirect = this.PostConfig.IsDirect;
this.NoticeParameters.LineId = this.PostConfig.LineId;
//没有报价单根据线路设置直采和非直采方式生成线路行程
if (this.IsHaveOffer == 0) {
this.NoticeParameters.ConfigId = this.PostConfig.ConfigId;
this.NoticeParameters.CountryID = this.PostConfig.CountryID;
this.NoticeParameters.IsDirect = this.PostConfig.IsDirect;
this.NoticeParameters.LineId = this.PostConfig.LineId;
}
if (this.ConfigId == 0) {
this.FeatureData.LineName = this.PostConfig.LineName;
this.FeatureData.Subtitle = this.PostConfig.LineTeamName;
......@@ -370,11 +374,10 @@
if (TripFeature.FeatureType >= 4) {
var htmlObj = document.getElementById("newFeatureBox");
if (htmlObj && htmlObj.innerHTML != null && htmlObj.innerHTML != "") {} else {
//更新行程特色
if(this.journeyList.IsUpdateTrip==1)
{
this.MsgBus.$emit('comUpTravel');
}
//更新行程特色
if (this.journeyList.IsUpdateTrip == 1) {
this.MsgBus.$emit('comUpTravel');
}
}
}
......@@ -404,7 +407,6 @@
}
basicData.TeamType = this.TeamType;
basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
this.apipost(
"travel_post_SetTravelConfigInfo",
basicData,
......@@ -686,7 +688,7 @@
this.PostConfig.VideoStr = tempData.VideoStr;
this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
this.PostConfig.IsOpenHotel = tempData.IsOpenHotel;
this.PostConfig.DayNum=tempData.DayNum;//行程天数
this.PostConfig.DayNum = tempData.DayNum; //行程天数
this.NoticeParameters.ConfigId = tempData.ConfigId;
......@@ -709,6 +711,8 @@
this.PostConfig.IsSubstitution = tempData.IsSubstitution;
this.PostConfig.IsDirect = tempData.IsDirect;
this.PostConfig.PriceIsDirect = tempData.PriceIsDirect;
//是否有报价单
this.IsHaveOffer = tempData.IsHaveOffer;
if (tempData.FlightList != null) {
this.PostConfig.FlightList = tempData.FlightList;
......@@ -753,7 +757,7 @@
this.Error(res.data.message);
}
this.loading = false;
this.IsShowBtn=true;
this.IsShowBtn = true;
},
err => {}
);
......@@ -784,7 +788,7 @@
this.Error(res.data.message);
}
this.loading = false;
this.IsShowBtn=true;
this.IsShowBtn = true;
},
err => {}
);
......
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