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
Expand all Show 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
This diff is collapsed.
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);
......@@ -470,17 +471,18 @@
@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')" />
<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')}}：
<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>
......@@ -496,7 +498,8 @@
<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)">
<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>
......@@ -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>
......@@ -1111,9 +1128,15 @@
</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">
......@@ -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,7 +1690,7 @@
that.SMLoading = false
that.Error(res.data.message);
}
},err=>{
}, err => {
that.SMLoading = false
}
);
......@@ -1676,7 +1699,7 @@
});
},
getKongge(str){
getKongge(str) {
return str.replace(/\s+/g, "");
},
// 生成二维码
......
src/components/TravelContractNew.vue
View file @ a4ab430c
This diff is collapsed.
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>
......@@ -1318,9 +1331,15 @@
</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">
......@@ -1335,7 +1354,8 @@
</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 :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">
......@@ -1790,7 +1810,7 @@
} catch (error) {}
},
methods: {
getKongge(str){
getKongge(str) {
return str.replace(/\s+/g, "");
},
closeTcShowHandler() {
......
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