Skip to content

S
SuperMan
Commit 6da291b6 authored by 黄奎's avatar 黄奎
Browse files
Options

国内合同修改

parent 3eff1894
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 140 deletions
src/components/DomesticTravelcontract.vue
View file @ 6da291b6
......@@ -420,6 +420,18 @@
<div class="createTableTitle">旅行社信息</div>
<table class="createTable">
<tbody>
<tr>
<td>
<el-form-item label="合同章">
<el-select v-model="CtObj.SignType" :placeholder="$t('pub.pleaseSel')" @change="changeSignType">
<el-option key="0" label="和平章" :value="0">
</el-option>
<el-option key="2" label="欧亚" :value="2">
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="公司名称">
......@@ -1257,6 +1269,7 @@
TCID: 0,
OrderId: 0,
GuestNum: 0, //旅客人数
SignType: 0, //0-四川和平，1-日本PIC，2-成都欧亚
},
//旅客名单
guestList: [],
......@@ -1359,6 +1372,17 @@
commonTripList: commonTripList
},
methods: {
changeSignType() {
if (this.CtObj.SignType == 0) {
this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 ";
this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015";
} else if (this.CtObj.SignType == 2) {
this.CtObj.TravelAgency_Name = "成都欧亚旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市金牛区营门口路48号1栋3单元16楼1601";
this.CtObj.TravelAgency_LicenseNum = "L-SC-A00289";
}
},
//点击切换行程
exchangeTrip() {
if (this.CtObj.TripType == 0) {
......@@ -1623,6 +1647,7 @@
this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum;
this.CtObj.C_PayDayNum = tempObj.C_PayDayNum;
this.CtObj.C_SignType = tempObj.C_SignType;
this.CtObj.SignType = tempObj.SignType;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
this.CtObj.OtherConvention = tempObj.OtherConvention;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
......@@ -1637,6 +1662,9 @@
this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
this.CtObj.GuestNum = tempObj.GuestNum;
this.CtObj.TravelAgency_Name=tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address=tempObj.TravelAgency_Address;
this.CtObj.TravelAgency_LicenseNum=tempObj.TravelAgency_LicenseNum;
this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice;
if (
......
src/components/Restaurant/RestaurantPackage.vue
View file @ 6da291b6
......@@ -132,7 +132,7 @@
<span class="tit_name T1">
{{item.CurrencyName==''?'':item.CurrencyName}}<span
v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
class='tit_name T2'>{{item.LPrice}}</span>
class='tit_name T2'>{{item.LPrice}}/人</span>
</p>
<p class="Ldata">{{item.LDate}}</p>
</td>
......@@ -141,7 +141,7 @@
<span class="tit_name T1">
{{item.CurrencyName==''?'':item.CurrencyName}}<span
v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
class='tit_name HP'>{{item.HPrice}}</span>
class='tit_name HP'>{{item.HPrice}}/人</span>
</p>
<p class="Ldata">{{item.HDate}}</p>
</td>
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ 6da291b6
......@@ -67,23 +67,23 @@
<th width="110">{{$t('active.ad_xuhao')}}</th>
<th width="100">{{$t('sm.chufadi')}}</th>
<th width="120">{{$t('ground.hbsj')}}</th>
<th width="140">{{$t('ground.gongsituanhao')}}</th>
<th width="180">{{$t('ground.gongsituanhao')}}</th>
<th width="120">{{$t('ground.jiweishokzs')}}</th>
<th width="120">{{$t('adm.adm_time')}}</th>
<th width="130">{{$t('restaurant.res_resName')}}</th>
<th width="80">{{$t('admin.admin_status')}}</th>
<th width="300">{{$t('restaurant.res_resName')}}</th>
<th width="100">{{$t('ground.yongcanleixing')}}</th>
<th width="80">{{$t('admin.admin_status')}}</th>
<th width="100">{{$t('ground.da')}}</th>
<th width="100">{{$t('ground.zhong')}}</th>
<th width="100">{{$t('ground.xiao')}}</th>
<th width="100">{{$t('system.table_operation')}}</th>
</tr>
<template v-for="(outItem,outindex) in DataList">
<tbody :class="{bookDinnerStatisticsSplitTrCss:outindex%2!=0}">
<tbody :class="{bookDinnerStatisticsSplitTrCss:outindex%2!=0}" :key="`d_s_`+outindex">
<template v-for="(item,index) in outItem.StaticsReportList">
<template v-for="(subItem,subIndex) in item.CommonReport.DiningList">
<template v-for="(thirdItem,thirdIndex) in subItem.DiningSummaryList">
<tr>
<tr :key="`d_s_d_`+outindex+index+subIndex+thirdIndex">
<td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}}
</td>
......@@ -146,6 +146,8 @@
</td>
<td style="text-align:left;padding-left:3px;">
{{thirdItem.DiningName}}
<br />
真实名称:<font style="color:red;">{{thirdItem.DiningRealName}}</font>
</td>
<td>
{{thirdItem.UseDinnerTypeStr}}
......@@ -154,12 +156,12 @@
<template v-if="thirdItem.OrderState==-1">
<span style="color:red">未操作</span>
</template>
<template v-else-if="thirdItem.OrderState==0">
<span style="color:red">暂定</span>
</template>
<template v-else-if="thirdItem.OrderState==1">
<span style="color:green">确定</span>
</template>
<template v-else>
<span style="color:red">暂定</span>
</template>
</td>
<td>
<!--大人-->
......
src/components/TravelContractConfirm.vue
View file @ 6da291b6
......@@ -1354,8 +1354,7 @@
</template>
<span>{{CtObj.C_TotalPrice}}</span>{{getCurrencyStr()}}&nbsp;&nbsp;（大写）
<template
v-if="CtObj.SignType==0">
<template v-if="CtObj.SignType==0">
人民币
</template>
<template v-else>
......@@ -1537,7 +1536,6 @@
<!-- 签字 -->
<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">签字</span>
<span style="font-size:2rem" v-else>重新签字</span>
......@@ -1606,9 +1604,9 @@
</font>
人（名单可附页，需旅行社和旅游者代表签字盖章确认）；
</p>
<p>旅行社：<font>{{dataList.company}}</font>
<p>旅行社：<font>{{CtObj.TravelAgency_Name}}</font>
</p>
<p>旅行社业务经营许可证编号：<font>{{dataList.businessCertificate}}</font>
<p>旅行社业务经营许可证编号：<font>{{CtObj.TravelAgency_LicenseNum}}</font>
</p>
<h3>
<p class="TC_ZhangTitle">第一章&nbsp;&nbsp;术语和定义</p>
......@@ -1887,26 +1885,17 @@
<p class="bold colorRed">支付宝收款账号：2850943039@qq.com</p>
</template>
<template v-else>
<p>出境社的指定收款账号信息</p>
<p>
銀行名：京都銀行
</p>
<p>
支店名：水口支店　店番593
</p>
<p>
口座種別：レギュラー口座
<p>国内社的指定收款账号信息</p>
<p class="bold colorRed">
名称：成都欧亚旅行社有限公司
</p>
<p>
口座番号： 593-1070078
<p class="bold colorRed">
开户银行：交通银行股份有限公司成都西安路支行
</p>
<p class="bold colorRed">
账户名：株式会社ピースインターナショナル
账号：5116 1501 7018 0101 9726 7
</p>
<p>银行住所：滋賀県甲賀市水口町本綾野5－21</p>
<p>银行邮编：〒528-0037　</p>
<p>電話番号：0748－65－1011</p>
<p>SWIFT CODE: BOKFJPJZ</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<h3>
<p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p>
......@@ -3768,7 +3757,7 @@
<el-row>
<el-col :span="12">
<div style="width:100%;" @click="handelClearEl()">
<!-- <span class="bg bg1"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">重置签名</span>
</div>
......@@ -3776,14 +3765,11 @@
</el-col>
<el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()">
<!-- <span class="bg bg2"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">完成签名</span>
</div>
</el-col>
</el-row>
<!-- <input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" />
<input type="button" @click="handelSaveEl()" class="CV_Btn" :value="$t('pub.saveBtn')" /> -->
</div>
</div>
</div>
......@@ -3801,22 +3787,17 @@
<el-row>
<el-col :span="12">
<div style="width:100%;" @click="handelClearEl()">
<!-- <span class="bg bg1"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">重置签名</span>
</div>
</el-col>
<el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()">
<!-- <span class="bg bg2"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">完成签名</span>
</div>
</el-col>
</el-row>
<!-- <input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" />
<input type="button" @click="handelSaveEl()" class="CV_Btn" :value="$t('pub.saveBtn')" /> -->
</div>
</div>
</div>
......@@ -3860,11 +3841,11 @@
Tourists_Fax: "",
Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "",
TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_Name: "", //旅行社名称
TravelAgency_LicenseNum: "",
TravelAgency_DealMan: "",
TravelAgency_IDNum: "",
TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号",
TravelAgency_Address: "",
TravelAgency_Tel: "",
TravelAgency_Fax: "",
TravelAgency_PostNum: "",
......
src/components/TravelContractView.vue
View file @ 6da291b6
......@@ -1315,27 +1315,18 @@
</p>
<p class="bold colorRed">支付宝收款账号：2850943039@qq.com</p>
</template>
<template v-else>
<p>出境社的指定收款账号信息</p>
<p>
銀行名：京都銀行
</p>
<p>
支店名：水口支店　店番593
</p>
<p>
口座種別：レギュラー口座
<template v-else-if="CtObj.SignType==2">
<p>国内社的指定收款账号信息</p>
<p class="bold colorRed">
名称：成都欧亚旅行社有限公司
</p>
<p>
口座番号： 593-1070078
<p class="bold colorRed">
开户银行：交通银行股份有限公司成都西安路支行
</p>
<p class="bold colorRed">
账户名：株式会社ピースインターナショナル
账号：5116 1501 7018 0101 9726 7
</p>
<p class="bold colorRed">银行住所：滋賀県甲賀市水口町本綾野5－21</p>
<p class="bold colorRed">银行邮编：〒528-0037　</p>
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<h3>
<p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p>
......
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