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 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 @@ ...@@ -117,6 +117,7 @@
guestId: 0, //旅客编号 guestId: 0, //旅客编号
ProtocolId: 0, //保密协议编号 ProtocolId: 0, //保密协议编号
TypeStr: "", //跳转页面地址 TypeStr: "", //跳转页面地址
ContractId:0,//单项合同Id
}, },
} }
}, },
...@@ -142,6 +143,9 @@ ...@@ -142,6 +143,9 @@
if (this.$route.query && this.$route.query.TypeStr) { if (this.$route.query && this.$route.query.TypeStr) {
this.msg.TypeStr = 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(); this.getCanvas();
document.getElementsByTagName('body')[0].style = "overscroll-behavior-y: contain;" document.getElementsByTagName('body')[0].style = "overscroll-behavior-y: contain;"
}, },
...@@ -342,6 +346,26 @@ ...@@ -342,6 +346,26 @@
} }
}, null); }, 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
This diff is collapsed.
src/components/TravelContractNew.vue
View file @ a4ab430c
This diff is collapsed.
src/components/clientConfirm.vue
View file @ a4ab430c
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
.ClientTravelTable td { .ClientTravelTable td {
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
color:red; color: red;
} }
.dic_content .TipsDiv { .dic_content .TipsDiv {
...@@ -539,7 +539,8 @@ ...@@ -539,7 +539,8 @@
<li :class="ActiveTab==2?'ActiveLi':''" @click="ChangeTab(2)">合同信息</li> <li :class="ActiveTab==2?'ActiveLi':''" @click="ChangeTab(2)">合同信息</li>
<li :class="ActiveTab==3?'ActiveLi':''" @click="ChangeTab(3)">盖章签字</li> <li :class="ActiveTab==3?'ActiveLi':''" @click="ChangeTab(3)">盖章签字</li>
<li :class="ActiveTab==4?'ActiveLi':''" @click="ChangeTab(4)">游客名单</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==5?'ActiveLi':''" @click="ChangeTab(5)">团队行程</li>
<li :class="ActiveTab==6?'ActiveLi':''" @click="ChangeTab(6)">安全告知书</li> <li :class="ActiveTab==6?'ActiveLi':''" @click="ChangeTab(6)">安全告知书</li>
<li :class="ActiveTab==7?'ActiveLi':''" @click="ChangeTab(7)">自愿购物活动补充协议</li> <li :class="ActiveTab==7?'ActiveLi':''" @click="ChangeTab(7)">自愿购物活动补充协议</li>
...@@ -1244,12 +1245,24 @@ ...@@ -1244,12 +1245,24 @@
<el-col :span="12"> <el-col :span="12">
<el-col :span="8" style="text-align:right">证件类型：</el-col> <el-col :span="8" style="text-align:right">证件类型：</el-col>
<el-col :span="16" style="text-align:left"> <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>
<el-col :span="12"> <el-col :span="12">
<el-col :span="8" style="text-align:right">证件号码：</el-col> <el-col :span="8" style="text-align:right">证件号码：</el-col>
<el-col :span="16" style="text-align:left"> <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-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -1317,61 +1330,68 @@ ...@@ -1317,61 +1330,68 @@
</template> </template>
</div> </div>
<!-- 签约委托书 --> <!-- 签约委托书 -->
<div v-if="(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)" v-show="ActiveTab==10" class="item_content"> <div v-if="(dataList.guestNum&&dataList.guestNum>1)|| (dataList.guestList&&dataList.guestList.length>1)"
<p style="font-weight: bolder;margin-bottom: 10px;"><span style="text-decoration: underline;">{{dataList.company}}:</span></p> v-show="ActiveTab==10" class="item_content">
<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;"><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> <p style="font-weight: bolder;margin-bottom: 10px;">委托人:</p>
<template v-if="dataList.orderType==0"> <template v-if="dataList.orderType==0">
<ul class="guestUl"> <ul class="guestUl">
<li v-for="(item,index) in dataList.guestList" :key="index"> <li v-for="(item,index) in dataList.guestList" :key="index">
<template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))"> <template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col> <el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left"> <el-col :span="16" style="text-align:left">
{{item.surName+''+item.name}}({{item.eSurName+''+item.eName}}) {{item.surName+''+item.name}}({{item.eSurName+''+item.eName}})
</el-col>
</el-col> </el-col>
</el-col> <el-col :span="12">
<el-col :span="12"> <el-col :span="8" style="text-align:right">性别：</el-col>
<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 :span="16" style="text-align:left">{{item.sex==1?$t('pub.man'):$t('pub.woman')}}</el-col> </el-col>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="padding:6px 0"> <el-row style="padding:6px 0">
<el-col :span="12"> <el-col :span="12">
<el-col :span="8" style="text-align:right">证件号码：</el-col> <el-col :span="8" style="text-align:right">证件号码：</el-col>
<el-col :span="16" style="text-align:left"> <el-col :span="16" style="text-align:left">
{{ item.passportNo.length>0?item.passportNo:item.idCard }}</el-col> {{ item.passportNo.length>0?item.passportNo:item.idCard }}</el-col>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
</li> </li>
</ul> </ul>
</template> </template>
<template v-else> <template v-else>
<ul class="guestUl" v-if="dataList.guestInfo"> <ul class="guestUl" v-if="dataList.guestInfo">
<li v-for="(item,index) in dataList.guestInfo" :key="index"> <li v-for="(item,index) in dataList.guestInfo" :key="index">
<template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))"> <template v-if="getKongge(dataList.clientName)!==getKongge((item.surName+''+item.name))">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col> <el-col :span="8" style="text-align:right">{{$t('system.query_name')}}：</el-col>
<el-col :span="16" style="text-align:left"> <el-col :span="16" style="text-align:left">
{{item.Name}}</el-col> {{item.Name}}</el-col>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-col :span="8" style="text-align:right">性别：</el-col> <el-col :span="8" style="text-align:right">性别：</el-col>
<el-col :span="16" style="text-align:left">{{item.Sex}}</el-col> <el-col :span="16" style="text-align:left">{{item.Sex}}</el-col>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="padding:6px 0"> <el-row style="padding:6px 0">
<el-col :span="12"> <el-col :span="12">
<el-col :span="8" style="text-align:right">证件号码</el-col> <el-col :span="8" style="text-align:right">证件号码</el-col>
<el-col :span="16" style="text-align:left">{{item.PassportNo}}</el-col> <el-col :span="16" style="text-align:left">{{item.PassportNo}}</el-col>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>
</li> </li>
</ul> </ul>
</template> </template>
...@@ -1790,8 +1810,8 @@ ...@@ -1790,8 +1810,8 @@
} catch (error) {} } catch (error) {}
}, },
methods: { methods: {
getKongge(str){ getKongge(str) {
return str.replace(/\s+/g, ""); return str.replace(/\s+/g, "");
}, },
closeTcShowHandler() { closeTcShowHandler() {
let domtemp = document.querySelector("#tcShowDialog") 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