Skip to content

S
SuperMan
Commit a4ab430c authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 1092fa52 05787745
Hide whitespace changes
Inline Side-by-side
Showing with 444 additions and 439 deletions
src/components/SignName.vue
View file @ a4ab430c
......@@ -117,6 +117,7 @@
guestId: 0, //旅客编号
ProtocolId: 0, //保密协议编号
TypeStr: "", //跳转页面地址
ContractId:0,//单项合同Id
},
}
},
......@@ -142,6 +143,9 @@
if (this.$route.query && this.$route.query.TypeStr) {
this.msg.TypeStr = this.$route.query.TypeStr;
}
if(this.$route.query && this.$route.query.ContractId) {
this.msg.ContractId = this.$route.query.ContractId;
}
this.getCanvas();
document.getElementsByTagName('body')[0].style = "overscroll-behavior-y: contain;"
},
......@@ -342,6 +346,26 @@
}
}, null);
}
else if (this.msg.TypeStr == 'TravelContractConfirm') {
var postMsg = {
ID: this.msg.ContractId,
Tourists_Sign: this.SignInfo
}
this.apipost("travelcontract_post_UpdateTravelContractSignService", postMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
var path = "TravelContractConfirm";
this.$router.push({
name: path,
query: {
ContractId: this.msg.ContractId,
}
})
} else {
this.Error(res.data.message);
}
});
}
},
}
}
......
src/components/TravelContractConfirm.vue
View file @ a4ab430c
<style>
<style>
* {
margin: 0;
padding: 0;
......@@ -16,6 +16,7 @@
margin: 0 auto;
background-color: #fff;
height: 100%;
margin-bottom: 8vh;
}
.TCdiv_content .contractLeft {
......@@ -281,12 +282,44 @@
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
}
.TcConfirmMain {
padding-bottom: 180px;
}
.TcConfirmMain .isShowSign {
z-index: 999 !important;
}
.TCdiv_content .signSpan {
position: fixed;
bottom: 0;
width: 100%;
left: 0;
background: #fff;
border-top: 1px solid #ccc;
z-index: 1000;
height: 180px;
}
.TCdiv_content .signSpan .sign {
width: 75%;
margin: 0 auto;
padding: 1rem 0 0 0;
text-align: center;
cursor: pointer;
}
.TCdiv_content .signSpan .sign .sp1 {
display: inline-block;
width: 25px;
height: 25px;
background-image: url('../assets/img/dzht/bg1.png');
background-size: 132px;
background-position: 52px 29px;
}
.CisHideen {
display: none;
overflow: hidden;
......@@ -341,35 +374,7 @@
z-index: 1000;
}
.TCdiv_content .signSpan {
position: fixed;
bottom: 0;
width: 100%;
left: 0;
background: #fff;
border-top: 1px solid #ccc;
z-index: 1000;
padding-bottom: 32px;
}
.TCdiv_content .signSpan .sign {
width: 75%;
margin: 0 auto;
padding: 1rem 0 0 0;
text-align: center;
cursor: pointer;
}
.TCdiv_content .signSpan .sign .sp1 {
display: inline-block;
width: 25px;
height: 25px;
background-image: url('../assets/img/dzht/bg1.png');
background-size: 132px;
background-position: 52px 29px;
}
.TCdiv_content li {
list-style: none;
......@@ -606,33 +611,32 @@
<template>
<div class="TcConfirmMain">
<template v-if="CtObj.CType==1">
<div class="TCdiv_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 -->
<div class="signSpan">
<div @click="dialogVisible=true" :class="dialogVisible?'CisHideen':''" class="sign">
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem"
v-if="CtObj.Tourists_Sign==''||CtObj.Tourists_Sign==null">{{$t('objFill.v101.qianzhi')}}</span>
<span style="font-size:2rem" v-else>重新签字</span>
</div>
<div style="width:100%;height:50px;">&nbsp;</div>
<div class="TCdiv_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 -->
<div class="signSpan">
<div @click="goUrl()" :class="dialogVisible?'CisHideen':''" class="sign">
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem"
v-if="CtObj.Tourists_Sign==''||CtObj.Tourists_Sign==null">{{$t('objFill.v101.qianzhi')}}</span>
<span style="font-size:2rem" v-else>重新签字</span>
</div>
<!-- 开始进入弹窗 -->
<div class=TipTc v-if="tcShow">
<div class="TipsDiv" style="text-align:center;line-height:2">
<h4 style="font-size: 2.5rem;color: #24ade5;">中国公民文明旅游公约</h4>
<ul style="font-size:2rem" class="conventionList">
<li>重安全，讲礼仪；</li>
<li>不喧哗，杜陋习；</li>
<li>守良俗，明事理；</li>
<li>爱环境，护古迹；</li>
<li>文明行，最得体。</li>
</ul>
<span @click="tcShow=false" class="readSpan">已阅知</span>
</div>
<!-- <div style="width:100%;height:4vh">&nbsp;</div> -->
</div>
<!-- 开始进入弹窗 -->
<!-- <div class=TipTc v-if="tcShow">
<div class="TipsDiv" style="text-align:center;line-height:2">
<h4 style="font-size: 2.5rem;color: #24ade5;">中国公民文明旅游公约</h4>
<ul style="font-size:2rem" class="conventionList">
<li>重安全，讲礼仪；</li>
<li>不喧哗，杜陋习；</li>
<li>守良俗，明事理；</li>
<li>爱环境，护古迹；</li>
<li>文明行，最得体。</li>
</ul>
<span @click="tcShow=false" class="readSpan">已阅知</span>
</div>
</div> -->
<template v-if="CtObj.CType==1">
<!-- 头部境内旅游 -->
<div class="NavFixed">
<p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p>
......@@ -644,7 +648,8 @@
<li :class="ActiveTab==2?'ActiveLi':''" @click="ChangeTab(2)">相关告知及提示</li>
<li :class="ActiveTab==3?'ActiveLi':''" @click="ChangeTab(3)">单项委托/组合服务合同 预定项目及要求</li>
<li :class="ActiveTab==4?'ActiveLi':''" @click="ChangeTab(4)">签字盖章</li>
<li v-if=" CtObj.ContractGuestList&& CtObj.ContractGuestList.length>1" :class="ActiveTab==10?'ActiveLi':''" @click="ChangeTab(10)">签约委托书</li>
<li v-if=" CtObj.ContractGuestList&& CtObj.ContractGuestList.length>1"
:class="ActiveTab==10?'ActiveLi':''" @click="ChangeTab(10)">签约委托书</li>
</ul>
</div>
</div>
......@@ -803,7 +808,7 @@
<p>{{$t('scen.sc_tel')}}：<font>{{CtObj.Tourists_EmergencyLinkTel}}</font>
</p>
<br>
<p><b>二、预定项目及要求：</b></p>
<br>
<ul class="gzqzUl Danxiang_Ul">
......@@ -1412,7 +1417,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<br>
<p><b>四、旅游者、旅行社双方确认：</b></p>
<p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p>
......@@ -1528,34 +1533,40 @@
</li>
</ul>
</div>
<!-- 签约委托书 -->
<div class="item_content" v-if="ActiveTab===10&&CtObj.ContractGuestList&&CtObj.ContractGuestList.length>1">
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;"><span style="text-decoration: underline;">{{CtObj.TravelAgency_Name}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的旅行团， <template v-if="CtObj.C_TCNUM&&CtObj.C_TCNUM.length>0">团号:<span style="text-decoration: underline;"> {{CtObj.C_TCNUM}}</span>，</template> 并全权委托<span style="text-decoration: underline;">{{CtObj.Tourists_Name}}</span>代表我与贵社签订《单项委托协议[平台版2018]》(合同编号:<span style="text-decoration: underline;">{{CtObj.T_ContractNum}}</span>)，按《单项委托协议[平台版2018]》约定，承担责任。</p>
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<ul class="guestUl">
<!-- 签约委托书 -->
<div class="item_content"
v-if="ActiveTab===10&&CtObj.ContractGuestList&&CtObj.ContractGuestList.length>1">
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;"><span
style="text-decoration: underline;">{{CtObj.TravelAgency_Name}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的旅行团， <template
v-if="CtObj.C_TCNUM&&CtObj.C_TCNUM.length>0">团号:<span style="text-decoration: underline;">
{{CtObj.C_TCNUM}}</span>，</template> 并全权委托<span
style="text-decoration: underline;">{{CtObj.Tourists_Name}}</span>代表我与贵社签订《单项委托协议[平台版2018]》(合同编号:<span
style="text-decoration: underline;">{{CtObj.T_ContractNum}}</span>)，按《单项委托协议[平台版2018]》约定，承担责任。</p>
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<ul class="guestUl">
<li v-for="(item,index) in CtObj.ContractGuestList" :key="index">
<template v-if="getKongge(CtObj.Tourists_Name)!=getKongge(item.CGuestName)">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestName}}</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.CGuestSex}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('objFill.zhengjianhm')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestCertificateNum}}</el-col>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestName}}</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.CGuestSex}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('objFill.zhengjianhm')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestCertificateNum}}</el-col>
</el-col>
</el-row>
</template>
</li>
</ul>
</div>
</div>
<!-- 文明旅游公约 -->
<div v-if="ActiveTab==8" class="item_content" style="text-align:center;line-height:2">
<div style="width:90%;margin:auto;text-align:left;">
......@@ -1573,34 +1584,8 @@
</div>
</div>
</div>
</div>
</template>
<template v-if="CtObj.CType==2">
<div class="TCdiv_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 -->
<div class="signSpan">
<div @click="dialogVisible=true" :class="dialogVisible?'CisHideen':''" class="sign">
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem"
v-if="CtObj.Tourists_Sign==''||CtObj.Tourists_Sign==null">{{$t('objFill.v101.qianzhi')}}</span>
<span style="font-size:2rem" v-else>重新签字</span>
</div>
<div style="width:100%;height:50px;">&nbsp;</div>
</div>
<!-- 开始进入弹窗 -->
<div class=TipTc v-if="tcShow">
<div class="TipsDiv" style="text-align:center;line-height:2">
<h4 style="font-size: 2.5rem;color: #24ade5;">中国公民文明旅游公约</h4>
<ul style="font-size:2rem" class="conventionList">
<li>重安全，讲礼仪；</li>
<li>不喧哗，杜陋习；</li>
<li>守良俗，明事理；</li>
<li>爱环境，护古迹；</li>
<li>文明行，最得体。</li>
</ul>
<span @click="tcShow=false" class="readSpan">已阅知</span>
</div>
</div>
</template>
<template v-if="CtObj.CType==2">
<!-- 头部境内旅游 -->
<div class="NavFixed">
<p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p>
......@@ -1612,7 +1597,8 @@
<li :class="ActiveTab==2?'ActiveLi':''" @click="ChangeTab(2)">合同信息</li>
<li :class="ActiveTab==3?'ActiveLi':''" @click="ChangeTab(3)">盖章签字</li>
<li :class="ActiveTab==4?'ActiveLi':''" @click="ChangeTab(4)">游客名单</li>
<li v-if=" CtObj.ContractGuestList&& CtObj.ContractGuestList.length>1" :class="{'ActiveLi':ActiveTab==10}" @click="ChangeTab(10)">签约委托书</li>
<li v-if=" CtObj.ContractGuestList&& CtObj.ContractGuestList.length>1"
:class="{'ActiveLi':ActiveTab==10}" @click="ChangeTab(10)">签约委托书</li>
<li :class="ActiveTab==5?'ActiveLi':''" @click="ChangeTab(5)">团队行程</li>
<li :class="ActiveTab==6?'ActiveLi':''" @click="ChangeTab(6)">自愿购物活动补充协议</li>
<li :class="ActiveTab==7?'ActiveLi':''" @click="ChangeTab(7)">
......@@ -1973,7 +1959,7 @@
</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>
<p class="toTopDistance">
{{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}}
......@@ -2246,34 +2232,43 @@
</li>
</ul>
</div>
<!-- 签约委托书 -->
<div class="item_content" v-if="ActiveTab===10&&CtObj.ContractGuestList&&CtObj.ContractGuestList.length>1">
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;"><span style="text-decoration: underline;">{{CtObj.TravelAgency_Name}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的<template v-if="CtObj.C_ProductName&&CtObj.C_ProductName.length>0"><span style="text-decoration: underline;" >{{CtObj.C_ProductName}}</span></template><template v-if="CtObj.C_DayNum>0"> <span style="text-decoration: underline;" > {{CtObj.C_DayNum}}天</span> </template> 旅行团，<template v-if="CtObj.C_TCNUM&&CtObj.C_TCNUM.length>0">团号:<span style="text-decoration: underline;"> {{CtObj.C_TCNUM}}</span>，</template> 并全权委托<span style="text-decoration: underline;">{{CtObj.Tourists_Name}}</span>代表我与贵社签订《大陆境内旅游合同2014》(合同编号:<span style="text-decoration: underline;">{{CtObj.T_ContractNum}}</span>)，按《大陆境内旅游合同2014》约定，承担责任。</p>
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<ul class="guestUl">
<!-- 签约委托书 -->
<div class="item_content"
v-if="ActiveTab===10&&CtObj.ContractGuestList&&CtObj.ContractGuestList.length>1">
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;"><span
style="text-decoration: underline;">{{CtObj.TravelAgency_Name}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的<template
v-if="CtObj.C_ProductName&&CtObj.C_ProductName.length>0"><span
style="text-decoration: underline;">{{CtObj.C_ProductName}}</span></template><template
v-if="CtObj.C_DayNum>0"> <span style="text-decoration: underline;"> {{CtObj.C_DayNum}}天</span>
</template> 旅行团，<template v-if="CtObj.C_TCNUM&&CtObj.C_TCNUM.length>0">团号:<span
style="text-decoration: underline;"> {{CtObj.C_TCNUM}}</span>，</template> 并全权委托<span
style="text-decoration: underline;">{{CtObj.Tourists_Name}}</span>代表我与贵社签订《大陆境内旅游合同2014》(合同编号:<span
style="text-decoration: underline;">{{CtObj.T_ContractNum}}</span>)，按《大陆境内旅游合同2014》约定，承担责任。</p>
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<ul class="guestUl">
<li v-for="(item,index) in CtObj.ContractGuestList" :key="index">
<template v-if="getKongge(CtObj.Tourists_Name)!=getKongge(item.CGuestName)">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestName}}</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.CGuestSex}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('objFill.zhengjianhm')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestCertificateNum}}</el-col>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestName}}</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.CGuestSex}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('objFill.zhengjianhm')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestCertificateNum}}</el-col>
</el-col>
</el-row>
</template>
</li>
</ul>
</div>
</div>
<!-- 团队行程 -->
<div v-if="ActiveTab==5" class="item_content">
<ul class="gzqzUl imTips">
......@@ -2446,39 +2441,10 @@
</div>
</div>
</div>
</div>
</template>
<!-- 一日游 -->
<template v-if="CtObj.CType==3">
<div class="TCdiv_content" :class="dialogVisible?'CisHideen':''">
<!-- 签字 -->
<div class="signSpan">
<div @click="dialogVisible=true" :class="dialogVisible?'CisHideen':''" class="sign">
<!-- <span><span class="sp1"></span></p> -->
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem"
v-if="CtObj.Tourists_Sign==''||CtObj.Tourists_Sign==null">{{$t('objFill.v101.qianzhi')}}</span>
<span style="font-size:2rem" v-else>重新签字</span>
</div>
<div style="width:100%;height:50px;">&nbsp;</div>
</div>
<!-- 开始进入弹窗 -->
<div class=TipTc v-if="tcShow">
<div class="TipsDiv" style="text-align:center;line-height:2">
<h4 style="font-size: 2.5rem;color: #24ade5;">中国公民文明旅游公约</h4>
<ul style="font-size:2rem" class="conventionList">
<li>重安全，讲礼仪；</li>
<li>不喧哗，杜陋习；</li>
<li>守良俗，明事理；</li>
<li>爱环境，护古迹；</li>
<li>文明行，最得体。</li>
</ul>
<span @click="tcShow=false" class="readSpan">已阅知</span>
</div>
</div>
<!-- 头部境内旅游 -->
</template>
<!-- 一日游 -->
<template v-if="CtObj.CType==3">
<!-- 一日游 -->
<div class="NavFixed">
<p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:3rem">合同详情</p>
<div class="navHidden">
......@@ -2490,9 +2456,9 @@
<li :class="ActiveTab==3?'ActiveLi':''" @click="ChangeTab(3)">合同信息</li>
<li :class="ActiveTab==4?'ActiveLi':''" @click="ChangeTab(4)">签字盖章</li>
<li :class="ActiveTab==5?'ActiveLi':''" @click="ChangeTab(5)">游客名单</li>
<template v-if="CtObj.ContractGuestList&&CtObj.ContractGuestList.length>1">
<li :class="{'active':ActiveTab==10}" @click="ChangeTab(10)">签约委托书</li>
</template>
<template v-if="CtObj.ContractGuestList&&CtObj.ContractGuestList.length>1">
<li :class="{'active':ActiveTab==10}" @click="ChangeTab(10)">签约委托书</li>
</template>
<li :class="ActiveTab==6?'ActiveLi':''" @click="ChangeTab(6)">团队行程</li>
<li :class="ActiveTab==7?'ActiveLi':''" @click="ChangeTab(7)">自愿购物活动补充协议</li>
<li :class="ActiveTab==8?'ActiveLi':''" @click="ChangeTab(8)">文明旅游公约</li>
......@@ -2633,7 +2599,7 @@
<p>電話番号：0748－65－1011</p>
<p>SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p>交通安排：</p>
<p>使用形式</p>
<p>
......@@ -2894,34 +2860,42 @@
</li>
</ul>
</div>
<!-- 签约委托书 -->
<div class="item_content" v-if="ActiveTab==10&&CtObj.ContractGuestList&&CtObj.ContractGuestList.length>1">
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;"><span style="text-decoration: underline;">{{CtObj.TravelAgency_Name}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的 <template v-if="CtObj.C_ProductName&&CtObj.C_ProductName.length>0"><span style="text-decoration: underline;" >{{CtObj.C_ProductName}}</span></template><template v-if="CtObj.C_DayNum>0"> <span style="text-decoration: underline;" > {{CtObj.C_DayNum}}天</span> </template>旅行团， <template v-if="CtObj.C_TCNUM&&CtObj.C_TCNUM.length>0">团号:<span style="text-decoration: underline;"> {{CtObj.C_TCNUM}}</span>，</template>并全权委托<span style="text-decoration: underline;">{{CtObj.Tourists_Name}}</span>代表我与贵社签订《一日游旅游合同》(合同编号:<span style="text-decoration: underline;">{{CtObj.T_ContractNum}}</span>)，按《一日游旅游合同》约定，承担责任。</p>
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<ul class="guestUl">
<!-- 签约委托书 -->
<div class="item_content" v-if="ActiveTab==10&&CtObj.ContractGuestList&&CtObj.ContractGuestList.length>1">
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;"><span
style="text-decoration: underline;">{{CtObj.TravelAgency_Name}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的 <template
v-if="CtObj.C_ProductName&&CtObj.C_ProductName.length>0"><span
style="text-decoration: underline;">{{CtObj.C_ProductName}}</span></template><template
v-if="CtObj.C_DayNum>0"> <span style="text-decoration: underline;"> {{CtObj.C_DayNum}}天</span>
</template>旅行团， <template v-if="CtObj.C_TCNUM&&CtObj.C_TCNUM.length>0">团号:<span
style="text-decoration: underline;"> {{CtObj.C_TCNUM}}</span>，</template>并全权委托<span
style="text-decoration: underline;">{{CtObj.Tourists_Name}}</span>代表我与贵社签订《一日游旅游合同》(合同编号:<span
style="text-decoration: underline;">{{CtObj.T_ContractNum}}</span>)，按《一日游旅游合同》约定，承担责任。</p>
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<ul class="guestUl">
<li v-for="(item,index) in CtObj.ContractGuestList" :key="index">
<template v-if="getKongge(CtObj.Tourists_Name)!=getKongge(item.CGuestName)">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestName}}</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.CGuestSex}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('objFill.zhengjianhm')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestCertificateNum}}</el-col>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestName}}</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.CGuestSex}}</el-col>
</el-col>
</el-row>
<el-row style="padding:6px 0">
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('objFill.zhengjianhm')}}：</el-col>
<el-col :span="16" style="text-align:left">{{item.CGuestCertificateNum}}</el-col>
</el-col>
</el-row>
</template>
</li>
</ul>
</div>
</div>
<!-- 团队行程 -->
<div v-if="ActiveTab==6" class="item_content">
<ul class="guestUl imTips">
......@@ -3950,35 +3924,9 @@
</div>
</div>
</div>
</div>
</template>
<div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent>
<div class="CliSignDiv" style="height:100%;background:#fff;z-index:100">
<div class="CanvasDiv">
<div class="dash">
<div id="canvas" style="position:relative;top:0;">
</div>
</div>
</div>
<div class="bottom" style="text-align:center;height:100px;line-height:100px;">
<el-row>
<el-col :span="12">
<div style="width:100%;" @click="handelClearEl()">
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">{{$t('objFill.v101.chongzhiqianm')}}</span>
</div>
</el-col>
<el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()">
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">{{$t('objFill.v101.wanchengqmin')}}</span>
</div>
</el-col>
</el-row>
</div>
<div style="width:100%;height:50px;">&nbsp;</div>
</div>
</template>
</div>
</div>
</template>
<script>
......@@ -4131,6 +4079,16 @@
}
},
methods: {
//跳转签名页面
goUrl() {
this.$router.push({
name: "SignName",
query: {
ContractId: this.msg.ContractId,
TypeStr: 'TravelContractConfirm'
}
})
},
getCurrencyStr() {
var str = "元";
if (this.CtObj.SignType == 1) {
......@@ -4159,8 +4117,8 @@
}
return serviceCount;
},
getKongge(str){
return str.replace(/\s+/g, "");
getKongge(str) {
return str.replace(/\s+/g, "");
},
ChangeTab(num) {
this.ActiveTab = num;
......@@ -4564,45 +4522,7 @@
/零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元")
}
},
getCanvas() {
let el = document.getElementById("canvas");
el.appendChild(canvas);
canvas.width = el.clientWidth;
canvas.height = el.clientHeight;
//cxt.fillStyle = this.background; //填充绘图的背景颜色
cxt.fillStyle = 'rgba(255, 255, 255, 0)';
cxt.fillRect(0, 0, canvas.width, canvas.height); //绘制“已填色”的矩形
cxt.strokeStyle = this.color; //笔触的颜色
cxt.lineCap = "round"; //线条末端线帽的样式
let linewidth = this.linewidth;
//开始绘制
canvas.addEventListener(
"touchstart",
function (e) {
cxt.beginPath();
cxt.lineWidth = linewidth; //当前线条的宽度，以像素计
cxt.moveTo(e.changedTouches[0].pageX, e.changedTouches[0].pageY);
}.bind(this),
false
);
//绘制中
canvas.addEventListener(
"touchmove",
function (e) {
cxt.lineTo(e.changedTouches[0].pageX, e.changedTouches[0].pageY);
cxt.stroke();
}.bind(this),
false
);
//结束绘制
canvas.addEventListener(
"touchend",
function () {
cxt.closePath();
}.bind(this),
false
);
},
handelClearEl() {
cxt.clearRect(0, 0, canvas.width, canvas.height);
},
......@@ -4622,7 +4542,7 @@
if (res.data.resultCode == 1) {
this.dialogVisible = false;
this.getList();
this.handelClearEl();
}
},
err => {}
......@@ -4637,11 +4557,7 @@
mounted() {
this.CurrentUserInfo = this.getLocalStorage();
this.msg.ContractId = this.$route.query.ContractId;
var h = window.screen.height;
var cHeight = document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height = 900 + 'px';
this.getList();
this.getCanvas();
}
};
......
src/components/TravelContractDetail.vue
View file @ a4ab430c
<style>
@import "../assets/css/flex.css";
@import "../assets/css/flex.css";
.TD_MainContent {
min-height: 650px;
background: url(../assets/img/bodyBg.png);
......@@ -461,34 +462,35 @@
</h2>
</div>
<div>
<template v-if="dataList.orderType==0">
<input type="button" class="TCbtn-info" @click="(dialogVisible = true), getGuestList()" value="复制合同" />
</template>
<input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()"
:value="$t('active.cl_zuofei')" />
<input type="button" class="TCbtn-info" v-if="dataList.companySignature==''"
@click="isShowFade=true,GetQrCode()" :value="$t('objFill.v101.Contract.kehuqz')" />
<input type="button" class="TCbtn-info" :value="$t('objFill.xz')"
@click="toContractPDF(dataList.contractNum)" />
<input v-if="dataList.thirdContractState == 1" type="button" class="TCbtn-info" value="发送短信通知" @click="SMSnotification()"/>
<input v-if="dataList.thirdContractFileUrl" type="button" class="TCbtn-info" @click="OpenNewUrl(dataList.thirdContractFileUrl)"
:value="'旅游局合同'+$t('sm.yulan')" />
</div>
<template v-if="dataList.orderType==0">
<input type="button" class="TCbtn-info" @click="(dialogVisible = true), getGuestList()" value="复制合同" />
</template>
<input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()"
:value="$t('active.cl_zuofei')" />
<input type="button" class="TCbtn-info" v-if="dataList.companySignature==''"
@click="isShowFade=true,GetQrCode()" :value="$t('objFill.v101.Contract.kehuqz')" />
<input type="button" class="TCbtn-info" :value="$t('objFill.xz')"
@click="toContractPDF(dataList.contractNum)" />
<input v-if="dataList.thirdContractState == 1" type="button" class="TCbtn-info" value="发送短信通知"
@click="SMSnotification()" />
<input v-if="dataList.thirdContractFileUrl" type="button" class="TCbtn-info"
@click="OpenNewUrl(dataList.thirdContractFileUrl)" :value="'旅游局合同'+$t('sm.yulan')" />
</div>
</div>
<div class="contract">
<div class="title">
<h1>{{dataList.company}} 团队出境旅游合同</h1>
<p class="contractNo"
:class="[dataList.thirdContractFileUrl?'pointer':'']"
@click="dataList.thirdContractFileUrl?OpenNewUrl(dataList.thirdContractFileUrl):''">{{$t('objFill.hetongbh')}}：
<span>{{dataList.thirdContractID?dataList.thirdContractID:dataList.contractNum}}</span>
<span v-if="dataList.thirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="dataList.thirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="dataList.thirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="dataList.thirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="dataList.thirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="dataList.thirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</p>
<p class="contractNo" :class="[dataList.thirdContractFileUrl?'pointer':'']"
@click="dataList.thirdContractFileUrl?OpenNewUrl(dataList.thirdContractFileUrl):''">
{{$t('objFill.hetongbh')}}：
<span>{{dataList.thirdContractID?dataList.thirdContractID:dataList.contractNum}}</span>
<span v-if="dataList.thirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
<span v-if="dataList.thirdContractState==1" class="c3FC4FF">{{$t('objFill.v103.daiqianmin')}}</span>
<span v-if="dataList.thirdContractState==2" class="c20C997">{{$t('objFill.v103.yiqianshu')}}</span>
<span v-if="dataList.thirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="dataList.thirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="dataList.thirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</p>
</div>
<div class="menu">
<ul>
......@@ -496,9 +498,10 @@
<li :class="{'active':cked==2}" @click="cked=2">合同信息</li>
<li :class="{'active':cked==3}" @click="cked=3">签字盖章</li>
<li :class="{'active':cked==4}" @click="cked=4">游客名单</li>
<template v-if="(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)">
<li :class="{'active':cked==10}" @click="cked=10">签约委托书</li>
</template>
<template
v-if="(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)">
<li :class="{'active':cked==10}" @click="cked=10">签约委托书</li>
</template>
<li :class="{'active':cked==5}" @click="cked=5">团队行程</li>
<li :class="{'active':cked==6}" @click="cked=6">安全告知书</li>
<li :class="{'active':cked==7}" @click="cked=7">自愿购物活动补充协议</li>
......@@ -1067,8 +1070,22 @@
<td>{{index+1}}</td>
<td>{{item.surName+''+item.name}}</td>
<td>{{item.sex==1?$t('pub.man'):$t('pub.woman')}}</td>
<td>{{item.passportNo.length>0?$t('salesModule.Passport'):'身份证'}}</td>
<td>{{ item.passportNo.length>0?item.passportNo:item.idCard }}</td>
<td>
<template v-if="dataList.certificateType==1">
{{$t('salesModule.Passport')}}
</template>
<template v-else>
身份证
</template>
</td>
<td>
<template v-if="dataList.certificateType==1">
{{item.passportNo}}
</template>
<template v-else>
{{ item.idCard }}
</template>
</td>
<td>{{item.mobilePhone}}</td>
<td>健康 </td>
</tr>
......@@ -1110,10 +1127,16 @@
</table>
</template>
</div>
<!-- 签约委托书 -->
<div class="guests" :class="{'checkedNav':cked==10}" v-if="cked==10&&(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)">
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;"><span style="text-decoration: underline;">{{dataList.company}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的<span style="text-decoration: underline;">{{dataList.productName}}{{dataList.dayNum}}天</span>旅行团，团号:<span style="text-decoration: underline;"> {{dataList.tCNum}}</span>，并全权委托<span style="text-decoration: underline;">{{dataList.clientName}}</span>代表我与贵社签订《团队出境旅游合同》(合同编号:<span style="text-decoration: underline;">{{dataList.contractNum}}</span>)，按《团队出境旅游合同》约定，承担责任。</p>
<!-- 签约委托书 -->
<div class="guests" :class="{'checkedNav':cked==10}"
v-if="cked==10&&(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)">
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;"><span
style="text-decoration: underline;">{{dataList.company}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的<span
style="text-decoration: underline;">{{dataList.productName}}{{dataList.dayNum}}天</span>旅行团，团号:<span
style="text-decoration: underline;"> {{dataList.tCNum}}</span>，并全权委托<span
style="text-decoration: underline;">{{dataList.clientName}}</span>代表我与贵社签订《团队出境旅游合同》(合同编号:<span
style="text-decoration: underline;">{{dataList.contractNum}}</span>)，按《团队出境旅游合同》约定，承担责任。</p>
<p style="font-size: 14px;font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<template v-if="dataList.orderType==0">
<table class="ZTable">
......@@ -1129,11 +1152,11 @@
</tr>
<tr v-for="(item,index) in dataList.guestList">
<template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))">
<!-- <td>{{index+1}}</td> -->
<td>{{item.surName+''+item.name}}</td>
<td>{{item.sex==1?$t('pub.man'):$t('pub.woman')}}</td>
<!-- <td>{{item.passportNo.length>0?$t('salesModule.Passport'):'身份证'}}</td> -->
<td>{{ item.passportNo.length>0?item.passportNo:item.idCard }}</td>
<!-- <td>{{index+1}}</td> -->
<td>{{item.surName+''+item.name}}</td>
<td>{{item.sex==1?$t('pub.man'):$t('pub.woman')}}</td>
<!-- <td>{{item.passportNo.length>0?$t('salesModule.Passport'):'身份证'}}</td> -->
<td>{{ item.passportNo.length>0?item.passportNo:item.idCard }}</td>
</template>
<!-- <td>{{item.mobilePhone}}</td>
<td>健康 </td> -->
......@@ -1162,17 +1185,17 @@
<td width="15%">{{$t('objFill.v101.Contract.shengtizk')}}</td>
</tr>
<tr v-for="(item,index) in dataList.guestInfo">
<template v-if="dataList.clientName!==(item.surName+''+item.name)">
<td>{{index+1}}</td>
<td>{{item.Name}}</td>
<td>{{item.Sex}}</td>
<td>{{item.passportNo.length>0?$t('salesModule.Passport'):'身份证'}}</td>
<td>{{ item.passportNo.length>0?item.passportNo:item.idCard }}</td>
<!-- <td>{{$t('salesModule.Passport')}}</td>
<template v-if="dataList.clientName!==(item.surName+''+item.name)">
<td>{{index+1}}</td>
<td>{{item.Name}}</td>
<td>{{item.Sex}}</td>
<td>{{item.passportNo.length>0?$t('salesModule.Passport'):'身份证'}}</td>
<td>{{ item.passportNo.length>0?item.passportNo:item.idCard }}</td>
<!-- <td>{{$t('salesModule.Passport')}}</td>
<td>{{item.PassportNo}}</td> -->
<td>{{item.Mobile}}</td>
<td>健康</td>
</template>
<td>{{item.Mobile}}</td>
<td>健康</td>
</template>
</tr>
</tbody>
</table>
......@@ -1641,8 +1664,8 @@
};
},
methods: {
SMSnotification(){
if(this.SMLoading) return
SMSnotification() {
if (this.SMLoading) return
this.$confirm("是否发送短信通知?", this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
......@@ -1667,17 +1690,17 @@
that.SMLoading = false
that.Error(res.data.message);
}
},err=>{
}, err => {
that.SMLoading = false
}
);
})
.catch(() => {
});
},
getKongge(str){
return str.replace(/\s+/g, "");
getKongge(str) {
return str.replace(/\s+/g, "");
},
// 生成二维码
GetQrCode: function () {
......
src/components/TravelContractNew.vue
View file @ a4ab430c
<style>
@import "../assets/css/flex.css";
@import "../assets/css/flex.css";
* {
margin: 0;
padding: 0;
......@@ -283,6 +284,7 @@
.TC_LASTTD div {
margin-bottom: 10px;
}
.ContractNum {
font-size: 16px !important;
color: #5882bb !important;
......@@ -302,8 +304,7 @@
<div class="contractTit row justify-between">
<span class="row">
{{ CtObj.company }}团队出境旅游合同
<span class="ContractNum"
:class="[CtObj.thirdContractFileUrl?'pointer':'']"
<span class="ContractNum" :class="[CtObj.thirdContractFileUrl?'pointer':'']"
@click="CtObj.thirdContractFileUrl?OpenNewUrl(CtObj.thirdContractFileUrl):''">{{$t('objFill.hetongbh')}}：
<span>{{CtObj.thirdContractID?CtObj.thirdContractID:CtObj.contractNum}}</span>
<span v-if="CtObj.thirdContractState==0" class="c9e">{{$t('objFill.daishanchuan')}}</span>
......@@ -312,12 +313,13 @@
<span v-if="CtObj.thirdContractState==3" class="cF1416C">{{$t('active.cl_yzfei')}}</span>
<span v-if="CtObj.thirdContractState==4" class="cff9800">{{$t('objFill.v103.daiqianshu')}}</span>
<span v-if="CtObj.thirdContractState==5" class="c9e">{{$t('objFill.v103.daizuofei')}}</span>
</span>
</span>
</span>
<div class="pull-right">
<input v-if="CtObj.thirdContractState == 1" type="button" class="TCbtn-info" value="发送短信通知" @click="SMSnotification()"/>
<input v-if="CtObj.thirdContractFileUrl" type="button" class="TCbtn-info" @click="OpenNewUrl(CtObj.thirdContractFileUrl)"
:value="'旅游局合同'+$t('sm.yulan')" />
<input v-if="CtObj.thirdContractState == 1" type="button" class="TCbtn-info" value="发送短信通知"
@click="SMSnotification()" />
<input v-if="CtObj.thirdContractFileUrl" type="button" class="TCbtn-info"
@click="OpenNewUrl(CtObj.thirdContractFileUrl)" :value="'旅游局合同'+$t('sm.yulan')" />
<input type="button" class="TCbtn-info" v-if="CtObj.companySignature == '' && CtObj.auditContract == 2"
@click="(isShowFade = true), GetQrCode()" value="客户签字链接" />
<span v-if="CtObj.auditContract == 1" style="font-size: 12px; color: red">等待行政审批通过后获取签字链接</span>
......@@ -340,16 +342,12 @@
</template>
<template v-if="CtObj.auditContract != 2">
<input class="btn-warning" type="button" @click="submitForm('CtObj')"
v-loading="SaveLoading"
:disabled="SaveLoading"
:value="$t('pub.saveBtn')"></input>
<input class="btn-warning" type="button" @click="submitForm('CtObj')" v-loading="SaveLoading"
:disabled="SaveLoading" :value="$t('pub.saveBtn')"></input>
</template>
<template v-if="CurrentUserInfo.EmployeeId == 615">
<input class="btn-warning" type="button" @click="submitForm('CtObj')"
v-loading="SaveLoading"
:disabled="SaveLoading"
:value="$t('pub.saveBtn')+'(S)'"></input>
<input class="btn-warning" type="button" @click="submitForm('CtObj')" v-loading="SaveLoading"
:disabled="SaveLoading" :value="$t('pub.saveBtn')+'(S)'"></input>
</template>
</div>
</div>
......@@ -527,7 +525,8 @@
<el-form-item label="地接社名称" prop="dmcName">
<el-input type="text" v-model="CtObj.dmcName" class="w300">
<el-select placeholder="快捷" @change="changeDmcCompany" slot="append" style="width:80px">
<el-option v-for="(ditem,dindex) in DmcCompanyList" :key="dindex" :label="ditem.CompanyName" :value="ditem"> </el-option>
<el-option v-for="(ditem,dindex) in DmcCompanyList" :key="dindex" :label="ditem.CompanyName"
:value="ditem"> </el-option>
</el-select>
</el-input>
</el-form-item>
......@@ -717,8 +716,8 @@
<tr>
<td>
<el-form-item label="尾款支付日期" prop="payDate">
<el-date-picker type="date" class="w300" v-model="CtObj.payDate" value-format="yyyy-MM-dd" placeholder="支付日期选择"
:clearable="false"></el-date-picker>
<el-date-picker type="date" class="w300" v-model="CtObj.payDate" value-format="yyyy-MM-dd"
placeholder="支付日期选择" :clearable="false"></el-date-picker>
</el-form-item>
</td>
</tr>
......@@ -1100,11 +1099,12 @@
<div v-if="subItem.type == 2||subItem.type == 7" :key="`tdd_`+index+subIndex">
<span v-if="subItem.type == 2">
{{ subItem.childItem.couponsName }}
<span v-if="
<span
v-if="
subItem.childItem.playTimeHour != null &&
subItem.childItem.playTimeHour != ''
">（{{ subItem.childItem.playTimeHour }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '小时')}}
{{(subItem.childItem.playTimeMinutes!=null && subItem.childItem.playTimeMinutes != ''?'':'）')}}</span>
{{(subItem.childItem.playTimeMinutes!=null && subItem.childItem.playTimeMinutes != ''?'':'）')}}</span>
<span v-if="
subItem.childItem.playTimeMinutes != null &&
subItem.childItem.playTimeMinutes != ''
......@@ -1147,11 +1147,12 @@
</td>
<td contenteditable="true">
<template v-for="subItem in item.dayArray">
<template v-if="subItem.type == 3">
<span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
<span v-else>无</span>
</template>
<template v-if="subItem.type == 3">
<span
v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br /></span>
<span v-else>无</span>
</template>
</template>
</td>
<td contenteditable="true">
<span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span>
......@@ -1198,6 +1199,10 @@
</span>
<h2>
<em>游客信息</em>
<el-select v-model="CtObj.certificateType" style="padding-left:20px;" size="small">
<el-option :value="1" :key="1" label="护照"></el-option>
<el-option :value="2" :key="1" label="身份证"></el-option>
</el-select>
</h2>
</div>
<template v-if="CtObj.orderType == 0">
......@@ -1208,7 +1213,7 @@
<th>{{ $t("system.query_name") }}</th>
<th>{{$t('system.table_sex')}}</th>
<th>证件类型</th>
<th>{{$t('sm.huzhaohaoma')}}</th>
<th>证件号码</th>
<th>{{$t('objFill.lianxifangshi')}}</th>
<th>{{$t('objFill.v101.Contract.shengtizk')}}</th>
</tr>
......@@ -1219,8 +1224,22 @@
<td>{{ index + 1 }}</td>
<td>{{ item.surName + "" + item.name }}</td>
<td>{{ item.sex == 1 ? "男" : "女" }}</td>
<td>{{item.passportNo.length>0?$t('salesModule.Passport'):'身份证'}}</td>
<td>{{ item.passportNo.length>0?item.passportNo:item.idCard }}</td>
<td>
<template v-if="CtObj.certificateType==1">
{{$t('salesModule.Passport')}}
</template>
<template v-else>
身份证
</template>
</td>
<td>
<template v-if="CtObj.certificateType==1">
{{item.passportNo}}
</template>
<template v-else>
{{ item.idCard }}
</template>
</td>
<td>{{ item.mobilePhone }}</td>
<td>健康</td>
</tr>
......@@ -1531,7 +1550,7 @@
},
//国家列表
CountryList: [],
DmcCompanyList: [],//地接社
DmcCompanyList: [], //地接社
isShowFade: false, //是否显示签证弹窗
QRCodeStr: "",
//客户省份列表
......@@ -1651,6 +1670,7 @@
signType: 0, //合同章类型(0-和平，1-日本)
orderType: 0,
guestInfo: [], //单项订单旅客名单
certificateType:1,//护照,2-身份证
},
//旅客名单
guestList: [],
......@@ -1794,8 +1814,8 @@
"my-edit": MyEdit
},
methods: {
SMSnotification(){
if(this.SMLoading) return
SMSnotification() {
if (this.SMLoading) return
this.$confirm("是否发送短信通知?", this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
......@@ -1820,13 +1840,13 @@
that.SMLoading = false
that.Error(res.data.message);
}
},err=>{
}, err => {
that.SMLoading = false
}
);
})
.catch(() => {
});
},
AddGuest() {
......@@ -1858,9 +1878,9 @@
}
},
goContract() {
let path="TravelContractDetail";
if(this.CtObj.contractType==1){
path="TravelContractDetailWT";
let path = "TravelContractDetail";
if (this.CtObj.contractType == 1) {
path = "TravelContractDetailWT";
}
this.$router.push({
name: path,
......@@ -1906,9 +1926,9 @@
document.documentElement.scrollTop = anchor.offsetTop - 70;
},
getList() {
if(this.$route.query.orderID) this.msg.orderID = this.$route.query.orderID
if(this.$route.query.TCID) this.msg.TCID = this.$route.query.TCID
if(this.dataLoading) return
if (this.$route.query.orderID) this.msg.orderID = this.$route.query.orderID
if (this.$route.query.TCID) this.msg.TCID = this.$route.query.TCID
if (this.dataLoading) return
this.dataLoading = true
this.apipost(
"travelcontract_post_GetContractInfoService",
......@@ -1981,13 +2001,15 @@
this.goContract();
}
}
this.dataLoading = false
this.dataLoading = false
} else {
this.dataLoading = false
this.dataLoading = false
this.Error(res.data.message);
}
},
err=>{ this.dataLoading = false}
err => {
this.dataLoading = false
}
);
},
//获取国家
......@@ -2000,7 +2022,7 @@
(err) => {}
);
},
GetDmcCompanyList(){
GetDmcCompanyList() {
this.apipost(
"travelcontract_post_GetDmcCompanyList", {},
(res) => {
......@@ -2107,9 +2129,9 @@
},
//提交数据
SaveMsg() {
if(this.$route.query.orderID) this.CtObj.orderId = this.$route.query.orderID
if(this.$route.query.TCID) this.CtObj.tcid = this.$route.query.TCID
if(this.SaveLoading) return;
if (this.$route.query.orderID) this.CtObj.orderId = this.$route.query.orderID
if (this.$route.query.TCID) this.CtObj.tcid = this.$route.query.TCID
if (this.SaveLoading) return;
this.SaveLoading = true;
this.CtObj.status = 1;
this.CtObj.contractStatus = 2;
......@@ -2231,7 +2253,7 @@
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning",
}).then(() => {
}).then(() => {
this.apipost(
"travelcontract_get_UpdateAuditContractService", postMsg,
(res) => {
......@@ -2245,7 +2267,7 @@
null
);
});
},
//添加补充协议
addRecord() {
......@@ -2672,31 +2694,31 @@
}
}
this.trifficList.forEach((x, index) => {
if(x.busTip!=null && x.busTip!=''){
this.tripDays[index].TrifficType = x.busTip;
}else{
if (x.airportPickUp == 1 || x.airportPickUp == 2) {
if (x.isUseBus == 1) {
this.tripDays[index].TrifficType = "飞机+大巴";
if (x.busTip != null && x.busTip != '') {
this.tripDays[index].TrifficType = x.busTip;
} else {
if (x.airportPickUp == 1 || x.airportPickUp == 2) {
if (x.isUseBus == 1) {
this.tripDays[index].TrifficType = "飞机+大巴";
}
}
}
if (x.airportPickUp == 0 && x.isUseBus == 1) {
this.tripDays[index].TrifficType = "大巴";
}
if (x.airportPickUp == 1 || x.airportPickUp == 2) {
if (x.isUseBus == 0) {
this.tripDays[index].TrifficType = "飞机";
if (x.airportPickUp == 0 && x.isUseBus == 1) {
this.tripDays[index].TrifficType = "大巴";
}
}
if (x.airportPickUp == 0 || x.airportPickUp == 0) {
if (x.isUseBus == 0) {
this.tripDays[index].TrifficType = this.$t('fnc.no')
if (x.airportPickUp == 1 || x.airportPickUp == 2) {
if (x.isUseBus == 0) {
this.tripDays[index].TrifficType = "飞机";
}
}
if (x.airportPickUp == 0 || x.airportPickUp == 0) {
if (x.isUseBus == 0) {
this.tripDays[index].TrifficType = this.$t('fnc.no')
}
}
}
}
});
},
changeDmcCompany(item){
changeDmcCompany(item) {
this.CtObj.dmcName = item.CompanyName;
this.CtObj.dmcAddress = item.Address;
this.CtObj.dmcContact = item.ContactName;
......
src/components/clientConfirm.vue
View file @ a4ab430c
......@@ -296,7 +296,7 @@
.ClientTravelTable td {
border: 1px solid #d1d1d1;
color:red;
color: red;
}
.dic_content .TipsDiv {
......@@ -539,7 +539,8 @@
<li :class="ActiveTab==2?'ActiveLi':''" @click="ChangeTab(2)">合同信息</li>
<li :class="ActiveTab==3?'ActiveLi':''" @click="ChangeTab(3)">盖章签字</li>
<li :class="ActiveTab==4?'ActiveLi':''" @click="ChangeTab(4)">游客名单</li>
<li v-if="(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)" :class="ActiveTab==10?'ActiveLi':''" @click="ChangeTab(10)">签约委托书</li>
<li v-if="(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)"
:class="ActiveTab==10?'ActiveLi':''" @click="ChangeTab(10)">签约委托书</li>
<li :class="ActiveTab==5?'ActiveLi':''" @click="ChangeTab(5)">团队行程</li>
<li :class="ActiveTab==6?'ActiveLi':''" @click="ChangeTab(6)">安全告知书</li>
<li :class="ActiveTab==7?'ActiveLi':''" @click="ChangeTab(7)">自愿购物活动补充协议</li>
......@@ -1244,12 +1245,24 @@
<el-col :span="12">
<el-col :span="8" style="text-align:right">证件类型：</el-col>
<el-col :span="16" style="text-align:left">
{{item.passportNo.length>0?$t('salesModule.Passport'):'身份证'}}</el-col>
<template v-if="dataList.certificateType==1">
{{$t('salesModule.Passport')}}
</template>
<template v-else>
身份证
</template>
</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.length>0?item.passportNo:item.idCard }}</el-col>
<template v-if="dataList.certificateType==1">
{{item.passportNo}}
</template>
<template v-else>
{{ item.idCard }}
</template>
</el-col>
</el-col>
</el-row>
<el-row>
......@@ -1317,61 +1330,68 @@
</template>
</div>
<!-- 签约委托书 -->
<div v-if="(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)" v-show="ActiveTab==10" class="item_content">
<p style="font-weight: bolder;margin-bottom: 10px;"><span style="text-decoration: underline;">{{dataList.company}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的<span style="text-decoration: underline;">{{dataList.productName}}{{dataList.dayNum}}天</span>旅行团，团号:<span style="text-decoration: underline;"> {{dataList.tCNum}}</span>，并全权委托<span style="text-decoration: underline;">{{dataList.clientName}}</span>代表我与贵社签订《团队出境旅游合同》(合同编号:<span style="text-decoration: underline;">{{dataList.contractNum}}</span>)，按《团队出境旅游合同》约定，承担责任。</p>
<!-- 签约委托书 -->
<div v-if="(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)"
v-show="ActiveTab==10" class="item_content">
<p style="font-weight: bolder;margin-bottom: 10px;"><span
style="text-decoration: underline;">{{dataList.company}}:</span></p>
<p style="margin-bottom: 10px;">我自愿参加贵社组织的<span
style="text-decoration: underline;">{{dataList.productName}}{{dataList.dayNum}}天</span>旅行团，团号:<span
style="text-decoration: underline;"> {{dataList.tCNum}}</span>，并全权委托<span
style="text-decoration: underline;">{{dataList.clientName}}</span>代表我与贵社签订《团队出境旅游合同》(合同编号:<span
style="text-decoration: underline;">{{dataList.contractNum}}</span>)，按《团队出境旅游合同》约定，承担责任。</p>
<p style="font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<template v-if="dataList.orderType==0">
<ul class="guestUl">
<li v-for="(item,index) in dataList.guestList" :key="index">
<template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left">
{{item.surName+''+item.name}}({{item.eSurName+''+item.eName}})
<template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left">
{{item.surName+''+item.name}}({{item.eSurName+''+item.eName}})
</el-col>
</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?$t('pub.man'):$t('pub.woman')}}</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">
{{ item.passportNo.length>0?item.passportNo:item.idCard }}</el-col>
</el-col>
</el-row>
</template>
<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?$t('pub.man'):$t('pub.woman')}}
</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">
{{ item.passportNo.length>0?item.passportNo:item.idCard }}</el-col>
</el-col>
</el-row>
</template>
</li>
</ul>
</template>
<template v-else>
<ul class="guestUl" v-if="dataList.guestInfo">
<li v-for="(item,index) in dataList.guestInfo" :key="index">
<template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</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">{{item.PassportNo}}</el-col>
</el-col>
</el-row>
</template>
<template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))">
<el-row>
<el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</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">{{item.PassportNo}}</el-col>
</el-col>
</el-row>
</template>
</li>
</ul>
</template>
......@@ -1790,8 +1810,8 @@
} catch (error) {}
},
methods: {
getKongge(str){
return str.replace(/\s+/g, "");
getKongge(str) {
return str.replace(/\s+/g, "");
},
closeTcShowHandler() {
let domtemp = document.querySelector("#tcShowDialog")
......
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