Skip to content

S
SuperMan
Commit f4e665ad authored by zhengke's avatar zhengke
Browse files
Options

修改合同

parent 555c5f28
Show whitespace changes
Inline Side-by-side
Showing with 217 additions and 115 deletions
src/components/TravelContractDetail.vue
View file @ f4e665ad
......@@ -285,6 +285,22 @@
.TD_MainContent .Ec_cha:hover {
color: red;
}
.TD_MainContent .TcTravel_Table td{
border: 1px solid rgb(0, 0, 0);
word-break: break-all;
padding:5px;
line-height: 2;
}
.TD_MainContent .TcTravel_Table{
width: 100%;
border: none;
border-collapse: collapse;
border-spacing: 0;
}
.TD_MainContent .TC_LASTTD div{
margin-bottom:10px;
}
</style>
<template>
......@@ -514,10 +530,11 @@
<p>旅游费用支付时间：<span>{{getDate(dataList.payDate)}}</span>。</p>
<h3>第二十二条 人身意外伤害保险</h3>
<p>1.出境社提示旅游者购买人身意外伤害保险；</p>
<p>2.旅游者可以做以下选择：</p>
<p>
旅游者<span> {{dataList.insuranceOpinion==1?'同意':'不同意'}} </span>（同意或者不同意，打勾无效）委托出境社办理人身意外伤害保险，保险公司名称
<span></span>（投保的相关信息以实际保单为准）；
2.旅游者<span v-if="dataList.insuranceOpinion==1">委托出境社购买</span>
<span v-if="dataList.insuranceOpinion==2">自行购买</span>
<span v-if="dataList.insuranceOpinion==3">放弃购买</span>人身意外伤害保险
<span v-if="dataList.insuranceOpinion==1">{{dataList.insuranceProduct}},保险产品名称（投保的相关信息以实际保单为准）；</span>
</p>
<h3>第二十三条 成团人数与不成团的约定</h3>
<p>成团的最低人数：<span>{{dataList.minNumber}}</span>人。</p>
......@@ -691,7 +708,10 @@
</tbody>
</table>
<br>
<table class="TDteam_Table">
<div v-html="dataList.travelContent">
</div>
<!-- <table class="TDteam_Table">
<tbody>
<tr>
<td colspan="5">
......@@ -731,7 +751,7 @@
</div>
</td>
<td>
{{item.TrifficType}}
<span>{{item.TrifficType}}</span>
</td>
<td>
<span v-if="index!=tripList.length-1">旅游酒店</span>
......@@ -741,7 +761,7 @@
</td>
</tr>
</tbody>
</table>
</table> -->
</div>
<!-- 自愿购物 -->
<div class="shoppings" :class="{'checkedNav':cked==6}">
......@@ -1365,11 +1385,11 @@
this.trifficList.forEach((x,index)=>{
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==1){
this.tripList[index].TrifficType='飞机+车'
this.tripList[index].TrifficType='飞机+大巴'
}
}
if(x.airportPickUp==0&&x.isUseBus==1){
this.tripList[index].TrifficType='车'
this.tripList[index].TrifficType='大巴'
}
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==0){
......@@ -1378,11 +1398,11 @@
}
if(x.airportPickUp==0||x.airportPickUp==0){
if(x.isUseBus==0){
this.tripList[index].TrifficType=''
this.tripList[index].TrifficType='无'
}
}
})
},
}
},
mounted() {
this.msg.TCID = this.$route.query.TCID;
......
src/components/TravelContractNew.vue
View file @ f4e665ad
......@@ -196,6 +196,21 @@
color: #ffffff;
opacity: 0.8;
}
.TcTravel_Table{
width: 100%;
border: none;
border-collapse: collapse;
border-spacing: 0;
}
.TcTravel_Table td{
border: 1px solid rgb(0, 0, 0);
word-break: break-all;
padding:5px;
line-height: 2;
}
.TC_LASTTD div{
margin-bottom:10px;
}
</style>
<template>
<div class="TC-MainContent">
......@@ -564,7 +579,6 @@
<td>
<el-form-item label="支付方式" prop="payType">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.payType">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="现金" :value='1'></el-option>
<el-option label="转账" :value='2'></el-option>
<el-option label="支票" :value='3'></el-option>
......@@ -579,19 +593,18 @@
<tbody>
<tr>
<td>
<el-form-item label="旅游者" prop="insuranceOpinion">
<el-form-item label="旅游者">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.insuranceOpinion">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
<el-option label="委托出境社购买" :value='1'></el-option>
<el-option label="自行购买" :value='2'></el-option>
<el-option label="放弃购买" :value='3'></el-option>
</el-select>
委托出境社办理人身意外伤害保险
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="保险产品名称">
<el-form-item label="保险产品名称" prop="insuranceProduct" v-if="CtObj.insuranceOpinion==1">
<el-input type="text" class="w300" v-model="CtObj.insuranceProduct"></el-input>
</el-form-item>
</td>
......@@ -622,59 +635,51 @@
</el-form-item>
</td>
</tr>
<tr>
<td style="padding:10px 0 20px 86px;">如不能成团，旅游者是否同意按下列方式解决：</td>
</tr>
<tr>
<td>
<el-form-item label="如果不能成团，旅游者" prop="insteadOpinion">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.insteadOpinion">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-form-item label="1、">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.insteadOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
</el-select>
旅行社委托其他旅行社履行合同
出境社委托
<el-input type="text" class="w300" v-model="CtObj.insteadCompany"></el-input> 出境社履行合同；
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="被委托旅行社名称">
<el-input type="text" class="w300" v-model="CtObj.insteadCompany"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="如果不能成团，旅游者" prop="delayOpinion">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.delayOpinion">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-form-item label="2、">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.delayOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
</el-select>
延期出团
延期出团；
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="如果不能成团，旅游者" prop="changeOpinion">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.changeOpinion">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-form-item label="3、">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.changeOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
</el-select>
改签其他线路或产品出团
改签其他线路出团；
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="如果不能成团，客户" prop="terminateOpinion">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.terminateOpinion">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-form-item label="4、">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.terminateOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
</el-select>
解除合同
解除合同。
</el-form-item>
</td>
</tr>
......@@ -687,7 +692,6 @@
<td>
<el-form-item label="客户" prop="carpoolOpinion">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.carpoolOpinion">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
</el-select>
......@@ -712,7 +716,6 @@
<div style="margin:20px 0 10px 20px">本合同履行过程中发生争议，由双方协商解决；亦可向合同签订地的旅游质监执法机构、消费者协会等有关部门或者机构申请调解解决。</div>
<el-form-item label="协商或调解不成，按照第" prop="settleDisputeMode">
<el-select placeholder="请选择" filterable class='w210' v-model="CtObj.settleDisputeMode">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="1" :value='1'></el-option>
<el-option label="2" :value='2'></el-option>
</el-select>
......@@ -743,7 +746,6 @@
<td>
<el-form-item label="本合同一式" prop="totalNumber">
<el-select placeholder="请选择" filterable v-model="CtObj.totalNumber" class='w210'>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="壹" :value='1'></el-option>
<el-option label="贰" :value='2'></el-option>
<el-option label="叁" :value='3'></el-option>
......@@ -763,7 +765,6 @@
<td>
<el-form-item label="双方各持" prop="eachNumber">
<el-select placeholder="请选择" filterable v-model="CtObj.eachNumber" class='w210'>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="壹" :value='1'></el-option>
<el-option label="贰" :value='2'></el-option>
<el-option label="叁" :value='3'></el-option>
......@@ -896,7 +897,82 @@
（8）行程安排的娱乐活动（明确娱乐活动的时间、地点和项目内容）；
《行程单》用语须准确清晰，在表明服务标准用语中不应当出现“准×星级”、“豪华”、“仅供参考”、“以××为准”、“与××同级”等不确定用语。
</div>
<el-input type="textarea" rows="26" resize="none" v-model="CtObj.travelContent"></el-input>
<div v-if="CtObj.travelContent!=''" v-html="CtObj.travelContent" ref="TcTravel_Table">
</div>
<div v-else ref="TcTravel_Table">
<table class="TcTravel_Table">
<tbody>
<tr>
<td colspan="5">
组团社：印象之旅
</td>
</tr>
<tr>
<td colspan="5">
旅游线路名称：{{LineName}}&nbsp;&nbsp;&nbsp;&nbsp;行程共计：{{CtObj.dayNum}}天 {{CtObj.nightNum}}晚（含在途时间）
</td>
</tr>
<tr>
<td colspan="5">
出发时间：{{getDate(CtObj.startDate)}}&nbsp;&nbsp;
出发地点：
&nbsp;&nbsp;目的地：
</td>
</tr>
<tr>
<td colspan="5">
结束时间：{{getDate(CtObj.returnDate)}}&nbsp;&nbsp;
返回地点：
</td>
</tr>
<tr>
<td colspan="5">日本周游</td>
</tr>
<tr>
<td colspan="5">地址：</td>
</tr>
<tr>
<td style="width:15%">行程时间</td>
<td style="width:50%">主要景点名称（游览时间）</td>
<td>交通工具（标准）</td>
<td>酒店标准</td>
<td>房间标准</td>
</tr>
<tr v-for="(item,index) in tripList">
<td contenteditable="true">{{getDayAddOne(CtObj.startDate,index)}}</td>
<td contenteditable="true">
<div v-for="subItem in item.details">
<span v-if="subItem.content">{{subItem.content}}</span>
<span v-else>{{subItem.title}}</span>
<span v-if="subItem.content==''&&subItem.title==''">温暖的家</span>
</div>
</td>
<td contenteditable="true">
{{item.TrifficType}}
</td>
<td contenteditable="true">
<span v-if="index!=tripList.length-1">旅游酒店</span>
<span v-else>无</span>
</td>
<td contenteditable="true">
<span v-if="index!=tripList.length-1">双人间</span>
<span v-else>无</span>
</td>
</tr>
<tr>
<td colspan="5" class="TC_LASTTD" contenteditable="true">
<div>备注：1、在主要景点的游览时间不小于此数的时间，以小时填; 2、交通工具不含景区观光车、索道等; 3、“交通工具”栏中的“标准”按各类别的标准填写。</div>
<div>飞机：头等舱/商务舱/经济舱；&nbsp;&nbsp;&nbsp;汽车：空调大巴/空调卧铺/普通客车</div>
<div>火车：普通车/空调车/动车组（其中：软卧/硬卧/软座/硬座）；</div>
<div>轮船：普通客船/星级游船 &nbsp;&nbsp;&nbsp;人/间（其中：□带卫生间 □不带卫生间）</div>
</td>
</tr>
</tbody>
</table>
</table>
</div>
<!-- <el-input type="textarea" rows="26" resize="none" v-model="CtObj.travelContent"></el-input> -->
</div>
<div class="block mtop15" id="anchor-5">
<div class="blockTitle">
......@@ -1114,41 +1190,6 @@
callback();
}
}
let validateOption = (rule, value, callback) => {
if (this.CtObj.insuranceOpinion == 0||this.CtObj.insuranceOpinion =='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
let validateinsteadO = (rule, value, callback) => {
if (this.CtObj.insteadOpinion == 0||this.CtObj.insteadOpinion =='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
let validatedelayOpinion = (rule, value, callback) => {
if (this.CtObj.delayOpinion == 0||this.CtObj.delayOpinion =='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
let validatechangeOpinion = (rule, value, callback) => {
if (this.CtObj.changeOpinion == 0 ||this.CtObj.changeOpinion=='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
let validateterminateOpinion = (rule, value, callback) => {
if (this.CtObj.terminateOpinion == 0 ||this.CtObj.terminateOpinion=='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
let validatecarpoolOpinion = (rule, value, callback) => {
if (this.CtObj.carpoolOpinion == 0 ||this.CtObj.carpoolOpinion=='') {
return callback(new Error('请选择'));
......@@ -1203,8 +1244,8 @@
clientProvinceid:0,
clientCityid:0,
clientAddress:'',
company:'四川和平国际旅行社有限公司',
businessCertificate:'0000000',
company:'',
businessCertificate:'',
companyCall:'',
companyFax:'',
companyEmail:'',
......@@ -1243,7 +1284,7 @@
terminateOpinion:'',
carpoolOpinion:'',
carpoolCompany:'',
settleDisputeMode:'',
settleDisputeMode:2,
arbitrationCommission:'',
court:'',
otherMatter:'',
......@@ -1293,13 +1334,10 @@
orderPrice:[{ required: true, message: "请填写费用合计", trigger: "blur" }],
payDate:[{ required: true, message: "请选择支付日期", trigger: "change" }],
payType:[{ validator: validatepayType , trigger: "change",required: true, }],
insuranceOpinion:[{ validator: validateOption , trigger: "change" ,required: true,}],
insuranceProduct:[{ required: true, message: "请填写最低成团人数", trigger:'blur'}],
minNumber:[{ required: true, message: "请填写最低成团人数", trigger: "change" }],
insteadOpinion:[{ required: true, validator: validateinsteadO , trigger: "change" }],
delayOpinion:[{ required: true, validator: validatedelayOpinion , trigger: "change" }],
changeOpinion:[{ required: true, validator: validatechangeOpinion, trigger: "change" }],
terminateOpinion:[{ required: true, validator: validateterminateOpinion, trigger: "change" }],
carpoolOpinion:[{ required: true, validator: validatecarpoolOpinion, trigger: "change" }],
settleDisputeMode:[{ required: true, validator: validatesettleDisputeMode, trigger: "change" }],
},
......@@ -1309,7 +1347,10 @@
WillingPayArr:[],
//菜单列表
menuArr:['合同基本信息','合同协议条款','其他约定事项','投诉联系','行程信息','游客信息','自愿购物活动补充协议','自愿付费项目补充协议'],
ckedIndex:0
ckedIndex:0,
LineName:'',
//交通
trifficList:[],
};
},
methods: {
......@@ -1323,8 +1364,6 @@
if (res.data.resultCode === 1) {
this.CtObj = res.data.data;
this.guestList = res.data.data.guestList;
this.CtObj.company = '四川和平国际旅行社有限公司';
this.CtObj.businessCertificate = '0000000';
this.CtObj.tcid = this.$route.query.TCID;
this.CtObj.orderId = this.$route.query.orderID;
this.CtObj.totalNumber=2;
......@@ -1349,6 +1388,23 @@
if(this.CtObj.regulatorProvinceid>0){
this.GetJianAreaList(this.CtObj.regulatorProvinceid,2,1);
}
this.CtObj.company = '四川和平国际旅行社有限公司';
this.CtObj.businessCertificate = 'L-SC-CJ00015';
this.CtObj.companyAddress='成都市锦江区一环路东五段87号2幢23层2310.2311.2312号';
this.CtObj.regulatorName = '四川省成都市旅游质监执法机构';
this.CtObj.regulatorComplainCall = '17708046437';
this.CtObj.companyComplainCall = '028-96927';
this.CtObj.clientName=this.guestList[0].surName+''+this.guestList[0].name;
let clientIdcardnum = this.guestList[0].idCard;
if(clientIdcardnum.length<18){
this.CtObj.clientIdcardnum=this.guestList[0].passportNo;
}else{
this.CtObj.clientIdcardnum=this.guestList[0].idCard;
}
this.CtObj.clientCall=this.guestList[0].mobilePhone;
this.CtObj.clientAddress=this.guestList[0].addressDetail;
} else {
this.Error(res.data.message);
}
......@@ -1487,7 +1543,7 @@
this.CtObj.payProtocol=''
}
}
console.log(this.CtObj,'CtObj');
this.CtObj.travelContent= this.$refs.TcTravel_Table.innerHTML;
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -1620,6 +1676,10 @@
this.ckedIndex = 7
}
},
//加一天返回
getDayAddOne(day,num){
return moment(day).add(num,'days').format('MM/DD');
},
GetTrip(id, TCID) {
this.tripList = [];
this.startDate = '';
......@@ -1640,7 +1700,9 @@
if (res.data.data.priceList && res.data.data.priceList.length > 0) {
this.startDate = res.data.data.priceList[0].startDate;
}
this.trifficList = res.data.data.trafficList;
this.tripList = res.data.data.dayList;
this.LineName=res.data.data.lineName;
this.init();
}
},
......@@ -1991,19 +2053,39 @@
this.tripList[i].can.breakfirst = "酒店内享用早餐";
}
}
let str = '';
this.tripList.forEach((x,index)=>{
str +=`第${x.dayNum}天 ${x.title}\n`
x.details.forEach(y=>{
if(index==this.tripList.length-1){
str+=`温暖的家\n`
}else{
str +=`${y.title}\n`
// let str = '';
// this.tripList.forEach((x,index)=>{
// str +=`第${x.dayNum}天 ${x.title}\n`
// x.details.forEach(y=>{
// if(index==this.tripList.length-1){
// str+=`温暖的家\n`
// }else{
// str +=`${y.title}\n`
// }
// })
// str +=`早餐：${x.can.breakfirst}\n午餐：${x.can.lanuch}\n晚餐：${x.can.dinner}\n \r`
// })
// this.CtObj.travelContent = str;
this.trifficList.forEach((x,index)=>{
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==1){
this.tripList[index].TrifficType='飞机+大巴'
}
}
if(x.airportPickUp==0&&x.isUseBus==1){
this.tripList[index].TrifficType='大巴'
}
if(x.airportPickUp==1||x.airportPickUp==2){
if(x.isUseBus==0){
this.tripList[index].TrifficType='飞机'
}
}
if(x.airportPickUp==0||x.airportPickUp==0){
if(x.isUseBus==0){
this.tripList[index].TrifficType='无'
}
}
})
str +=`早餐：${x.can.breakfirst}\n午餐：${x.can.lanuch}\n晚餐：${x.can.dinner}\n \r`
})
this.CtObj.travelContent = str;
//生成其他约定事项
let otherMatter='';
......
src/components/administrative/ElectronicAudit.vue
View file @ f4e665ad
......@@ -43,7 +43,7 @@
</el-select>
</span>
</li>
<li>
<li style="display:none;">
<span>
<em>日期</em>
<el-date-picker v-model='msg.startDate' class='w135' value-format="yyyy-MM-dd" type="date"
......
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