Skip to content

S
SuperMan
Commit ef202e31 authored by 王悦's avatar 王悦
Browse files
Options

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

parents c04ef2cc 328824da
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3986 additions and 1213 deletions
src/assets/css/cssReset.css
View file @ ef202e31
...@@ -80,7 +80,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;} ...@@ -80,7 +80,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
.w30{width: 30px!important;} .w30{width: 30px!important;}
.w40{width: 40px!important;} .w40{width: 40px!important;}
.w50{width: 50px!important;} .w50{width: 50px!important;}
.w60{width: 50px!important;} .w60{width: 60px!important;}
.w69{width: 69px!important;} .w69{width: 69px!important;}
.w80{width: 80px!important;} .w80{width: 80px!important;}
.w89{width: 89px!important;} .w89{width: 89px!important;}
......
src/components/FinancialModule/CapitalAllocation.vue
View file @ ef202e31
...@@ -15,16 +15,43 @@ ...@@ -15,16 +15,43 @@
.page_CapitalAllocation .page_CapitalAllocation_list { .page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%; width: 100%;
} }
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.edit{
width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
outline: none;
}
.page_CapitalAllocation i.edit{background-color: #00C6FF;font-size: 16px;}
.page_CapitalAllocation i.edit:hover{background-color: #59daff}
.page_CapitalAllocation i.edit:active{background-color: #00b8ec}
.page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;} .page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;}
.page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97} .page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97}
.page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79} .page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79}
.page_CapitalAllocation ._btn_group{font-size: 14px;}
.page_CapitalAllocation .icon-daiqueren{color: #4BCA81}
.page_CapitalAllocation .icon-yiqueren{color: #4BCA81}
.page_CapitalAllocation .icon-yiquxiao{color: #959595}
.page_CapitalAllocation .icon-shenhebohui{color: #E95252}
.page_CapitalAllocation .icon-icon-zancun{color: #FF9C01}
.page_CapitalAllocation .text_d{text-decoration: underline;cursor: pointer;}
.InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
</style> </style>
<template> <template>
<div class="page_CapitalAllocation"> <div class="page_CapitalAllocation">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<input type="button" class="normalBtn" value="新增" @click="goURL"/> <input type="button" class="normalBtn" value="新增" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/> <input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
</li> </li>
</ul> </ul>
...@@ -116,11 +143,11 @@ ...@@ -116,11 +143,11 @@
<th>单号</th> <th>单号</th>
<th>金额</th> <th>金额</th>
<th>实付</th> <th>实付</th>
<th>原币金额</th> <!-- <th>原币金额</th> -->
<th>交易日期</th> <th>交易日期</th>
<th>创建时间</th> <th>创建时间</th>
<th>创建人</th> <th>创建人</th>
<th>备注</th> <!-- <th>备注</th> -->
<th>状态</th> <th>状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
...@@ -128,14 +155,46 @@ ...@@ -128,14 +155,46 @@
<td>{{item.FrID}}</td> <td>{{item.FrID}}</td>
<td>{{item.Money}}</td> <td>{{item.Money}}</td>
<td>{{item.PayMoney}}</td> <td>{{item.PayMoney}}</td>
<td>{{item.OriginalMoney}}</td> <!-- <td>{{item.OriginalMoney}}</td> -->
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
<td>{{item.Description}}</td> <!-- <td>{{item.Description}}</td> -->
<td>{{item.StatusStr}}</td> <td>
<i v-if="item.Status==1" class="iconfont icon-daiqueren"></i>
<i v-if="item.Status==4" class="iconfont icon-yiquxiao"></i>
<i v-if="item.Status==2" class="iconfont icon-yiqueren"></i>
<i v-if="item.Status==3" class="iconfont icon-shenhebohui"></i>
<i v-if="item.Status==0 || item.Status==5" class="iconfont icon-zancun"></i>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'>
<li class="changLogList_l" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C" class="_radius_green"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
<span slot="reference" class="text_d _font_init" @click="Financial_post_GetFinancLogList(item.FrID)">{{item.StatusStr}}</span>
</el-popover>
</td>
<td> <td>
<i class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i> <el-tooltip class="item" effect="dark" content="修改" placement="top">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="详情" placement="top">
<i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID, msg.pageIndex)"></i>
</el-tooltip>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -184,7 +243,9 @@ export default { ...@@ -184,7 +243,9 @@ export default {
productionDate2: [], productionDate2: [],
StatusList: [], StatusList: [],
EmployeeList: [], EmployeeList: [],
GetFinancLogList: [],
loading: true, loading: true,
LogLoading: true,
} }
}, },
created(){ created(){
...@@ -199,7 +260,7 @@ export default { ...@@ -199,7 +260,7 @@ export default {
} }
this.loading= true this.loading= true
this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{ this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{
if (res.resultCode ===1){ if (res.data.resultCode===1){
this.dataList = res.data.data.pageData this.dataList = res.data.data.pageData
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
...@@ -257,9 +318,23 @@ export default { ...@@ -257,9 +318,23 @@ export default {
} }
}, err => {}) }, err => {})
}, },
goURL: function () { goURL: function (url, edit, id) {
this.$router.push({ name: "addCapitalAllocation",query:{blank:'y',tab:'新增资金调拨'} }) this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
},
Financial_post_GetFinancLogList: function(id){ // 获取单据日志
if(this.checkboxShow) return
this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.LogLoading = false;
this.GetFinancLogList = data;
} }
}, err => {})
},
}, },
mounted(){ mounted(){
this.getCompanyList() this.getCompanyList()
......
src/components/LeaderManagement/leaderPrint.vue 0 → 100644
View file @ ef202e31
This diff is collapsed.
src/components/SalesModule/productQuery.vue
View file @ ef202e31
...@@ -594,6 +594,9 @@ ...@@ -594,6 +594,9 @@
</li> </li>
</ul> </ul>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total="total">
</el-pagination>
<div class="productQueryList" v-loading='loading'> <div class="productQueryList" v-loading='loading'>
<ul v-if="list.length!=0"> <ul v-if="list.length!=0">
<li v-for="(item,index) in list" :key="index"> <li v-for="(item,index) in list" :key="index">
...@@ -771,16 +774,13 @@ ...@@ -771,16 +774,13 @@
</p> </p>
</div> </div>
<div class="d7"> <div class="d7">
<!--<p><input type="button" :class="{normalBtn:true,disabledBtn:item.IsSubstitution!=1&&item.SurplusSeat==0}" :disabled="item.IsSubstitution!=1&&item.SurplusSeat==0" value="立即下单" @click="goBuy(item)"></p>
<p><input type="button" class="hollowFixedBtn" value="下载行程"></p>
<p><input type="button" class="hollowFixedBtn" value="分享行程"></p>
<p><input type="button" class="hollowFixedBtn" value="查看报名"></p> -->
<el-button-group style="display:block;"> <el-button-group style="display:block;">
<el-tooltip class="item" effect="dark" content="查看报名" placement="top-start"> <el-tooltip class="item" effect="dark" content="查看报名" placement="top-start">
<el-button @click="goUrl('groupTourOrderByTuan',item.TCID,item.TCNUM)" type="primary" style='background:#00C6FF; border-color:#00C6FF' <el-button @click="goUrl('groupTourOrderByTuan',item.TCID,item.TCNUM)" type="primary" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-sousuo"></el-button> icon="iconfont icon-sousuo"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="立即下单" placement="top-start" v-if="item.IsPayOrder!==1"> <!--关内团后不能在报名-->
<el-tooltip class="item" effect="dark" content="立即下单" placement="top-start" v-if="item.IsPayOrder!==1 && item.IsB2B===1">
<el-button type="primary" style='background:#F16C3C; border-color:#F16C3C' v-if="!TCIDList" icon="iconfont icon-fukuan1" <el-button type="primary" style='background:#F16C3C; border-color:#F16C3C' v-if="!TCIDList" icon="iconfont icon-fukuan1"
@click="goBuy(item)"></el-button> @click="goBuy(item)"></el-button>
</el-tooltip> </el-tooltip>
...@@ -832,7 +832,7 @@ ...@@ -832,7 +832,7 @@
</div> </div>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total> :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center> <el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center>
<commonTeamInfo ref="comTeam"></commonTeamInfo> <commonTeamInfo ref="comTeam"></commonTeamInfo>
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ ef202e31
...@@ -87,16 +87,19 @@ ...@@ -87,16 +87,19 @@
{{item.GuideName}} {{item.GuideName}}
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].ShopNum:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].ShopNum:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopName}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopName}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterTimeStr:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterTimeStr:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterNum:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterNum:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList"> <template v-for="subItem in item.CommonReport.PriceShopList">
...@@ -110,7 +113,8 @@ ...@@ -110,7 +113,8 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--佣金领取状况--> <!--佣金领取状况-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].CommissionStatusStr:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].CommissionStatusStr:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--凭证上传--> <!--凭证上传-->
...@@ -127,7 +131,8 @@ ...@@ -127,7 +131,8 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--导游佣金调整--> <!--导游佣金调整-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].GuideCommission:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].GuideCommission:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList"> <template v-for="subItem in item.CommonReport.PriceShopList">
...@@ -137,15 +142,18 @@ ...@@ -137,15 +142,18 @@
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--其余扣除(返佣余额)--> <!--其余扣除(返佣余额)-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].OtherDeduct:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].OtherDeduct:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--返佣总计(返佣余额)--> <!--返佣总计(返佣余额)-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].BackTotalMoney:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].BackTotalMoney:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--汇率--> <!--汇率-->
<div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].DMCRate:""}}</div> <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null &&
subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].DMCRate:""}}</div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<!--地接OP凭证--> <!--地接OP凭证-->
...@@ -154,8 +162,8 @@ ...@@ -154,8 +162,8 @@
v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p> v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
</div> </div>
</td> </td>
<td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0' > <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<template v-for="subItem in item.CommonReport.PriceShopList" > <template v-for="subItem in item.CommonReport.PriceShopList">
<div> <div>
<!--subItem.ShopDetailsList--> <!--subItem.ShopDetailsList-->
<p style="cursor: pointer;color:blue;" @click="CreateBill(subItem.ShopDetailsList,outItem.StaticsReportList)">生成单据</p> <p style="cursor: pointer;color:blue;" @click="CreateBill(subItem.ShopDetailsList,outItem.StaticsReportList)">生成单据</p>
...@@ -313,7 +321,9 @@ ...@@ -313,7 +321,9 @@
}, },
//生成单据 //生成单据
CreateBill(ShopDetailsList, outItem) { CreateBill(ShopDetailsList, outItem) {
this.loading = true; var that = this;
this.Confirm('是否生成财务单据？', function () {
that.loading = true;
var array = []; var array = [];
outItem.forEach(subItem => { outItem.forEach(subItem => {
var obj = { var obj = {
...@@ -330,14 +340,16 @@ ...@@ -330,14 +340,16 @@
ShopDetailsList: ShopDetailsList, ShopDetailsList: ShopDetailsList,
LeaderGuide: array LeaderGuide: array
}; };
this.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => { that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
this.loading = false; that.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); that.Success(res.data.message);
} else { } else {
this.$message.error(res.data.message) that.Error(res.data.message);
} }
}, err => {}) }, err => {})
});
}, },
}, },
mounted() { mounted() {
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ ef202e31
...@@ -577,7 +577,7 @@ ...@@ -577,7 +577,7 @@
<div class="btmAddStore" :class="{'fillShow':fillShow}"> <div class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div> <div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div>
<div style="height:250px;overflow-y: auto;"> <div style="height:250px;overflow-y: auto;">
<table class="impoTable" style="border-spacing: 0px 1px;"> <table class="impoTable" style="border-spacing: 0px 1px;" v-loading="tabLoading">
<thead> <thead>
<tr> <tr>
<th width="200">团号</th> <th width="200">团号</th>
...@@ -616,10 +616,10 @@ ...@@ -616,10 +616,10 @@
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td>{{item.NowTotalPrice}}({{item.TotalPrice}}*{{item.Rate}})</td> <td>{{item.TotalPrice}}</td>
<td>{{item.NowGroupExtract}}({{item.GroupExtract}}*{{item.Rate}})</td> <td>{{item.GroupExtract}}</td>
<td>{{item.NowLeaderExtract}}({{item.LeaderExtract}}*{{item.Rate}})</td> <td>{{item.LeaderExtract}}</td>
<td>{{item.NowGuideExtract}}({{item.GuideExtract}}*{{item.Rate}})</td> <td>{{item.GuideExtract}}</td>
<td>{{item.Rate}}</td> <td>{{item.Rate}}</td>
<td :class="{'redType':item.CurrencyExist==-1}">{{item.Currency}}</td> <td :class="{'redType':item.CurrencyExist==-1}">{{item.Currency}}</td>
<td><span class="delInfo" @click="delInfo(index)">删除</span></td> <td><span class="delInfo" @click="delInfo(index)">删除</span></td>
...@@ -690,6 +690,8 @@ ...@@ -690,6 +690,8 @@
AddMsgProvinceList: [], AddMsgProvinceList: [],
//城市列表 //城市列表
AddMsgCityList: [], AddMsgCityList: [],
//表格Loading
tabLoading:false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 14, pageSize: 14,
...@@ -751,7 +753,6 @@ ...@@ -751,7 +753,6 @@
var imgUrl = this.domainManager().AliUrl + str; var imgUrl = this.domainManager().AliUrl + str;
this.imgArray.push(imgUrl); this.imgArray.push(imgUrl);
this.PicPathArray.push(str); this.PicPathArray.push(str);
// this.updatePic();
}); });
}, },
//更新购物店图片 //更新购物店图片
...@@ -773,7 +774,6 @@ ...@@ -773,7 +774,6 @@
delImg(index) { delImg(index) {
this.PicPathArray.splice(index, 1); this.PicPathArray.splice(index, 1);
this.imgArray.splice(index, 1); this.imgArray.splice(index, 1);
// this.updatePic();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
...@@ -931,7 +931,6 @@ ...@@ -931,7 +931,6 @@
this.addMsg.BusinessHours = ""; this.addMsg.BusinessHours = "";
} }
this.addMsg.PicPath = this.PicPathArray.toString(); this.addMsg.PicPath = this.PicPathArray.toString();
// console.log("addMsg",this.addMsg);
this.apipost( this.apipost(
"Shopping_Post_Set", "Shopping_Post_Set",
this.addMsg, this.addMsg,
...@@ -953,7 +952,7 @@ ...@@ -953,7 +952,7 @@
ID: ID ID: ID
}; };
this.imgArray = []; this.imgArray = [];
this.PicPathArray=[]; this.PicPathArray = [];
this.titleInfo = "修改购物店"; this.titleInfo = "修改购物店";
this.apipost( this.apipost(
"Shopping_Post_Get", "Shopping_Post_Get",
...@@ -1051,35 +1050,35 @@ ...@@ -1051,35 +1050,35 @@
this.importData[index].infoShow = true; this.importData[index].infoShow = true;
}, },
delInfo(index) { delInfo(index) {
this.$confirm("是否删除?", "提示", { var that = this;
confirmButtonText: "确定", this.Confirm('是否删除？删除后将不能恢复', function () {
cancelButtonText: "取消", that.Success("删除成功!");
type: "warning" that.importData.splice(index, 1);
})
.then(() => {
this.Success("删除成功!");
this.importData.splice(index, 1);
})
.catch(() => {
this.Info("已取消删除");
}); });
}, },
//导入数据
importInfo() { importInfo() {
let msg = this.importData; var that = this;
this.apipost( this.Confirm('是否导入此数据？', function () {
that.tabLoading = true;
let msg = that.importData;
that.apipost(
"ShoppingInfo_Post_Set", "ShoppingInfo_Post_Set",
msg, msg,
res => { res => {
that.tabLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.fillShow = false; that.fillShow = false;
this.Success("导入成功"); that.Success("导入成功");
this.getList(); that.getList();
} else { } else {
this.Error(res.data.message); that.Error(res.data.message);
} }
}, },
err => {} err => {}
); );
});
}, },
getDownList() { getDownList() {
let msg = {}; let msg = {};
...@@ -1110,29 +1109,22 @@ ...@@ -1110,29 +1109,22 @@
// this.addMsg.Address = msg.address; // this.addMsg.Address = msg.address;
}, },
delShoppingStore(ID) { delShoppingStore(ID) {
this.$confirm("是否删除?", "提示", { var that = this;
confirmButtonText: "确定", this.Confirm('是否删除？删除后将不能恢复', function () {
cancelButtonText: "取消", that.Success("删除成功!");
type: "warning"
})
.then(() => {
this.Success("删除成功!");
var msg = { var msg = {
ID: ID ID: ID
}; };
this.apipost( that.apipost(
"Shopping_Post_Remove", "Shopping_Post_Remove",
msg, msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getList(); that.getList();
} }
}, },
null null
); );
})
.catch(() => {
this.Info("已取消删除!");
}); });
} }
}, },
......
src/components/Ticketing/IndividualTicketOrder.vue 0 → 100644
View file @ ef202e31
This diff is collapsed.
src/components/Ticketing/IndividualTicketOrderDetails.vue 0 → 100644
View file @ ef202e31
This diff is collapsed.
src/components/Ticketing/individualTicket.vue
View file @ ef202e31
...@@ -470,6 +470,10 @@ ...@@ -470,6 +470,10 @@
<p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p> <p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
</div> </div>
</el-col> </el-col>
<el-col :span="2" class="vmiddle">
<el-button type="primary" size="mini" @click="goUrl('/IndividualTicketOrderDetails',item)">查看详情</el-button>
</el-col>
</el-row> </el-row>
<el-row :gutter="0"> <el-row :gutter="0">
...@@ -541,6 +545,17 @@ ...@@ -541,6 +545,17 @@
}; };
}, },
methods: { methods: {
goUrl(path, item) {
// console.log(item);
this.$router.push({
path: path,
query: {
ID: item.AirProductId,
blank: 'y',
tab: '散客机票订单详情'
}
});
},
getList() { getList() {
this.loading = true; this.loading = true;
if(this.msg.ID==''){ if(this.msg.ID==''){
...@@ -550,6 +565,7 @@ ...@@ -550,6 +565,7 @@
"ticket_get_GetAirTicketScatteringPageList", "ticket_get_GetAirTicketScatteringPageList",
this.msg, this.msg,
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ ef202e31
...@@ -119,15 +119,10 @@ ...@@ -119,15 +119,10 @@
<span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}" @click="goUrl('RegistrationList',item.TCID)">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span> <span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}" @click="goUrl('RegistrationList',item.TCID)">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span>
</td> </td>
<td><span class="Order_RS" @click="goUrl('RegistrationList',item.TCID)">{{item.OrderPaymentNum}}</span></td> <td><span class="Order_RS" @click="goUrl('RegistrationList',item.TCID)">{{item.OrderPaymentNum}}</span></td>
<td><span class="PingFangSC Order_RS" @click="goUrl('SetTheLeader')">{{item.LeaderName}}</span></td> <td><span :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'" @click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName!=""&&item.LeaderName!=null ?item.LeaderName:"设置领队"}}</span></td>
<td><span class="RS_RedType PingFangSC Order_RS" @click="goUrl('leaderTaskBoard')">{{item.GuideName}}</span></td> <td><span :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrl('leaderArrangement',item.TCID,'设置导游')">{{item.GuideName!=""&&item.GuideName!=null?item.GuideName:"设置导游"}}</span></td>
<td><span class="RS_Nameover">{{item.OPRemark}}</span></td> <td><span class="RS_Nameover">{{item.OPRemark}}</span></td>
</tr> </tr>
<!-- <tr>
<td colspan="12">
<span class="RS_Nameover" @click="goUrlTM('productQuery',item.TCNUM)">团名: {{item.Title}}</span>
</td>
</tr> -->
</tbody> </tbody>
</table> </table>
</div> </div>
......
src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue
View file @ ef202e31
...@@ -116,24 +116,20 @@ ...@@ -116,24 +116,20 @@
<td>{{item.B2CMemberPrice}}</td> <td>{{item.B2CMemberPrice}}</td>
<td>{{item.TotalSeat}}</td> <td>{{item.TotalSeat}}</td>
<td> <td>
<span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}" @click="goUrl('RegistrationList',item.TCID)">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span> <span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}" @click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span
v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span>
</td> </td>
<td><span class="Order_RS" @click="goUrl('RegistrationList',item.TCID)">{{item.OrderPaymentNum}}</span></td> <td><span class="Order_RS" @click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.OrderPaymentNum}}</span></td>
<td><span class="PingFangSC Order_RS" @click="goUrl('SetTheLeader')">{{item.LeaderName}}</span></td> <td><span :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'" @click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName!=""&&item.LeaderName!=null ?item.LeaderName:"设置领队"}}</span></td>
<td><span class="RS_RedType PingFangSC Order_RS" @click="goUrl('leaderTaskBoard')">{{item.GuideName}}</span></td> <td><span :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrl('leaderArrangement',item.TCID,'设置导游')">{{item.GuideName!=""&&item.GuideName!=null?item.GuideName:"设置导游"}}</span></td>
<td><span class="RS_Nameover">{{item.OPRemark}}</span></td> <td><span class="RS_Nameover">{{item.OPRemark}}</span></td>
</tr> </tr>
<!-- <tr>
<td colspan="12">
<span class="RS_Nameover" @click="goUrlTM('productQuery',item.TCNUM)">团名: {{item.Title}}</span>
</td>
</tr> -->
</tbody> </tbody>
</table> </table>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
queryCommonData: { queryCommonData: {
...@@ -214,48 +210,47 @@ export default { ...@@ -214,48 +210,47 @@ export default {
this.queryCommonData.loading = false; this.queryCommonData.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DataList = res.data.data; this.DataList = res.data.data;
this.DataList.forEach(item => {
this.DataList.forEach(item=>{ switch (item.StartCityName) {
switch(item.StartCityName){
case '成都': case '成都':
item.StartCityNum = 1 item.StartCityNum = 1
break ; break;
case '昆明': case '昆明':
item.StartCityNum = 2 item.StartCityNum = 2
break ; break;
case '重庆': case '重庆':
item.StartCityNum = 3 item.StartCityNum = 3
break ; break;
case '西安': case '西安':
item.StartCityNum = 4 item.StartCityNum = 4
break ; break;
case '武汉': case '武汉':
item.StartCityNum = 5 item.StartCityNum = 5
break ; break;
case '贵阳': case '贵阳':
item.StartCityNum = 6 item.StartCityNum = 6
break ; break;
case '南昌': case '南昌':
item.StartCityNum = 7 item.StartCityNum = 7
break ; break;
case '兰州': case '兰州':
item.StartCityNum = 8 item.StartCityNum = 8
break ; break;
case '票务': case '票务':
item.StartCityNum = 9 item.StartCityNum = 9
break ; break;
case '长沙': case '长沙':
item.StartCityNum = 10 item.StartCityNum = 10
break ; break;
case '微途': case '微途':
item.StartCityNum = 11 item.StartCityNum = 11
break ; break;
case '厦门': case '厦门':
item.StartCityNum = 12 item.StartCityNum = 12
break ; break;
case '南京': case '南京':
item.StartCityNum = 13 item.StartCityNum = 13
break ; break;
} }
}) })
} }
...@@ -270,15 +265,29 @@ export default { ...@@ -270,15 +265,29 @@ export default {
"报名统计.xls" "报名统计.xls"
); );
}, },
goUrl(path, id) { goUrl(path, id,title) {
if (id > 0) { if (id > 0) {
this.$router.push({name: path, query: {id: id}}); this.$router.push({
name: path,
query: {
id: id,
blank: 'y',
tab: title
}
});
} else { } else {
this.$router.push({name: path}); this.$router.push({
name: path
});
} }
}, },
goUrlTM(path, TCNUM) { goUrlTM(path, TCNUM) {
this.$router.push({name: path, query: {id: TCNUM }}); this.$router.push({
name: path,
query: {
id: TCNUM
}
});
}, },
}, },
mounted() { mounted() {
...@@ -286,5 +295,6 @@ export default { ...@@ -286,5 +295,6 @@ export default {
this.getLineList(); this.getLineList();
this.getList(); this.getList();
} }
}; };
</script> </script>
src/components/commonPage/TripDownLoadCommon.vue
View file @ ef202e31
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
created() { created() {
this.TripLayer.vshowA = true; this.TripLayer.vshowA = true;
this.TripLayer.vshowB = true; this.TripLayer.vshowB = true;
this.TripLayer.vshowC = true; this.TripLayer.vshowC = false;
this.TripLayer.vshowD = true; this.TripLayer.vshowD = true;
this.TripLayer.vshowE = true; this.TripLayer.vshowE = true;
this.TripLayer.vshowF = true; this.TripLayer.vshowF = true;
......
src/components/confirmationOrderDownLoad.vue
View file @ ef202e31
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
<a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0]!=null && priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') --> <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息--> <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" /> <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
...@@ -658,7 +660,7 @@ ...@@ -658,7 +660,7 @@
if (msg.ResultCode) { // 已经存在文件 直接调用下载 if (msg.ResultCode) { // 已经存在文件 直接调用下载
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc) _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
} else { // 不存在图片保存图片后下载 } else { // 不存在图片保存图片后下载
if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) { if (document.querySelector("#gernalCanvas") && document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) {
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc) _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
return return
} }
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ ef202e31
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li><span><em>系列</em> <li><span><em>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')" class="w150">
<el-option label="不限" value='-1'></el-option> <el-option label="不限" value='-1'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
</el-option> </el-option>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<li> <li>
<span> <span>
<em>团号</em> <em>团号</em>
<el-input v-model='msg.TCNUM'></el-input> <el-input v-model='msg.TCNUM' class="w150"></el-input>
</span> </span>
</li> </li>
<li><span><em>日期</em> <li><span><em>日期</em>
...@@ -23,12 +23,17 @@ ...@@ -23,12 +23,17 @@
</span> </span>
</li> </li>
<li><span><em>状态</em></span> <li><span><em>状态</em></span>
<el-select v-model='msg.PriceStatus'> <el-select v-model='msg.PriceStatus' class="w150">
<el-option label='正常' value='0' key='0'></el-option> <el-option label='正常' value='0' key='0'></el-option>
<el-option label='取消' value='1' key='1'></el-option> <el-option label='取消' value='1' key='1'></el-option>
</el-select> </el-select>
</li> </li>
<li>
<span>
<em>地接团号</em>
<el-input v-model='msg.CombinationNum' class="w150"></el-input>
</span>
</li>
<li> <li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" /> <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li> </li>
...@@ -49,22 +54,22 @@ ...@@ -49,22 +54,22 @@
<th width="75">出发地</th> <th width="75">出发地</th>
<th width="80">航班时间</th> <th width="80">航班时间</th>
<th width="125">公司团号</th> <th width="125">公司团号</th>
<th width="75">线路<br/>负责人</th> <th width="75">线路<br />负责人</th>
<th width="75">进出点</th> <th width="75">进出点</th>
<th width="80">机位总数<br/>(Y/E/F)</th> <th width="80">机位总数<br />(Y/E/F)</th>
<th width="60">领队</th> <th width="60">领队</th>
<th width="60">导游</th> <th width="60">导游</th>
<th width="60">已开票</th> <th width="60">已开票</th>
<th width="60">分房表</th> <th width="60">分房表</th>
<th width="60">出团<br/>通知书</th> <th width="60">出团<br />通知书</th>
<th width="60">导游<br/>计划表</th> <th width="60">导游<br />计划表</th>
<th width="60">领队<br/>交接表</th> <th width="60">领队<br />交接表</th>
<th width="60">用款<br/>计划</th> <th width="60">用款<br />计划</th>
<th width="60">酒店</th> <th width="60">酒店</th>
<th width="60">门票</th> <th width="60">门票</th>
<th width="60">餐食</th> <th width="60">餐食</th>
<th width="60">车辆</th> <th width="60">车辆</th>
<th width="60">领队<br/>报账</th> <th width="60">领队<br />报账</th>
<th width="120">操作</th> <th width="120">操作</th>
</tr> </tr>
<tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}"> <tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}">
...@@ -210,7 +215,7 @@ ...@@ -210,7 +215,7 @@
</div> </div>
</td> </td>
<td> <td>
<div class="w180"> <div class="w250">
<el-button-group> <el-button-group>
<el-button @click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary" style="background:#00C6FF; border-color:#00C6FF">收付款</el-button> <el-button @click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary" style="background:#00C6FF; border-color:#00C6FF">收付款</el-button>
<el-popover placement="bottom" width="300" trigger="click"> <el-popover placement="bottom" width="300" trigger="click">
...@@ -220,7 +225,16 @@ ...@@ -220,7 +225,16 @@
</p> </p>
<el-button type="primary" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;">添加备注</el-button> <el-button type="primary" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;">添加备注</el-button>
</el-popover> </el-popover>
<br/>
<el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button> <el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button>
<el-popover placement="bottom" width="300" trigger="click">
<el-input class='mt10' v-model='NumObj.newCombinationNum' type='textarea'></el-input>
<p class="alcenter mt10">
<input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
</p>
<el-button type="primary" slot="reference" @click='ClickNumItem(outItem.NewCombinationNum,outItem.TCIDs)'
style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;">地接团号</el-button>
</el-popover>
</el-button-group> </el-button-group>
</div> </div>
</td> </td>
...@@ -242,7 +256,6 @@ ...@@ -242,7 +256,6 @@
:page-size="msg.pageSize" :total="total"></el-pagination> :page-size="msg.pageSize" :total="total"></el-pagination>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
...@@ -262,12 +275,19 @@ ...@@ -262,12 +275,19 @@
LineId: 14, LineId: 14,
LineteamId: "-1", LineteamId: "-1",
PriceStatus: "0", PriceStatus: "0",
//地接团号
CombinationNum: ""
}, },
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
thLengthTitle: [], thLengthTitle: [],
list: [], list: [],
colspanTotal: 0, colspanTotal: 0,
//地接团号对象
NumObj: {
newCombinationNum: "",
TCIDs: ""
}
} }
}, },
methods: { methods: {
...@@ -279,9 +299,8 @@ ...@@ -279,9 +299,8 @@
}) })
}, },
CkedItem(obj) { CkedItem(obj) {
console.log(obj) this.ckedTCID = obj.TCID;
this.ckedTCID = obj.TCID this.remarkString = obj.DMCRemark;
this.remarkString = obj.DMCRemark
}, },
saveRemark() { saveRemark() {
this.apipost('dmcstatistics_post_SetDMCRemark', { this.apipost('dmcstatistics_post_SetDMCRemark', {
...@@ -417,10 +436,31 @@ ...@@ -417,10 +436,31 @@
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => { this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.loading = false this.loading = false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count this.total = res.data.data.count;
this.list = res.data.data.pageData.data this.list = res.data.data.pageData.data;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message);
}
}, err => {})
},
ClickNumItem(newCombinationNum, tcids) {
this.NumObj.newCombinationNum = newCombinationNum;
this.NumObj.TCIDs = tcids;
},
//保存地接团号
UpdateCombinationNum() {
this.loading = true;
let msg = {
newCombinationNum: this.NumObj.newCombinationNum,
TCIDs: this.NumObj.TCIDs
};
this.apipost('dmcstatistics_post_UpdateCombinationNum', msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
......
src/components/dmc/manager/teamReimbursement.vue
View file @ ef202e31
<style> <style>
@import "../../../assets/css/newTravelManager.css"; @import "../../../assets/css/newTravelManager.css";
.TravelQueryList { .TravelQueryList {
width: 100%; width: 100%;
...@@ -51,9 +51,7 @@ ...@@ -51,9 +51,7 @@
line-height: 20px; line-height: 20px;
display: -webkit-box; display: -webkit-box;
overflow: hidden; overflow: hidden;
/*! autoprefixer: off */
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
/* autoprefixer: on */
text-overflow: ellipsis; text-overflow: ellipsis;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
} }
...@@ -335,92 +333,43 @@ ...@@ -335,92 +333,43 @@
<div class="TC_Content TravelControlList"> <div class="TC_Content TravelControlList">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<!-- <li>
<span>
<em>所属线路</em>
<el-select
class="w150"
v-model="queryMsg.LineId"
filterable
:placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()"
>
<el-option
:label="$t('pub.unlimitedSel')"
:value="queryCommonData.SelectDefaultValue"
></el-option>
<el-option
v-for="item in queryCommonData.LineList"
:label="item.LineName"
:value="item.LineID"
:key="item.LineID"
></el-option>
</el-select>
</span>
</li> -->
<li> <li>
<span> <span>
<em>系列名称</em> <em>系列名称</em>
<el-select <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
class="w150" <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
v-model="queryMsg.LineteamId" <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option>
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option
:label="$t('pub.unlimitedSel')"
:value="queryCommonData.SelectDefaultValue"
></el-option>
<el-option
v-for="item in queryCommonData.LineTeamList"
:label="item.LtName"
:value="item.LtID"
:key="item.LtID"
></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>团号</em> <em>团号</em>
<el-input <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList"
maxlength="50" :placeholder="$t('pub.pleaseImport')"></el-input>
v-model="queryMsg.TCNUM"
class="permiss-input w150"
@keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"
></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>发团日期</em> <em>发团日期</em>
<el-date-picker <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" value-format="yyyy-MM-dd"
class="w150" placeholder></el-date-picker>
type="date" <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" value-format="yyyy-MM-dd"
v-model="queryMsg.StartGroupDate" placeholder></el-date-picker>
value-format="yyyy-MM-dd" </span>
placeholder </li>
></el-date-picker> <li>
<el-date-picker <span>
class="w150" <em>合团团号</em>
type="date" <el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150" @keyup.native.enter="getControlList"
v-model="queryMsg.EndGroupDate" :placeholder="$t('pub.pleaseImport')"></el-input>
value-format="yyyy-MM-dd"
placeholder
></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<button <button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
class="hollowFixedBtn"
@click="getControlList(),resetPageIndex()"
>{{$t('pub.searchBtn')}}</button>
</li> </li>
</ul> </ul>
</div> </div>
<table class="TravelControlListTable TravelQueryList"> <table class="TravelControlListTable TravelQueryList">
<tbody v-for="(outItem,i) in queryCommonData.dataList" :key="i"> <tbody v-for="(outItem,i) in queryCommonData.dataList" :key="i">
<template v-for="(item,index) in outItem.TravelPriceList"> <template v-for="(item,index) in outItem.TravelPriceList">
...@@ -433,16 +382,8 @@ ...@@ -433,16 +382,8 @@
<td width="240" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3"> <td width="240" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3">
<div class="d7"> <div class="d7">
<el-button-group> <el-button-group>
<el-button <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
@click.native="goUrl('leaderReimbursement',outItem,'用款计划')" <el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
type="primary"
style="background:#E95252; border-color:#E95252"
>领队用款</el-button>
<el-button
@click.native="goUrl('leaderPay',outItem,'领队报账')"
type="primary"
style="background:#297BEF; border-color:#297BEF"
>领队报账
</el-button> </el-button>
</el-button-group> </el-button-group>
</div> </div>
...@@ -494,7 +435,8 @@ ...@@ -494,7 +435,8 @@
</tr> </tr>
</table> </table>
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" class="TCL-flighInfoList" style="text-align: center!important"> <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" class="TCL-flighInfoList"
style="text-align: center!important">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>{{subItem.DepartureName}} <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>{{subItem.DepartureName}}
{{subItem.StopoverName==""?"":"-"+subItem.StopoverName}} {{subItem.StopoverName==""?"":"-"+subItem.StopoverName}}
...@@ -545,7 +487,7 @@ ...@@ -545,7 +487,7 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr height="40" > <tr height="40">
<td colspan="4" style="padding-left: 30px;"> <td colspan="4" style="padding-left: 30px;">
备注：{{item.OPRemark}} 备注：{{item.OPRemark}}
</td> </td>
...@@ -556,19 +498,13 @@ ...@@ -556,19 +498,13 @@
<td colspan="6">{{$t('system.content_noData')}}</td> <td colspan="6">{{$t('system.content_noData')}}</td>
</tr> </tr>
</table> </table>
<el-pagination <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" layout="total,prev, pager, next, jumper"
background :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination>
@current-change="handleCurrentChange"
:current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper"
:page-size="queryMsg.pageSize"
:total="queryMsg.total"
></el-pagination>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
ArrList: [], ArrList: [],
...@@ -595,7 +531,9 @@ export default { ...@@ -595,7 +531,9 @@ export default {
total: 0, total: 0,
//是否有数据 //是否有数据
noData: false, noData: false,
currentPage: 1 currentPage: 1,
//合团团号
CombinationNum:""
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -612,8 +550,17 @@ export default { ...@@ -612,8 +550,17 @@ export default {
}; };
}, },
methods: { methods: {
goUrl(path,obj,title){ goUrl(path, obj, title) {
this.$router.push({ name:path,query:{"id":obj.TCIDs,'num':obj.CombinationNum,isUpdate:true,blank:'y',tab:title}}) this.$router.push({
name: path,
query: {
"id": obj.TCIDs,
'num': obj.CombinationNum,
isUpdate: true,
blank: 'y',
tab: title
}
})
}, },
//翻页 //翻页
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -662,23 +609,6 @@ export default { ...@@ -662,23 +609,6 @@ export default {
); );
} }
}, },
filters: {
priceFormat(value) {
if (value == null) {
return 0.0;
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
}
},
mounted() { mounted() {
this.getLineTeamList(); this.getLineTeamList();
}, },
...@@ -693,5 +623,5 @@ export default { ...@@ -693,5 +623,5 @@ export default {
this.queryMsg.StartGroupDate = nowDate; this.queryMsg.StartGroupDate = nowDate;
this.getControlList(); this.getControlList();
} }
}; };
</script> </script>
\ No newline at end of file
src/components/dmc/manager/tripsManager.vue
View file @ ef202e31
...@@ -365,7 +365,8 @@ ...@@ -365,7 +365,8 @@
<em>团队状态</em> <em>团队状态</em>
<el-select class="w150" v-model="queryMsg.QTCState" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.QTCState" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="tcItem in $tripUtils.TeamStatesList.TeamStates" :label="tcItem.Name" :key="tcItem.Id" :value="tcItem.Id">{{tcItem.Name}}</el-option> <el-option v-for="tcItem in $tripUtils.TeamStatesList.TeamStates" :label="tcItem.Name" :key="tcItem.Id"
:value="tcItem.Id">{{tcItem.Name}}</el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -377,6 +378,13 @@ ...@@ -377,6 +378,13 @@
<el-option v-for="item in queryCommonData.BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option> <el-option v-for="item in queryCommonData.BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
</el-select> </el-select>
</span> </span>
</li>
<li>
<span>
<em>合团团号</em>
<el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150" @keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li> </li>
<li> <li>
<button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
...@@ -494,10 +502,7 @@ ...@@ -494,10 +502,7 @@
<td width="240"> <td width="240">
<div class="d7"> <div class="d7">
<el-button-group v-if='outItem.TravelPriceList.length>1'> <el-button-group v-if='outItem.TravelPriceList.length>1'>
<el-button <el-button @click.native='chaiTuan(item)' type="primary" style="background:#00C6FF; border-color:#00C6FF">团队分拆</el-button>
@click.native='chaiTuan(item)'
type="primary"
style="background:#00C6FF; border-color:#00C6FF">团队分拆</el-button>
</el-button-group> </el-button-group>
</div> </div>
</td> </td>
...@@ -533,11 +538,11 @@ ...@@ -533,11 +538,11 @@
//下拉框默认值 //下拉框默认值
SelectDefaultValue: 0, SelectDefaultValue: 0,
//分公司默认值 //分公司默认值
BranchDefaultValue:-1, BranchDefaultValue: -1,
//数据列表 //数据列表
dataList: [], dataList: [],
//分公司列表 //分公司列表
BranchList:[], BranchList: [],
}, },
//查询参数 //查询参数
queryMsg: { queryMsg: {
...@@ -552,9 +557,11 @@ ...@@ -552,9 +557,11 @@
//是否有数据 //是否有数据
noData: false, noData: false,
currentPage: 1, currentPage: 1,
QTCState:0, QTCState: 0,
//出团公司 //出团公司
OutBranchId:-1 OutBranchId: -1,
//合团团号
CombinationNum:""
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -571,44 +578,41 @@ ...@@ -571,44 +578,41 @@
}; };
}, },
methods: { methods: {
chaiTuan(obj){ //拆团
let subArr=[] chaiTuan(obj) {
subArr.push(Number(obj.TCID)) let subArr = [];
this.$confirm('是否拆团?', '提示', { subArr.push(Number(obj.TCID));
confirmButtonText: '确定', var that = this;
cancelButtonText: '取消', that.Confirm("是否拆团?", function () {
type: 'warning' that.apipost('travel_post_SetPartition', {
}).then(() => { Ids: subArr,
this.apipost('travel_post_SetPartition',{Ids:subArr,CombinationNum:obj.CombinationNum},res=>{ CombinationNum: obj.CombinationNum
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); that.$message.success(res.data.message);
this.ArrList=[]; that.ArrList = [];
this.getControlList() that.getControlList()
}else{ } else {
this.$message.error(res.data.message) that.Error(res.data.message)
} }
},err=>{}) }, err => {})
}).catch(() => { })
this.$message({
type: 'info',
message: '已取消'
});
});
}, },
//合团
heTuan() { heTuan() {
let sumArr = [] let sumArr = [];
this.ArrList.forEach(item => { this.ArrList.forEach(item => {
sumArr = sumArr.concat(item.split(',')) sumArr = sumArr.concat(item.split(','))
}) });
this.apipost('travel_post_SetCombination', { this.apipost('travel_post_SetCombination', {
Ids: sumArr Ids: sumArr
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message) this.$message.success(res.data.message)
this.getControlList() this.getControlList()
this.ArrList=[]; this.ArrList = [];
} else { } else {
this.$message.error(res.data.message) this.Error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
...@@ -684,30 +688,12 @@ ...@@ -684,30 +688,12 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.BranchList = res.data.data; this.queryCommonData.BranchList = res.data.data;
console.log("this.queryCommonData.BranchList",this.queryCommonData.BranchList);
} }
}, },
err => {} err => {}
); );
}, },
}, },
filters: {
priceFormat(value) {
if (value == null) {
return 0.0;
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
}
},
mounted() { mounted() {
this.getCompanyList(); this.getCompanyList();
this.getLineTeamList(); this.getLineTeamList();
...@@ -721,9 +707,8 @@ ...@@ -721,9 +707,8 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.queryMsg.StartGroupDate = nowDate; this.queryMsg.StartGroupDate = nowDate;
this.queryMsg.TCNUM=this.$route.query.TCNUM this.queryMsg.TCNUM = this.$route.query.TCNUM;
this.getControlList(); this.getControlList();
} }
}; };
</script> </script>
\ No newline at end of file
src/components/newTravelmanager/TravelBasic/BasicComponent/TravelFlightList.vue
View file @ ef202e31
...@@ -328,7 +328,6 @@ ...@@ -328,7 +328,6 @@
res.data.data.forEach(x => { res.data.data.forEach(x => {
this.priceFlightList.push(x); this.priceFlightList.push(x);
}); });
console.log(res, 'flight');
this.headCallBack(); this.headCallBack();
} }
} else { } else {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ ef202e31
...@@ -546,41 +546,6 @@ ...@@ -546,41 +546,6 @@
</el-select> </el-select>
</div> </div>
<div class="TPright clearfix"> <div class="TPright clearfix">
<!--<el-popover popper-class="_TravelPriceDetails" trigger="click">-->
<!--<div>-->
<!--&lt;!&ndash;<table width="100%" border="0" cellspacing="0" cellpadding="0">&ndash;&gt;-->
<!--&lt;!&ndash;<tr>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">选择</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">航班号</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">航空公司</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">航段</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">时间</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">PNR</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">使用数量/剩余数量</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td class="_color_666">绑定机位数</td>&ndash;&gt;-->
<!--&lt;!&ndash;</tr>&ndash;&gt;-->
<!--&lt;!&ndash;<tr v-for="fitem in selectFilghtList">&ndash;&gt;-->
<!--&lt;!&ndash;<td>&ndash;&gt;-->
<!--&lt;!&ndash;<el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>&ndash;&gt;-->
<!--&lt;!&ndash;</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.FlightNumber}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.AlName}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.PNR}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>{{fitem.UseAmount}} / {{fitem.RemainNum}}</td>&ndash;&gt;-->
<!--&lt;!&ndash;<td>&ndash;&gt;-->
<!--&lt;!&ndash;<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"&ndash;&gt;-->
<!--&lt;!&ndash;v-model="fitem.BindNum"></el-input>&ndash;&gt;-->
<!--&lt;!&ndash;</td>&ndash;&gt;-->
<!--&lt;!&ndash;</tr>&ndash;&gt;-->
<!--&lt;!&ndash;</table>&ndash;&gt;-->
<!--</div>-->
<!--<div slot="reference" class="SimulateDrop-box">-->
<!--<span class="SD_flight" v-for="item in FinfoList">{{item.name}} {{item.date}}</span>-->
<!--<i class="iconfont icon-arrow-down SimulaDrop"></i>-->
<!--</div>-->
<!--</el-popover>-->
<el-form-item prop="ClearOrderHour" v-if="!flagWangYue"> <el-form-item prop="ClearOrderHour" v-if="!flagWangYue">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
@keyup.native="checkInteger(priceData,'ClearOrderHour')" @keyup.native="checkInteger(priceData,'ClearOrderHour')"
...@@ -912,9 +877,6 @@ ...@@ -912,9 +877,6 @@
) )
}; };
} }
// if (this.modifyTcid > 0) {
// this.returnPriceList = [];
// }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
this.initDatePickerCheched(); this.initDatePickerCheched();
this.returnPriceList.sort( this.returnPriceList.sort(
...@@ -998,19 +960,19 @@ ...@@ -998,19 +960,19 @@
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalType!==1) return; if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalType!==1) return;
if(TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId===0) return; if(TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId===0) return;
if(TrafficList.TrafficList[0].SubTraffic[0].StartCityId===0) return; if(TrafficList.TrafficList[0].SubTraffic[0].StartCityId===0) return;
msg.FstartcityId = TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId; msg.FstartcityId = TrafficList.TrafficList[0].SubTraffic[0].StartCityId;
msg.FendcityId = TrafficList.TrafficList[0].SubTraffic[0].StartCityId; msg.FendcityId = TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId;
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length>=2){ if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length>=2){
let list = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length-1]; let list = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic.length-1];
if(list.ArrivalCityId===0) return; if(list.ArrivalCityId===0) return;
if(list.StartCityId===0) return; if(list.StartCityId===0) return;
msg.EstartcityId = list.ArrivalCityId; msg.EstartcityId = list.StartCityId;
msg.EendcityId = list.StartCityId; msg.EendcityId = list.ArrivalCityId;
}else { }else {
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId===0) return; if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId===0) return;
if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId===0) return; if(TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId===0) return;
msg.EstartcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId; msg.EstartcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId;
msg.EendcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].StartCityId; msg.EendcityId = TrafficList.TrafficList[TrafficList.TrafficList.length-1].SubTraffic[0].ArrivalCityId;
} }
let storageMsg = localStorage.queryFlightAirMsg?JSON.parse(localStorage.queryFlightAirMsg):null; let storageMsg = localStorage.queryFlightAirMsg?JSON.parse(localStorage.queryFlightAirMsg):null;
...@@ -1031,10 +993,6 @@ ...@@ -1031,10 +993,6 @@
}, },
// 获取飞机票2 // 获取飞机票2
queryFlightAirList(msg) { queryFlightAirList(msg) {
// msg.FstartcityId = 944;
// msg.FendcityId = 316;
// msg.EstartcityId = 944;
// msg.EendcityId = 316;
this.apipost("AirTicket_get_GetTicketList",msg,res=>{ this.apipost("AirTicket_get_GetTicketList",msg,res=>{
if(res.data.resultCode===1){ if(res.data.resultCode===1){
this.queryFlightAirListData = res.data.data; this.queryFlightAirListData = res.data.data;
......
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList.vue
View file @ ef202e31
...@@ -275,7 +275,6 @@ ...@@ -275,7 +275,6 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if (res.data.data != null) { if (res.data.data != null) {
console.log('res.data.data', res.data.data)
res.data.data.forEach(x => { res.data.data.forEach(x => {
x['IsShowTime'] = false x['IsShowTime'] = false
this.priceFlightList.push(x) this.priceFlightList.push(x)
...@@ -338,10 +337,8 @@ ...@@ -338,10 +337,8 @@
departureTime: item.DepartureTime, departureTime: item.DepartureTime,
arriveTime: item.ArrivalTime, arriveTime: item.ArrivalTime,
} }
console.log('msg', msg)
this.apipost('travel_post_ModifyAirticketFlightTimeById', msg, res => { this.apipost('travel_post_ModifyAirticketFlightTimeById', msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
} else { } else {
this.Warning(res.data.message) this.Warning(res.data.message)
} }
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ ef202e31
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!--<div id='newFeatureBox' v-if="!Refresh" v-loading="RenderingOk">--> <!--<div id='newFeatureBox' v-if="!Refresh" v-loading="RenderingOk">-->
<div id='newFeatureBox' v-if="!Refresh"> <div id='newFeatureBox' v-if="!Refresh">
<!-- 酒店 --> <!-- 酒店 -->
<div class="travle_page" v-for="(item, index) in hotelObj.pageList" :key="'hotel'+index " v-if="hotelObj.list.length>0"> <div class="travle_page" v-for="(item, index) in hotelObj.pageList" :key="'hotel'+index " v-if="item === 0 && hotelObj.list.length>0">
<!-- 酒店1 --> <!-- 酒店1 -->
<div class="travel_hotel_1" v-if="item === 0 && hotelObj.list!=null && hotelObj.list.length>0"> <div class="travel_hotel_1" v-if="item === 0 && hotelObj.list!=null && hotelObj.list.length>0">
<div class="hotel_1_header"> <div class="hotel_1_header">
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ ef202e31
...@@ -542,15 +542,11 @@ ...@@ -542,15 +542,11 @@
this.dayObj.ScenicArray.forEach(x=>{ this.dayObj.ScenicArray.forEach(x=>{
// x.ScenicJson = (typeof(x.ScenicJsonStr) === 'string' ? x.ScenicJsonStr : { x:0, y:0 }) // x.ScenicJson = (typeof(x.ScenicJsonStr) === 'string' ? x.ScenicJsonStr : { x:0, y:0 })
let obj = JSON.parse(x.ScenicJsonStr) let obj = JSON.parse(x.ScenicJsonStr)
if (obj) { if (obj) {
console.log("obj1",obj.y)
x.ScenicJson = obj x.ScenicJson = obj
} else { } else {
console.log("obj2",obj)
x.ScenicJson = { x:0, y:0 } x.ScenicJson = { x:0, y:0 }
} }
console.log('222', x.ScenicJson)
}) })
this.initScenicData(); this.initScenicData();
}, },
......
src/plug/index.js
View file @ ef202e31
This diff is collapsed.
src/router/config.js
View file @ ef202e31
...@@ -1017,6 +1017,21 @@ export default { ...@@ -1017,6 +1017,21 @@ export default {
meta: { meta: {
title: '散客机票' title: '散客机票'
}, },
},
,{
path: '/IndividualTicketOrder', //散客今日机票订单
name: 'IndividualTicketOrder',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
meta: {
title: '散客机票今日订单'
},
},{
path: '/IndividualTicketOrderDetails', //散客机票订单详情
name: 'IndividualTicketOrderDetails',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrderDetails'], resolve),
meta: {
title: '散客机票订单详情'
},
},{ },{
path: '/PassengerList', //旅客名单 path: '/PassengerList', //旅客名单
name: 'PassengerList', name: 'PassengerList',
...@@ -1155,6 +1170,14 @@ export default { ...@@ -1155,6 +1170,14 @@ export default {
title: '领队用款计划' title: '领队用款计划'
}, },
}, },
{
path: '/leaderPrint', //领队用款计划
name: 'leaderPrint',
component: resolve => require(['@/components/LeaderManagement/leaderPrint'], resolve),
meta: {
title: '领队用款计划打印'
},
},
{ {
path: '/leaderReimbursement', //领队领队报账 path: '/leaderReimbursement', //领队领队报账
name: 'leaderReimbursement', name: 'leaderReimbursement',
......
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