Skip to content

S
SuperMan
Commit 52bc2946 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 4142907f 824e4ca3
Show whitespace changes
Inline Side-by-side
Showing with 781 additions and 432 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 52bc2946
......@@ -182,14 +182,14 @@
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
<div class="rb_top_row _r_mb5">
<el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.gongzhang')}}</el-radio>
<el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.sizhang')}}</el-radio>
<el-radio :label="2" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.rmbxianjin')}}</el-radio>
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.gongzhang')}}</el-radio>
<el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.sizhang')}}</el-radio>
<el-radio :label="2" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.rmbxianjin')}}</el-radio>
<el-radio :label="3" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48'>{{$t('fnc.wbxianjin')}}</el-radio>
<el-radio :label="4" v-if='(msg.TemplateId===36 || msg.TemplateId===37) && msg.TemplateId!==43'>{{$t('fnc.zjinchi')}}</el-radio>
<el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
<el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.djxnzhanghu')}}</el-radio>
<el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.szxiangdi')}}</el-radio>
<el-radio :label="4" v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48'>{{$t('fnc.zjinchi')}}</el-radio>
<el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
<el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.djxnzhanghu')}}</el-radio>
<el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.szxiangdi')}}</el-radio>
<!-- <el-radio :label="3">资金池</el-radio> -->
</el-radio-group>
</div>
......@@ -658,6 +658,7 @@ export default {
resultCode:null,
EmployeeId:0,
describeList:[],
isFrompassenger:false,
}
},
methods:{
......@@ -896,6 +897,7 @@ export default {
if(res.data.resultCode==1){
//清除旅客名单数据
sessionStorage.removeItem("saveGuestInfo");
sessionStorage.removeItem("guoji");
// this.$store.commit('saveGuestInfo',[])
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
confirmButtonText: this.$t('fnc.jxzhidan'),
......@@ -1144,6 +1146,7 @@ export default {
this.apipost('Financial_post_GetCostTypeList',{ID:id}, res => {
if(res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data;
console.log(this.GetCostTypeList,'type');
if(type){
this.msg.detailList.forEach(x=>{
this.GetCostTypeList.forEach(y=>{
......@@ -1265,6 +1268,9 @@ export default {
{
this.msg.Type=this.$route.query.InPay;
}
if(this.isFrompassenger){
this.setDocument();
}
}else{
this.loading=false;
this.$message.error(res.data.message);
......@@ -1309,19 +1315,102 @@ export default {
this.companyList = data;
}, err => {})
},
//设置选中单据名单
setDocument(){
let guojiSessions = JSON.parse(window.sessionStorage.getItem("guoji"));
if(guojiSessions.guojiArr.length>0){
this.msg.detailList.push({
ID:0,
UnitPrice:'',
UnitPriceTo:'',
Number:guojiSessions.guojiArr.length,
Rate:'',
CostTypeId:52,
CurrencyId:'',
Remark:'',
CostTypeName:'',
yTotalPrice:'',
yTotalPriceTo:'',
bTotalPrice:'',
bTotalPriceTo:'',
show:false,
});
}
if(guojiSessions.guoneiArr.length>0){
this.msg.detailList.push({
ID:0,
UnitPrice:'',
UnitPriceTo:'',
Number:guojiSessions.guoneiArr.length,
Rate:'',
CostTypeId:66,
CurrencyId:'',
Remark:'',
CostTypeName:'',
yTotalPrice:'',
yTotalPriceTo:'',
bTotalPrice:'',
bTotalPriceTo:'',
show:false,
});
}
if(guojiSessions.shuijinArr.length>0){
this.msg.detailList.push({
ID:0,
UnitPrice:'',
UnitPriceTo:'',
Number:guojiSessions.shuijinArr.length,
Rate:'',
CostTypeId:80,
CurrencyId:'',
Remark:'',
CostTypeName:'',
yTotalPrice:'',
yTotalPriceTo:'',
bTotalPrice:'',
bTotalPriceTo:'',
show:false,
});
}
if(this.orderObj!=null&&this.orderObj.OrderSource===4&&this.isFrompassenger){
let guojiSessions = JSON.parse(window.sessionStorage.getItem("guoji"));
let guoji='',guonei='',guojizhongduan='',shuijin='',shengcang='';
guojiSessions.guojiArr.forEach(x=>{
guoji+=x+' '
})
guojiSessions.guoneiArr.forEach(x=>{
guonei+=x+' '
})
guojiSessions.gjzdArr.forEach(x=>{
guojizhongduan+=x+' '
})
guojiSessions.shuijinArr.forEach(x=>{
shuijin+=x+' '
})
guojiSessions.shengcangArr.forEach(x=>{
shengcang+=x+' '
})
var gj = guoji==''?'':'国际机票:'+guoji;
var gn = guonei==''?'':'国内航段:'+guonei;
var gjzd = guojizhongduan==''?'':'国际中断:'+guojizhongduan;
var sj = shuijin==''?'':'税金:'+shuijin;
var sc = shengcang==''?'':'升舱:'+shengcang;
this.Description= gj+' '+gn+' '+gjzd+ ' '+ sj+' '+sc
}
}
},created(){
var that=this;
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
this.isFrompassenger = this.orderObj.isFromPassenger;
console.log(this.orderObj,'orderObj');
// console.log(this.$route.query.orderObj)
if(this.orderObj!=null&&this.orderObj.OrderSource===10){
if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
that.Description="旅客名单：";
that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
console.log("that.describeList",that.describeList)
that.describeList.forEach(item=>{
that.Description+=item.GuestName+" ";
})
console.log("that.Description",that.Description)
}
},mounted(){
let userInfo = this.getLocalStorage();
......@@ -1359,6 +1448,7 @@ export default {
this.returnCode = this.$route.query.Conditon;
}
// this.admin_get_DepartmentGetList();
},components: {
"my-FlowChartModule": myFlowChartModule
}
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 52bc2946
......@@ -520,7 +520,6 @@
});
},
goZhiDan: function (obj) {
console.log(this.TotalNav.reimburseTotalPrice.PlanPrice)
let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95
let totailMoney = 0
this.nav.forEach(x=>{
......@@ -699,6 +698,8 @@
nav.forEach((x, i)=>{
if (i === 0) {
x.LeaderGetPriceT = (this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95) - num;
} else {
x.LeaderGetPriceT = 0
}
})
this.nav = nav
......
src/components/SalesModule/enrollTotal.vue
View file @ 52bc2946
......@@ -304,7 +304,7 @@
</div>
</div>
</td>
<td colspan="8" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;">
<td colspan="9" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>收款单据：</div>
<div>
......@@ -752,8 +752,7 @@
background: #bdbdbd;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 15px;
text-align: center;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 52bc2946
......@@ -2,8 +2,9 @@
.shoppingStore .hotelResource {
width: 100%;
margin-top: 20px;
}
.shoppingStore .resourceList {
}
.shoppingStore .resourceList {
width: 215px;
height: 230px;
background-color: #fff;
......@@ -13,25 +14,29 @@
font-size: 12px;
color: #333333;
float: left;
}
.shoppingStore .resourceList:hover {
}
.shoppingStore .resourceList:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
.shoppingStore .reTopInfo {
}
.shoppingStore .reTopInfo {
width: 100%;
height: 123px;
position: relative;
}
.shoppingStore .reTopInfo img {
}
.shoppingStore .reTopInfo img {
position: absolute;
width: 100%;
height: 100%;
top: 0;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.shoppingStore .profitList {
}
.shoppingStore .profitList {
position: absolute;
width: 132px;
height: 54px;
......@@ -43,15 +48,18 @@
left: 50%;
margin-left: -66px;
top: 32px;
}
.shoppingStore .cumlaProfit {
}
.shoppingStore .cumlaProfit {
display: inline-block;
padding: 0 10px;
}
.shoppingStore .profOne {
}
.shoppingStore .profOne {
margin: 8px 0 5px 0;
}
.shoppingStore .eventName {
}
.shoppingStore .eventName {
position: absolute;
height: 22px;
width: 100%;
......@@ -63,31 +71,36 @@
text-overflow: ellipsis;
white-space: nowrap;
line-height: 22px;
}
.shoppingStore .AccumuTrading {
}
.shoppingStore .AccumuTrading {
color: #666666;
margin: 20px 0 0 20px;
}
.shoppingStore .amountOf {
}
.shoppingStore .amountOf {
font-size: 14px;
color: #333;
margin: 10px 0 0 20px;
font-family: PingFangSC-Semibold, sans-serif;
}
.shoppingStore .PhoneNum {
}
.shoppingStore .PhoneNum {
width: 175px;
height: 24px;
background-color: #ededed;
text-align: center;
line-height: 24px;
margin: 10px auto;
}
.shoppingStore .PhoneNum i {
}
.shoppingStore .PhoneNum i {
font-size: 12px;
color: #afafaf;
margin-right: 10px;
}
.shoppingStore .Sort {
}
.shoppingStore .Sort {
position: absolute;
width: 50px;
height: 25px;
......@@ -98,85 +111,102 @@
background-image: url(../../assets/img/Sort.png);
line-height: 25px;
text-align: center;
}
.shoppingStore .resourceList:hover .profitList {
}
.shoppingStore .resourceList:hover .profitList {
background-color: rgba(4, 213, 124, 0.8);
}
.shoppingStore .btnList {
}
.shoppingStore .btnList {
margin-top: 16px;
text-align: center;
}
.shoppingStore .hotelBtn {
}
.shoppingStore .hotelBtn {
width: 80px;
height: 28px;
background: #f76f6f;
border-radius: 14px;
color: #fff;
cursor: pointer;
}
.shoppingStore .hotelBtn:first-child {
}
.shoppingStore .hotelBtn:first-child {
margin-right: 19px;
}
.shoppingStore .w150 .el-input {
}
.shoppingStore .w150 .el-input {
width: 150px;
}
.shoppingStore .btmAddStore::-webkit-scrollbar {
}
.shoppingStore .btmAddStore::-webkit-scrollbar {
width: 4px;
height: 8px;
}
.shoppingStore .btmAddStore::-webkit-scrollbar-track {
}
.shoppingStore .btmAddStore::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
.shoppingStore .btmAddStore::-webkit-scrollbar-thumb {
}
.shoppingStore .btmAddStore::-webkit-scrollbar-thumb {
border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
}
.shoppingStore .el-pagination {
}
.shoppingStore .el-pagination {
border: none !important;
}
.shoppingStore .btmAddStore {
}
.shoppingStore .btmAddStore {
border-top: 1px solid #d1d1d1;
display: none;
overflow-x: auto;
width:86%;
width: 86%;
overflow-y: auto;
position: fixed;
background: #f9f9f9;
bottom: 0;
}
.shoppingStore .btmTitle {
}
.shoppingStore .btmTitle {
padding: 0 10px;
margin: 20px 0 20px 40px;
border-left: 3px solid #e95252;
font-size: 14px;
color: #000000;
}
.shoppingStore .changeMsg li {
}
.shoppingStore .changeMsg li {
display: inline-block;
color: #666666;
}
.shoppingStore .el-form-item__label {
}
.shoppingStore .el-form-item__label {
font-size: 12px;
}
.shoppingStore .changeMsg {
}
.shoppingStore .changeMsg {
margin-left: 20px;
}
.addressChoice {
}
.addressChoice {
height: 30px;
position: relative;
}
.shoppingStore .addChoice {
}
.shoppingStore .addChoice {
width: 210px;
height: 34px;
border-radius: 17px;
outline: none;
border: 1px solid #d1d1d1;
padding: 0 50px 0 10px;
}
.shoppingStore .addressIcon {
}
.shoppingStore .addressIcon {
position: absolute;
right: 4px;
top: 10px;
......@@ -187,29 +217,33 @@
height: 20px;
line-height: 20px;
cursor: pointer;
}
.shoppingStore .remarkInfo {
}
.shoppingStore .remarkInfo {
float: left;
font-size: 12px;
color: #666;
margin-left: 20px;
}
.shoppingStore .addImg span,
.remarkInfo span {
}
.shoppingStore .addImg span,
.remarkInfo span {
display: inline-block;
width: 100px;
text-align: right;
vertical-align: top;
}
.shoppingStore .reInfo {
}
.shoppingStore .reInfo {
width: 225px;
height: 100px;
border: 1px solid #dadada;
border-radius: 10px;
margin-left: 10px;
padding: 5px;
}
.shoppingStore .addIcon {
}
.shoppingStore .addIcon {
width: 160px;
height: 100px;
background-color: #ececec;
......@@ -219,72 +253,86 @@
cursor: pointer;
display: inline-block;
margin-top: -2px;
}
.shoppingStore .addImg {
}
.shoppingStore .addImg {
display: inline-block;
margin-left: 30px;
font-size: 12px;
}
.shoppingStore .imgDiv {
}
.shoppingStore .imgDiv {
display: inline-block;
margin-left: 20px;
}
.shoppingStore .addIcon i {
}
.shoppingStore .addIcon i {
font-size: 50px;
color: #d1d1d1;
}
.shoppingStore .btmBtn {
}
.shoppingStore .btmBtn {
width: 100%;
height: 70px;
border-top: 1px dashed #d1d1d1;
line-height: 70px;
}
.shoppingStore .addIconDiv {
}
.shoppingStore .addIconDiv {
width: 160px;
height: 100px;
}
.shoppingStore .fillShow,
.isShow {
}
.shoppingStore .fillShow,
.isShow {
display: block !important;
}
.shoppingStore .fillTop,
.divTop {
}
.shoppingStore .fillTop,
.divTop {
height: 320px;
overflow-y: scroll;
}
.shoppingStore .hotelResource::-webkit-scrollbar {
}
.shoppingStore .hotelResource::-webkit-scrollbar {
width: 4px;
height: 8px;
}
.shoppingStore .hotelResource::-webkit-scrollbar-track {
}
.shoppingStore .hotelResource::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
.shoppingStore .hotelResource::-webkit-scrollbar-thumb {
}
.shoppingStore .hotelResource::-webkit-scrollbar-thumb {
border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
}
.shoppingStore .el-textarea__inner {
}
.shoppingStore .el-textarea__inner {
resize: none;
height: 100px;
width: 200px;
}
.shoppingStore .re-img {
}
.shoppingStore .re-img {
width: 140px;
height: 93px;
border-radius: 10px;
float: left;
margin: 0 30px 0 0;
position: relative;
}
.shoppingStore .re-img img {
}
.shoppingStore .re-img img {
width: 100%;
height: 100%;
border-radius: 10px;
}
.shoppingStore .imgzhe {
}
.shoppingStore .imgzhe {
display: none;
background: rgba(0, 0, 0, 0.4);
width: 100%;
......@@ -292,11 +340,13 @@
border-radius: 10px;
position: absolute;
top: 0;
}
.shoppingStore .re-img:hover .imgzhe {
}
.shoppingStore .re-img:hover .imgzhe {
display: block;
}
.shoppingStore .re-delte {
}
.shoppingStore .re-delte {
width: 32px;
height: 32px;
background: gray;
......@@ -306,91 +356,116 @@
color: #fff;
margin: 30px auto;
cursor: pointer;
}
.shoppingStore .re-delte:hover {
}
.shoppingStore .re-delte:hover {
color: #e95252;
background: #fff;
}
.shoppingStore .imgList {
}
.shoppingStore .imgList {
float: left;
}
.shoppingStore .upload-demo {
}
.shoppingStore .upload-demo {
text-align: center;
padding-bottom: 30px;
}
.shoppingStore .impoTable {
}
.shoppingStore .impoTable {
width: 100%;
min-width: 1400px;
}
.shoppingStore .impoTable td {
}
.shoppingStore .impoTable td {
text-align: center;
font-size: 12px;
color: #333;
background-color: #e0f4ff;
height: 34px;
}
.shoppingStore .impoTable th {
}
.shoppingStore .impoTable th {
background-color: #cbe9fa;
color: #387ea5;
height: 34px;
font-size: 12px;
}
.shoppingStore .impotBtn {
}
.shoppingStore .impotBtn {
border-top: none;
}
.shoppingStore .typnNoe {
}
.shoppingStore .typnNoe {
display: none;
}
.shoppingStore .disType {
}
.shoppingStore .disType {
display: block;
}
.shoppingStore .delInfo {
}
.shoppingStore .delInfo {
display: inline-block;
color: #387ea5;
width: 30px;
height: 20px;
cursor: pointer;
}
.shoppingStore .redType .el-input__inner {
}
.shoppingStore .redType .el-input__inner {
border-color: #e95252;
}
.shoppingStore .downBtn {
}
.shoppingStore .downBtn {
padding: 6px 20px;
position: relative;
top: -1px;
}
.shoppingStore .litTip {
}
.shoppingStore .litTip {
font-size: 12px;
margin-left: 10px;
}
.shoppingStore .el-dialog--center .el-dialog__body {
}
.shoppingStore .el-dialog--center .el-dialog__body {
padding: 15px 25px 0 !important;
}
.shoppingStore .mapList {
}
.shoppingStore .mapList {
width: 850px !important;
height: 510px !important;
}
.delScien {
}
.delScien {
color: #fff;
}
.shoppingStore .delScien {
}
.shoppingStore .delScien {
position: absolute;
right: 10px;
top: 10px;
display: none;
}
.shoppingStore .delScien:hover {
}
.shoppingStore .delScien:hover {
color: #f76f6f;
cursor: pointer;
}
.shoppingStore .resourceList:hover .delScien {
}
.shoppingStore .resourceList:hover .delScien {
display: block;
}
.shoppingStore .combottomDiv{height:400px;}
.IsConflict td{
background-color:pink!important;
}
/* 购物店 */
}
.shoppingStore .combottomDiv {
height: 400px;
}
.IsConflict td {
background-color: pink !important;
}
/* 购物店 */
</style>
<template>
<div class="flexOne shoppingStore">
......@@ -399,13 +474,13 @@
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.QCountry" clearable class="w150" filterable @change="getProvinceList(msg.QCountry,1)"
:placeholder="$t('hotel.hotel_country')">
<el-select v-model="msg.QCountry" clearable class="w150" filterable
@change="getProvinceList(msg.QCountry,1)" :placeholder="$t('hotel.hotel_country')">
<el-option v-for='item in countryList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
<el-select v-model="msg.QProvince" clearable class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
:placeholder="$t('hotel.hotel_province')">
<el-select v-model="msg.QProvince" clearable class="w150" filterable
@change="getProvinceList(msg.QProvince,2)" :placeholder="$t('hotel.hotel_province')">
<el-option v-for='item in provinceList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
......@@ -427,7 +502,8 @@
</span>
</li>
<li>
<button class="hollowFixedBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button>
<button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button>
<a class="hollowFixedBtn downBtn" :href="downList">下载模板</a>
......@@ -466,8 +542,8 @@
</div>
</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 background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
<div class="combottomDiv" v-if="isShow">
<el-row>
......@@ -496,18 +572,22 @@
</li>
<li>
<el-form-item label="国家">
<el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w150' @change="GetSubAreaList(addMsg.Country,1)">
<el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w150'
@change="GetSubAreaList(addMsg.Country,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in AddMsgCountryList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
<el-option v-for="childItem in AddMsgCountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="省">
<el-select placeholder="请选择省" filterable class='multiple_input w150' v-model="addMsg.Province" @change="GetSubAreaList(addMsg.Province,2)">
<el-select placeholder="请选择省" filterable class='multiple_input w150' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in AddMsgProvinceList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
<el-option v-for="childItem in AddMsgProvinceList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
......@@ -516,7 +596,8 @@
<el-form-item label="市">
<el-select placeholder="请选择市" filterable class='multiple_input w150' v-model="addMsg.City">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in AddMsgCityList" :key="childItem.ID" :label="childItem.Name" :value="childItem.ID">
<el-option v-for="childItem in AddMsgCityList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
......@@ -531,9 +612,10 @@
</li>
<li>
<el-form-item label="营业时间">
<el-time-select v-model="startTime" :picker-options="{start: '00:00',step: '00:05',end: '24:00'}" class="w150"
placeholder="选择时间"></el-time-select>
至 <el-time-select placeholder="结束时间" v-model="endTime" class="w150" :picker-options="{ start: '00:00', step: '00:05', end: '24:00',minTime: startTime}"></el-time-select>
<el-time-select v-model="startTime" :picker-options="{start: '00:00',step: '00:05',end: '24:00'}"
class="w100" placeholder="选择时间"></el-time-select>
至 <el-time-select placeholder="结束时间" v-model="endTime" class="w100"
:picker-options="{ start: '00:00', step: '00:05', end: '24:00',minTime: startTime}"></el-time-select>
</el-form-item>
</li>
<li>
......@@ -546,6 +628,15 @@
<el-input v-model="addMsg.Contact" class="w150" maxlength="20"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="资金池账户">
<el-select placeholder="请选择资金池" class='multiple_input w150' v-model="addMsg.CapitalPoolId">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for='item in accountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
</ul>
<div class="clearfix">
<div class="remarkInfo">
......@@ -565,8 +656,8 @@
</div>
</div>
<div class="addIcon">
<el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :http-request="UploadImage" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<div class="addIconDiv">
<i class="iconfont icon-img_haha"></i>
</div>
......@@ -641,7 +732,8 @@
</el-dialog>
<el-dialog custom-class='w700' title="导入营销数据" :visible.sync="outerVisible" center>
<el-upload drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
<el-upload drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div slot="tip" class="el-upload__tip">只能上传Excel文件</div>
......@@ -694,7 +786,7 @@
//城市列表
AddMsgCityList: [],
//表格Loading
tabLoading:false,
tabLoading: false,
msg: {
pageIndex: 1,
pageSize: 14,
......@@ -720,8 +812,12 @@
PicPath: "",
Country: 0,
Province: 0,
City: 0
City: 0,
//资金池编号
CapitalPoolId: 0
},
//资金池账户列表
accountList: [],
rules: {
Name: [{
required: true,
......@@ -991,6 +1087,22 @@
this.isShow = true;
this.addMsg.ID = 0;
this.titleInfo = "新增购物店";
this.addMsg.Name = "";
this.addMsg.Type = "";
this.addMsg.Contact = "";
this.addMsg.Tel = "";
this.addMsg.Remark = "";
this.addMsg.BusinessHours = "";
this.addMsg.Address = "";
this.addMsg.QCountry = "";
this.addMsg.QProvince = "";
this.addMsg.QCity = "";
this.addMsg.QDistrict = 0;
this.addMsg.PicPath = "";
this.addMsg.Country = 0;
this.addMsg.Province = 0;
this.addMsg.City = 0;
this.addMsg.CapitalPoolId = 0;
},
hideFill() {
this.fillShow = false;
......@@ -1129,9 +1241,23 @@
null
);
});
},
GetCashPoolList() { // 获取资金池账
this.apipost('BankAccount_post_GetCashPoolListExt', {
Alias: ''
}, res => {
if (res.data.resultCode === 1) {
let data = res.data.data;
data.forEach(x => {
x.allName = x.Alias;
});
this.accountList = data;
}
}, err => {})
}
},
mounted() {
this.GetCashPoolList();
var jsArray = document.getElementsByTagName("script");
var flag = false;
var jsUrl = this.domainManager().GoogleMapUrl;
......
src/components/Ticketing/PassengerList.vue
View file @ 52bc2946
......@@ -117,12 +117,18 @@
</li>
<li>
<input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" />
<input type="button" class="normalBtn" v-if="isShowGuoji" value="制作财务单据" @click="makeFinacelDoc()" />
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none;"/>
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th v-if="isShowGuoji">国际机票 <input type="checkbox" @change="checkAllbox(checkdGuoji,'guoji')" v-model="checkdGuoji"/></th>
<th v-if="isShowGuoji">国内机票 <input type="checkbox" @change="checkAllbox(checkedGuonei,'guonei')" v-model="checkedGuonei"/></th>
<th v-if="isShowGuoji">国际中断 <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')" v-model="checkedGJzd"/></th>
<th v-if="isShowGuoji">税金 <input type="checkbox" @change="checkAllbox(checkedshuijin,'shuijin')" v-model="checkedshuijin"/></th>
<th v-if="isShowGuoji">升舱 <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')" v-model="checkedsc"/></th>
<th>旅客姓名</th>
<th>身份证</th>
<th>英文姓</th>
......@@ -135,6 +141,21 @@
<th>客人联系方式</th>
</tr>
<tr v-for="(item,index) in QueryMsg.dataList">
<td v-if="isShowGuoji">
<input v-model="item.guoji" type="checkbox"/>
</td>
<td v-if="isShowGuoji">
<input v-model="item.guonei" type="checkbox"/>
</td>
<td v-if="isShowGuoji">
<input v-model="item.gjzd" type="checkbox"/>
</td>
<td v-if="isShowGuoji">
<input v-model="item.shuijin" type="checkbox"/>
</td>
<td v-if="isShowGuoji">
<input v-model="item.shengcang" type="checkbox"/>
</td>
<td>{{item.GuestName}}</td>
<td>{{item.IdCard}}</td>
<td>{{item.ESurName}}</td>
......@@ -260,6 +281,19 @@
outerVisible: false,
flightList: [],
combineTeamList: [],
isShowGuoji:false,
jipiaoObj:{
guojiArr:[],
guoneiArr:[],
gjzdArr:[],
shuijinArr:[],
shengcangArr:[]
},
checkdGuoji:false,
checkedGuonei:false,
checkedGJzd:false,
checkedshuijin:false,
checkedsc:false,
};
},
methods: {
......@@ -282,6 +316,16 @@
item.Sex = "女";
}
});
if(this.isShowGuoji){
this.QueryMsg.dataList.forEach(x=>{
x.guoji = false;
x.guonei=false;
x.gjzd = false;
x.shuijin = false;
x.shengcang = false;
})
}
console.log(this.QueryMsg.dataList);
}
},
err => {}
......@@ -413,11 +457,69 @@
},
err => {}
);
},
makeFinacelDoc(){
this.jipiaoObj.guojiArr=[];
this.jipiaoObj.guoneiArr=[];
this.jipiaoObj.gjzdArr=[];
this.jipiaoObj.shuijinArr=[];
this.jipiaoObj.shengcangArr=[];
this.QueryMsg.dataList.forEach(x=>{
if(x.guoji){
this.jipiaoObj.guojiArr.push(x.GuestName);
}
if(x.guonei){
this.jipiaoObj.guoneiArr.push(x.GuestName);
}
if(x.gjzd){
this.jipiaoObj.gjzdArr.push(x.GuestName);
}
if(x.shuijin){
this.jipiaoObj.shuijinArr.push(x.GuestName);
}
if(x.shengcang){
this.jipiaoObj.shengcangArr.push(x.GuestName);
}
})
sessionStorage.setItem("guoji",JSON.stringify(this.jipiaoObj));
let orderObj = {
OrderID: 0,
OrderSource: 4,
Obj: {},
SourceID: this.$route.query.SourceID,
TCIDList: [],
isFromPassenger:true,
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": 2,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
},
//设置全选
checkAllbox(x,y){
if(x){
this.QueryMsg.dataList.forEach(x=>{
x[y]=true
})
}else{
this.QueryMsg.dataList.forEach(x=>{
x[y]=false
})
}
}
},
mounted() {
this.QueryMsg.AirTicketId = this.$route.query.id;
this.msg.AirTicketId = this.$route.query.id;
if(this.$route.query.isFromTk!=undefined){
this.isShowGuoji = this.$route.query.isFromTk;
}
var myDate = new Date();
this.QueryMsg.nowDate =
myDate.getFullYear() +
......@@ -426,6 +528,9 @@
"-" +
myDate.getDate();
this.getTeamInfo();
if(this.isShowGuoji){
this.msg.PageSize=200;
}
this.getList();
}
};
......
src/components/Ticketing/TicketManager.vue
View file @ 52bc2946
......@@ -1516,7 +1516,7 @@
</div>
</li>
<!--尾款-->
<li v-if="item.FinalPayment!=''">
<li v-if="item.FinalPayment!=''&&item.FirstDeposit==''&&item.SecondDeposit==''&&item.ThirdDeposit==''&&item.FourthDeposit==''">
<div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
......@@ -1529,6 +1529,19 @@
</span>
</div>
</li>
<li v-else-if="item.FinalPayment!=''">
<div @click="goCustomList('PassengerList',item,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
</el-tooltip>
</div>
<div class="FinaDetailContent">
<span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList">
<span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li>
</ul>
</div>
</el-col>
......@@ -2502,6 +2515,20 @@
}
});
},
//跳转至旅客名单
goCustomList(path, obj, title){
this.$router.push({
name: path,
query: {
blank: 'y',
isFromTk:true,
SourceID: obj.ID,
TCIDList: obj.TCIDList,
companyIDList: obj.OutBranchIdList,
tab: title
}
})
},
//导入
getImport(command) {
this.importType = command;
......@@ -2542,6 +2569,7 @@
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
this.noData = !this.total > 0;
console.log(this.dataList,'datalist');
}
if (this.msg.ID == 0) {
this.msg.ID = "";
......@@ -2772,7 +2800,7 @@
airlineID: AirLineID
};
this.apipost(
"flight_post_GetAirportNameList",
"flight_post_GetAirportNameListExt",
msg,
res => {
if (res.data.resultCode == 1) {
......
src/components/commonPage/fiveday.vue
View file @ 52bc2946
......@@ -136,7 +136,7 @@ export default {
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "【保证入住】"
}
}
}
......
src/components/commonPage/fourday.vue
View file @ 52bc2946
......@@ -138,7 +138,7 @@ export default {
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "【保证入住】"
suffix = "或同級"
}
}
}
......
src/components/commonPage/oneday.vue
View file @ 52bc2946
......@@ -108,7 +108,7 @@ export default {
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "【保证入住】"
suffix = "或同級"
}
}
}
......
src/components/commonPage/threeday.vue
View file @ 52bc2946
......@@ -178,7 +178,7 @@ export default {
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "【保证入住】"
suffix = "或同級"
}
}
}
......
src/components/commonPage/twoday.vue
View file @ 52bc2946
......@@ -105,7 +105,7 @@ export default {
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "【保证入住】"
suffix = "或同級"
}
}
}
......
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