Skip to content

S
SuperMan
Commit d59ecd6c authored by 吴春's avatar 吴春
Browse files
Options

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

parents 5b2b083c 8e1a4759
Hide whitespace changes
Inline Side-by-side
Showing with 1068 additions and 796 deletions
src/components/SignName.vue
View file @ d59ecd6c
......@@ -263,7 +263,8 @@
TCID: this.msg.TCID,
orderID: this.msg.orderID,
guestId: this.msg.guestId,
str:"",//不弹窗
Id: this.msg.Id,
str: "", //不弹窗
}
})
} else {
......@@ -286,7 +287,7 @@
TCID: this.msg.TCID,
OrderId: this.msg.orderID,
GuestId: this.msg.guestId,
ProtocolId:this.msg.ProtocolId,
ProtocolId: this.msg.ProtocolId,
}
})
} else {
......@@ -294,8 +295,8 @@
}
}, null);
}
//老人/孕妇免责协议
else if (this.msg.TypeStr == 'clientDisclaimerProtocol') {
//老人/孕妇免责协议
else if (this.msg.TypeStr == 'clientDisclaimerProtocol') {
var clientDisclaimerProtocolMsg = {
ProtocolId: this.msg.ProtocolId,
GuestSignature: this.SignInfo
......@@ -309,7 +310,7 @@
TCID: this.msg.TCID,
OrderId: this.msg.orderID,
GuestId: this.msg.guestId,
ProtocolId:this.msg.ProtocolId,
ProtocolId: this.msg.ProtocolId,
}
})
} else {
......@@ -320,4 +321,5 @@
},
}
}
</script>
\ No newline at end of file
</script>
src/components/SingleAirTicket/components/OrderList.vue
View file @ d59ecd6c
......@@ -609,6 +609,12 @@
</div>
<div class="c9e fz12">
<span>客人信息：{{ item.GuestName }}<template v-if="item.MobilePhone">/{{ item.MobilePhone }}</template> </span>
<template v-if="item.ContractNum&&item.ContractNum.length>0">
<template v-for="(sItem,sIndex) in item.ContractNum">
<a @click="GoToContract(item,sItem.Id)" style="color:blue;cursor:pointer">{{sItem.ContractNum}}</a>
</template>
</template>
<a v-else style="color:blue;cursor:pointer" @click="GoToContract(item,0)">出境合同</a>
</div>
<div class="row c9e fz12">
<span class="mr" v-if="item.LureEmpName">{{$t('objFill.yinliuren')}}：{{ item.CreateByName }}</span>
......@@ -744,7 +750,6 @@
暂无收款单据
</span>
</div>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">退款单据</div>
......@@ -836,7 +841,8 @@
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<input type="button" class="normalBtn" value="取消订单" @click="cancelOrderHandler" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.closeSel')" @click="cancelOrderDialog = false" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.closeSel')"
@click="cancelOrderDialog = false" />
</el-col>
</el-row>
</div>
......@@ -976,11 +982,21 @@
}
},
methods: {
//合同跳转
GoToContract(item, id) {
this.OpenNewPage('/TravelContractNew', {
Id: id,
TCID: 0,
guestId: 0,
orderID: item.OrderId,
orderType: 1,
});
},
// 跳转发票详情页面
goInvoiceDetail(item) {
this.OpenNewPage('/invoicesManagerDetail', {
id: item.ID,
InvoiceApplyType:4,
InvoiceApplyType: 4,
noDetail: 1,
});
},
......
src/components/TravelContractDetail.vue
View file @ d59ecd6c
......@@ -381,6 +381,7 @@
font-size: 12px;
color: gray;
}
</style>
<template>
......@@ -783,7 +784,15 @@
<p>成团的最低人数：<span>{{dataList.minNumber}}</span>人。</p>
<p>如不能成团，旅游者是否同意按下列方式解决：</p>
<p>
1.<span>{{dataList.insteadOpinion==1?'同意':'不同意'}}</span>出境社委托<span>{{dataList.insteadCompany}}</span>出境社履行合同；
1.<span>{{dataList.insteadOpinion==1?'同意':'不同意'}}</span>
<template v-if="dataList.orderType==0">
出境社委托<span>{{dataList.insteadCompany}}</span>
出境社履行合同；
</template>
<template v-else>
转给<span>{{dataList.insteadCompany}}</span>
操作；
</template>
</p>
<p>2.<span>{{dataList.delayOpinion==1?'同意':'不同意'}}</span>（同意或者不同意，打勾无效）延期出团；</p>
<p>3.<span>{{dataList.changeOpinion==1?'同意':'不同意'}}</span>（同意或者不同意，打勾无效）改签其他线路出团；</p>
......@@ -917,28 +926,56 @@
</div>
<!-- 游客名单 -->
<div class="guests" :class="{'checkedNav':cked==4}">
<table class="ZTable">
<tbody>
<tr>
<td width="10%">序号</td>
<td width="15%">姓名</td>
<td width="10%">性别</td>
<td width="10%">证件类型</td>
<td width="20%">证件号码</td>
<td width="20%">联系方式</td>
<td width="15%">身体状况</td>
</tr>
<tr v-for="(item,index) in dataList.guestList">
<td>{{index+1}}</td>
<td>{{item.surName+''+item.name}}</td>
<td>{{item.sex==1?'男':'女'}}</td>
<td>护照</td>
<td>{{item.passportNo}}</td>
<td>{{item.mobilePhone}}</td>
<td>健康</td>
</tr>
</tbody>
</table>
<template v-if="dataList.orderType==0">
<table class="ZTable">
<tbody>
<tr>
<td width="10%">序号</td>
<td width="15%">姓名</td>
<td width="10%">性别</td>
<td width="10%">证件类型</td>
<td width="20%">证件号码</td>
<td width="20%">联系方式</td>
<td width="15%">身体状况</td>
</tr>
<tr v-for="(item,index) in dataList.guestList">
<td>{{index+1}}</td>
<td>{{item.surName+''+item.name}}</td>
<td>{{item.sex==1?'男':'女'}}</td>
<td>护照</td>
<td>{{item.passportNo}}</td>
<td>{{item.mobilePhone}}</td>
<td>健康</td>
</tr>
</tbody>
</table>
</template>
<template v-else>
<table class="ZTable">
<tbody>
<tr>
<td width="10%">序号</td>
<td width="15%">姓名</td>
<td width="10%">性别</td>
<td width="10%">证件类型</td>
<td width="20%">证件号码</td>
<td width="20%">联系方式</td>
<td width="15%">身体状况</td>
</tr>
<tr v-for="(item,index) in dataList.guestInfo">
<td>{{index+1}}</td>
<td>{{item.Name}}</td>
<td>{{item.Sex}}</td>
<td>护照</td>
<td>{{item.PassportNo}}</td>
<td>{{item.Mobile}}</td>
<td>健康</td>
</tr>
</tbody>
</table>
</template>
</div>
<!-- 团队行程 -->
<div class="routes" :class="{'checkedNav':cked==5}">
......@@ -1068,7 +1105,9 @@
msg: {
TCID: 0,
orderID: 0,
guestId: 0
guestId: 0,
Id: 0,
orderType: 0,
},
//数据源
dataList: [],
......@@ -1092,14 +1131,21 @@
GetQrCode: function () {
let urlObj = this.domainManager();
var guestId = 0;
var Id = 0;
if (this.$route.query.guestId) {
guestId = this.$route.query.guestId;
}
if (this.$route.query.ID) {
Id = this.$route.query.ID;
}
if (this.$route.query.Id) {
Id = this.$route.query.Id;
}
let msg = {
TCID: this.$route.query.TCID,
orderID: this.$route.query.orderID,
guestId: guestId,
Id: this.$route.query.ID,
Id: Id,
pUrl: "clientConfirm",
};
this.$http({
......@@ -1123,9 +1169,7 @@
toContractPDF: function (title) {
let urlObj = this.domainManager();
let msg = {
TCID: this.$route.query.TCID,
GuestId: this.msg.guestId,
orderID: this.$route.query.orderID,
Id: this.msg.Id,
};
this.pdfLoading = true;
this.$http({
......@@ -1157,6 +1201,7 @@
getList() {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
console.log("travelcontract_post_GetContractInfoService_details", res.data.data);
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
......@@ -1242,12 +1287,23 @@
},
mounted() {
this.CurrentUserInfo = this.getLocalStorage();
let TID = 0;
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.msg.guestId = this.$route.query.guestId;
let TID = this.$route.query.ID;
if (this.$route.query.orderType) {
this.msg.orderType = this.$route.query.orderType;
}
if (this.$route.query.Id) {
this.msg.Id = this.$route.query.Id;
TID = this.$route.query.Id;
}
if (this.$route.query.ID) {
TID = this.$route.query.ID;
}
this.getList();
this.getShow(TID);
}
};
</script>
\ No newline at end of file
</script>
src/components/TravelContractNew.vue
View file @ d59ecd6c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/clientConfirm.vue
View file @ d59ecd6c
......@@ -495,6 +495,7 @@
font-size: 1rem;
color: gray;
}
</style>
<template>
......@@ -980,8 +981,15 @@
</h3>
<p>成团的最低人数：<font>{{dataList.minNumber}}</font>人。</p>
<p>如不能成团，旅游者是否同意按下列方式解决：</p>
<p>1.<font>{{dataList.insteadOpinion==1?'同意':'不同意'}}</font>出境社委托<font>{{dataList.insteadCompany}}</font>
出境社履行合同；</p>
<p>1.<font>{{dataList.insteadOpinion==1?'同意':'不同意'}}</font>
<template v-if="dataList.orderType==0">
出境社委托<font>{{dataList.insteadCompany}}</font>
出境社履行合同；
</template>
<template v-else>
转给<font>{{dataList.insteadCompany}}</font>操作；
</template>
</p>
<p>2.<font>{{dataList.delayOpinion==1?'同意':'不同意'}}</font>（同意或者不同意，打勾无效）延期出团；</p>
<p>3.<font>{{dataList.changeOpinion==1?'同意':'不同意'}}</font>（同意或者不同意，打勾无效）改签其他线路出团；</p>
<p>4.<font>{{dataList.terminateOpinion==1?'同意':'不同意'}} </font>（同意或者不同意，打勾无效）解除合同。</p>
......@@ -1158,41 +1166,81 @@
</div>
<!-- 游客名单 -->
<div v-show="ActiveTab==4" class="item_content">
<ul class="guestUl">
<li v-for="(item,index) in dataList.guestList" :key="index">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">姓名：</el-col>
<el-col :span="16" style="text-align:left">
{{item.surName+''+item.name}}({{item.eSurName+''+item.eName}})</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">性别：</el-col>
<el-col :span="16" style="text-align:left">{{item.sex==1?'男':'女'}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">证件类型：</el-col>
<el-col :span="16" style="text-align:left">护照</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">证件号码</el-col>
<el-col :span="16" style="text-align:left">{{item.passportNo}}</el-col>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">联系方式：</el-col>
<el-col :span="16" style="text-align:left">{{item.mobilePhone}}</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">身体状况：</el-col>
<el-col :span="16" style="text-align:left">健康</el-col>
</el-col>
</el-row>
</li>
</ul>
<template v-if="dataList.orderType==0">
<ul class="guestUl">
<li v-for="(item,index) in dataList.guestList" :key="index">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">姓名：</el-col>
<el-col :span="16" style="text-align:left">
{{item.surName+''+item.name}}({{item.eSurName+''+item.eName}})</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">性别：</el-col>
<el-col :span="16" style="text-align:left">{{item.sex==1?'男':'女'}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">证件类型：</el-col>
<el-col :span="16" style="text-align:left">护照</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">证件号码</el-col>
<el-col :span="16" style="text-align:left">{{item.passportNo}}</el-col>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">联系方式：</el-col>
<el-col :span="16" style="text-align:left">{{item.mobilePhone}}</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">身体状况：</el-col>
<el-col :span="16" style="text-align:left">健康</el-col>
</el-col>
</el-row>
</li>
</ul>
</template>
<template v-else>
<ul class="guestUl" v-if="dataList.guestInfo">
<li v-for="(item,index) in dataList.guestInfo" :key="index">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">姓名：</el-col>
<el-col :span="16" style="text-align:left">
{{item.Name}}</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">性别：</el-col>
<el-col :span="16" style="text-align:left">{{item.Sex}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">证件类型：</el-col>
<el-col :span="16" style="text-align:left">护照</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">证件号码</el-col>
<el-col :span="16" style="text-align:left">{{item.PassportNo}}</el-col>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">联系方式：</el-col>
<el-col :span="16" style="text-align:left">{{item.Mobile}}</el-col>
</el-col>
<el-col :span="12">
<el-col :span="8" style="text-align:right">身体状况：</el-col>
<el-col :span="16" style="text-align:left">健康</el-col>
</el-col>
</el-row>
</li>
</ul>
</template>
</div>
<!-- 团队行程 -->
<div v-show="ActiveTab==5" class="item_content">
......@@ -1408,4 +1456,5 @@
this.getList();
}
};
</script>
\ No newline at end of file
</script>
src/plug/index.js
View file @ d59ecd6c
......@@ -121,7 +121,7 @@ export default {
let locationName = window.location.hostname;
let isOnline = 0; //0-本地测试，1-线上
let ocrUrl = "http://192.168.5.46:8888";
domainUrl = "http://192.168.5.214";
domainUrl = "http://192.168.5.46";
let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
let javaUrldo = "";
......@@ -129,7 +129,7 @@ export default {
//商城API
mallUrl = "http://192.168.5.214:8200";
lxymallUrl = "http://192.168.20.13:8088";
crmUrl = "http://crm.oytour.com"
crmUrl = "http://192.168.5.46:5003"
if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com";
mallUrl = "https://mallapi.oytour.com";
......@@ -301,12 +301,14 @@ export default {
let TCID = this.$route.query.TCID;
let orderID = this.$route.query.orderID;
let guestId = this.$route.query.guestId;
let Id = this.$route.query.Id;
this.$router.push({
name: "clientConfirm",
query: {
TCID: TCID,
orderID: orderID,
guestId: guestId,
Id: Id
}
})
} else if (this.$route.path == "/clientProtocol") {
......@@ -323,18 +325,6 @@ export default {
ProtocolId: ProtocolId,
}
})
} else if (this.$route.path == "/clientConfirmRB") {
let TCID = this.$route.query.TCID;
let orderID = this.$route.query.orderID;
let guestId = this.$route.query.guestId;
this.$router.push({
name: "clientConfirmRB",
query: {
TCID: TCID,
orderID: orderID,
guestId: guestId,
}
})
} else if (this.$route.path == "/clientDisclaimerProtocol") {
let TCID = this.$route.query.TCID;
let OrderId = this.$route.query.OrderId;
......
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