Skip to content

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

11

parent 0960c0a9
Show whitespace changes
Inline Side-by-side
Showing with 236 additions and 171 deletions
src/components/TravelContractDetail.vue
View file @ 05787745
<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 @ 05787745
<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>
......@@ -315,9 +316,10 @@
</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,7 +1099,8 @@
<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?'': '小时')}}
......@@ -1148,7 +1148,8 @@
<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-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br /></span>
<span v-else>无</span>
</template>
</template>
......@@ -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,7 +1840,7 @@
that.SMLoading = false
that.Error(res.data.message);
}
},err=>{
}, err => {
that.SMLoading = false
}
);
......@@ -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",
......@@ -1987,7 +2007,9 @@
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;
......@@ -2672,9 +2694,9 @@
}
}
this.trifficList.forEach((x, index) => {
if(x.busTip!=null && x.busTip!=''){
if (x.busTip != null && x.busTip != '') {
this.tripDays[index].TrifficType = x.busTip;
}else{
} else {
if (x.airportPickUp == 1 || x.airportPickUp == 2) {
if (x.isUseBus == 1) {
this.tripDays[index].TrifficType = "飞机+大巴";
......@@ -2696,7 +2718,7 @@
}
});
},
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 @ 05787745
......@@ -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