Skip to content

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

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

parents 68366f07 cf239fad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1129 additions and 720 deletions
src/App.vue
View file @ 30cd28f1
......@@ -9,6 +9,10 @@
<img v-for="src in images" :src="src" :key="src">
</viewer>
<chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode>
<!-- -->
<!-- <div class="downzip">
下载包
</div> -->
</div>
</template>
......@@ -119,4 +123,8 @@ export default {
.BMap_cpyCtrl {display: none;}
.anchorBL {display: none;}
.viewer{display: none !important;}
/* .downzip{
width: 100%;
height:
} */
</style>
src/assets/common/lang/zh.js.rej 0 → 100644
View file @ 30cd28f1
This diff is collapsed.
src/components/Hotel/HotelInfo.vue
View file @ 30cd28f1
......@@ -211,6 +211,7 @@
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<div class="imgzhe">
<div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
......@@ -251,6 +252,9 @@
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div>
</template>
<script>
......@@ -259,6 +263,11 @@ import googleMap from "../commonPage/googleMap.vue";
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
},
images: [],
//是否显示添加图片
addimg: false,
//地图选中地址
......@@ -443,6 +452,24 @@ export default {
this.HotelImageArray.splice(index, 1);
//this.updatePic();
},
inited (viewer){
this.$viewer = viewer
},
showImg: function (src) {
let srcArr = src.split('?')
src = srcArr[0]
let isExsit=false
this.images.forEach(x=>{
if(x===src)
isExsit=true
})
if(!isExsit) {
this.images.push(src)
} else {
this.$viewer.view(this.images.indexOf(src))
}
this.$viewer.show()
},
addImgOpen() {
this.addimg = true;
this.initimgList();
......
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ 30cd28f1
......@@ -423,12 +423,6 @@ export default {
},
}, mounted() {
this.userId = this.getLocalStorage().EmployeeId;
// let obj = this.$route.query.item ? JSON.parse(this.$route.query.item) : ''
// this.item = obj
// this.orderId = this.msg.OrderID = obj.orderId ? obj.orderId : obj.OrderId
// this.tcnum = obj.tcnum ? obj.tcnum : obj.TCNUM
// this.tcid = obj.tcid ? obj.tcid : obj.TCID
// this.outBranchId = obj.outBranchId ? obj.outBranchId : obj.OutBranchId;
this.tcid= this.$route.query.TCID;
this.OutBranchId=this.$route.query.OutBranchId;
......
src/components/SalesModule/groupInquiry.vue
View file @ 30cd28f1
......@@ -490,7 +490,7 @@
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button>
</div>
<el-button v-if="item.LineID!=14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button>
<el-button v-if="item.LineID==14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button>
<!-- <el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> -->
<el-button @click="goUrl('VisaFinancialDocuments',item.TCID,item.OutBranchId,item.TCNUM,'签证财务单据')" type="primary" style='background:#F16C3C; border-color:#F16C3C'>费用明细</el-button>
<el-button @click='openEdit(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>送签日期</el-button>
......@@ -503,7 +503,12 @@
<div style="padding:10px 0">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.VisaGuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.VisaGuestList">{{childItem.GuestName}}</span>
<span style="color:blue !important" v-for="(childItem) in item.VisaGuestList">
<span v-if="childItem.VisaStatus===2" class="groupTourOrder_tickets_blue" >{{childItem.GuestName}}</span>
<span v-else-if="childItem.VisaStatus===3" class="groupTourOrder_tickets_black" >{{childItem.GuestName}}</span>
<span v-else-if="childItem.VisaStatus===1" class="groupTourOrder_tickets_red" >{{childItem.GuestName}}</span>
</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
......@@ -520,7 +525,7 @@
<span v-if="item.VisaFinanceList.length===0">暂无数据</span>
</div>
</div>
<!-- <div class="TC_remarkContent">
<div class="TC_remarkContent">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle">OP对外备注：</div>
<div class="TCL_Content">{{item.OPRemark}}</div>
......@@ -533,7 +538,7 @@
<div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div>
</div>
</div> -->
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">
......@@ -810,7 +815,7 @@ export default {
//航班配置
FlightState:0,
TCVisaStatus: '-1',
IsShowUnion:1,
IsShowUnion:0,
QueryType:1,//查询类型 1:签证
},
remarkMsg: {
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 30cd28f1
......@@ -1095,11 +1095,12 @@ export default {
},
mounted() {
this.initCity();
this.getNeedType();
this.initTicketType();
this.initAirline();
this.getList();
this.getList();
}
};
</script>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 30cd28f1
......@@ -676,7 +676,7 @@
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
<el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
@click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">收入确认单
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ 30cd28f1
......@@ -132,7 +132,6 @@
res => {
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res,'data');
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
......
src/components/VisaCenter/VisaApplicationDetails.vue
View file @ 30cd28f1
......@@ -26,7 +26,7 @@
{{$t('visa.v_tvisa')}}
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visa.v_Othervisas')}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>其他</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -34,7 +34,7 @@
{{$t('visa.v_gvisa')}}
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>{{$t('visa.v_Othervisas')}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>其他</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......
src/components/busManagement/BusInfo.vue
View file @ 30cd28f1
This diff is collapsed.
src/components/busManagement/busStatistics.vue
View file @ 30cd28f1
......@@ -153,7 +153,7 @@
</div></td>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div class="w100 link">
<span @click="goUrlX('BusInfo',outItem,'车配信息')">详情</span>
<span @click="goUrlX('BusInfo',item,outItem,'车配信息')">详情</span>
<span @click="DownLoadFile(item,outItem.NewCombinationNum)">下载</span>
</div>
</td>
......@@ -291,14 +291,28 @@ totalPrice+=busInfo.CostPrice*(Number(busInfo.TransferNum)+1)*PeopleNum;
}
);
},
goUrlX(path,obj,title){
console.log(obj);
//
let TotalSeat=0;
obj.StaticsReportList.forEach(outItem=>{
TotalSeat+=outItem.CommonReport.HouseStatistics.RealityNum;
});
this.$router.push({ name:path,query:{"TCID":obj.TCIDs,TotalNumber:TotalSeat,blank:'y',tab:title}})
goUrlX(path, obj,outItem,title){
this.$router.push({
name: path,
query: {
"TCID": obj.TCIDS,
StartDate: obj.StartDateStr,
DayNum: obj.DayNum,
TotalNumber: obj.TotalSeat, //机位总数
RealityYSeatNum:obj.CommonReport.HouseStatistics.RealityYSeatNum,
RealityESeatNum:obj.CommonReport.HouseStatistics.RealityESeatNum,
RealityFSeatNum:obj.CommonReport.HouseStatistics.RealityFSeatNum,
LeaderName:obj.LeaderName,
GuideName:obj.GuideName,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
title:obj.Titles,
TCNUMS:obj.TCNUMS,
InOut:obj.InOut,
RealityNum:obj.CommonReport.HouseStatistics.RealityNum,
tab: title
}
})
},
goUrlR(path,obj,title){
this.$router.push({ name:path,query:{"ID":obj,blank:'y',tab:title}})
......
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