Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents af5e5378 cc72d1b4
Show whitespace changes
Inline Side-by-side
Showing with 414 additions and 268 deletions
src/components/SingleContract.vue
View file @ 82c4ba2c
...@@ -579,15 +579,11 @@ ...@@ -579,15 +579,11 @@
<el-form-item style="display:inline-block;" label="费用总额（小写）人民币" prop="C_TotalPrice"> <el-form-item style="display:inline-block;" label="费用总额（小写）人民币" prop="C_TotalPrice">
<el-input type="text" class="w300" v-model="CtObj.C_TotalPrice" <el-input type="text" class="w300" v-model="CtObj.C_TotalPrice"
@keyup.native="checkPrice(CtObj,'C_TotalPrice'),number_chinese(CtObj.C_TotalPrice)" @keyup.native="checkPrice(CtObj,'C_TotalPrice'),number_chinese(CtObj.C_TotalPrice)"
maxlength="10"></el-input>&nbsp;<template v-if="CtObj.SignType==0"> maxlength="10"></el-input>&nbsp;{{getCurrencyStr()}}
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
<el-form-item style="display:inline-block;" label="（大写）人民币" label-width="120px"> <el-form-item style="display:inline-block;" label="（大写）人民币" label-width="120px">
<el-input type="text" class="w300" maxlength="50" v-model="AmountMoney"></el-input>&nbsp;元 <el-input type="text" class="w300" maxlength="50" v-model="AmountMoney"></el-input>
&nbsp;{{getCurrencyStr()}}
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -691,24 +687,9 @@ ...@@ -691,24 +687,9 @@
<th width="15%">出发地</th> <th width="15%">出发地</th>
<th width="12%">目的地</th> <th width="12%">目的地</th>
<th width="12%">航班号</th> <th width="12%">航班号</th>
<th width="12%">机票金额（<template v-if="CtObj.SignType==0"> <th width="12%">机票金额（{{getCurrencyStr()}}/张）</th>
元 <th width="12%">机场建设费（{{getCurrencyStr()}}/张）</th>
</template> <th width="12%">定金（{{getCurrencyStr()}}/张）</th>
<template v-else>
円
</template>/张）</th>
<th width="12%">机场建设费（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张）</th>
<th width="12%">定金（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张）</th>
<th width="100">操作</th> <th width="100">操作</th>
</tr> </tr>
<tr v-for="(item,index) in CtObj.ContractTicketList" :key="index"> <tr v-for="(item,index) in CtObj.ContractTicketList" :key="index">
...@@ -780,12 +761,7 @@ ...@@ -780,12 +761,7 @@
<div style="margin-left:50px"> <div style="margin-left:50px">
<el-form-item label="机票预定费用总额：" label-width="140px"> <el-form-item label="机票预定费用总额：" label-width="140px">
<el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'TicketTotalDepositPrice')" <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'TicketTotalDepositPrice')"
v-model="CtObj.TicketTotalDepositPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0"> v-model="CtObj.TicketTotalDepositPrice"></el-input>&nbsp;{{getCurrencyStr()}}
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -817,21 +793,11 @@ ...@@ -817,21 +793,11 @@
</th> </th>
<th> <th>
<div>房费</div> <div>房费</div>
<div>（<template v-if="CtObj.SignType==0"> <div>（{{getCurrencyStr()}}/间/晚）</div>
元
</template>
<template v-else>
円
</template>/间/晚）</div>
</th> </th>
<th> <th>
<div>定金</div> <div>定金</div>
<div>（<template v-if="CtObj.SignType==0"> <div>（{{getCurrencyStr()}}/间/晚）</div>
元
</template>
<template v-else>
円
</template>/间/晚）</div>
</th> </th>
<th>入住日期</th> <th>入住日期</th>
<th>离店日期</th> <th>离店日期</th>
...@@ -929,12 +895,7 @@ ...@@ -929,12 +895,7 @@
<div> <div>
<el-form-item style="display:inline-block;" label="费用共计：" label-width="140px"> <el-form-item style="display:inline-block;" label="费用共计：" label-width="140px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'HotelTotalPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'HotelTotalPrice')"
v-model="CtObj.HotelTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0"> v-model="CtObj.HotelTotalPrice"></el-input>&nbsp;{{getCurrencyStr()}}
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -1011,12 +972,7 @@ ...@@ -1011,12 +972,7 @@
<div style="margin:20px 0 0 50px"> <div style="margin:20px 0 0 50px">
<el-form-item style="display:inline-block;" label="费用共计：" label-width="90px"> <el-form-item style="display:inline-block;" label="费用共计：" label-width="90px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'PickUpTotalPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'PickUpTotalPrice')"
v-model="CtObj.PickUpTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0"> v-model="CtObj.PickUpTotalPrice"></el-input>&nbsp;{{getCurrencyStr()}}
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -1039,18 +995,8 @@ ...@@ -1039,18 +995,8 @@
<th width="60">序号</th> <th width="60">序号</th>
<th>国家（个人签证）</th> <th>国家（个人签证）</th>
<th>停留时间</th> <th>停留时间</th>
<th>代办签证费用（<template v-if="CtObj.SignType==0"> <th>代办签证费用（{{getCurrencyStr()}}/个）</th>
元 <th>交付保证金（{{getCurrencyStr()}}/个）</th>
</template>
<template v-else>
円
</template>/个）</th>
<th>交付保证金（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/个）</th>
<th width="100">操作</th> <th width="100">操作</th>
</tr> </tr>
<tr v-for="(item,index) in CtObj.ContractVisaList" :key="index"> <tr v-for="(item,index) in CtObj.ContractVisaList" :key="index">
...@@ -1095,12 +1041,7 @@ ...@@ -1095,12 +1041,7 @@
<div style="margin:20px 0 0 50px"> <div style="margin:20px 0 0 50px">
<el-form-item style="display:inline-block;" label="合计金额：" label-width="90px"> <el-form-item style="display:inline-block;" label="合计金额：" label-width="90px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'VisaTotalPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'VisaTotalPrice')"
v-model="CtObj.VisaTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0"> v-model="CtObj.VisaTotalPrice"></el-input>&nbsp;{{getCurrencyStr()}}
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -1127,18 +1068,8 @@ ...@@ -1127,18 +1068,8 @@
<th>目的地</th> <th>目的地</th>
<th>航班号</th> <th>航班号</th>
<th>舱位</th> <th>舱位</th>
<th>机票金额（<template v-if="CtObj.SignType==0"> <th>机票金额（{{getCurrencyStr()}}/张）</th>
元 <th>机场建设费（{{getCurrencyStr()}}/张）</th>
</template>
<template v-else>
円
</template>/张）</th>
<th>机场建设费（<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张）</th>
<th width="100">操作</th> <th width="100">操作</th>
</tr> </tr>
<tr v-for="(item,index) in CtObj.ContractTicketAndHotel.ContractTickets" :key="index"> <tr v-for="(item,index) in CtObj.ContractTicketAndHotel.ContractTickets" :key="index">
...@@ -1275,12 +1206,7 @@ ...@@ -1275,12 +1206,7 @@
<div style="margin:20px 0 0 50px"> <div style="margin:20px 0 0 50px">
<el-form-item style="display:inline-block;" label="合计金额：" label-width="90px"> <el-form-item style="display:inline-block;" label="合计金额：" label-width="90px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'TicketAndHotelTotalPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'TicketAndHotelTotalPrice')"
v-model="CtObj.TicketAndHotelTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0"> v-model="CtObj.TicketAndHotelTotalPrice"></el-input>&nbsp;{{getCurrencyStr()}}
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
...@@ -1301,12 +1227,7 @@ ...@@ -1301,12 +1227,7 @@
<div style="margin:20px 0 0 50px"> <div style="margin:20px 0 0 50px">
<el-form-item style="display:inline-block;" label="其他服务费用合计：" label-width="140px"> <el-form-item style="display:inline-block;" label="其他服务费用合计：" label-width="140px">
<el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'OtherConventionPrice')" <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'OtherConventionPrice')"
v-model="CtObj.OtherConventionPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0"> v-model="CtObj.OtherConventionPrice"></el-input>&nbsp;{{getCurrencyStr()}}
元
</template>
<template v-else>
円
</template>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
...@@ -2099,8 +2020,11 @@ ...@@ -2099,8 +2020,11 @@
//小写金额转大写 //小写金额转大写
number_chinese(str) { number_chinese(str) {
var num = parseFloat(str); var num = parseFloat(str);
var strOutput = "", var strOutput = "";
strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分'; var strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分';
if (this.CtObj.SignType == 1) {
strUnit = '仟佰拾亿仟佰拾万仟佰拾円角分';
}
num += "00"; num += "00";
var intPos = num.indexOf('.'); var intPos = num.indexOf('.');
if (intPos >= 0) { if (intPos >= 0) {
...@@ -2110,8 +2034,13 @@ ...@@ -2110,8 +2034,13 @@
for (var i = 0; i < num.length; i++) { for (var i = 0; i < num.length; i++) {
strOutput += '零壹贰叁肆伍陆柒捌玖'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1); strOutput += '零壹贰叁肆伍陆柒捌玖'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
} }
if (this.CtObj.SignType == 0) {
this.AmountMoney = strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace( this.AmountMoney = strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(
/零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元") /零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元")
} else {
this.AmountMoney = strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(
/零([亿|万])/g, '$1').replace(/零+元/, '円').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零円")
}
} }
}, },
created() { created() {
......
src/components/TravelContractConfirm.vue
View file @ 82c4ba2c
...@@ -812,9 +812,24 @@ ...@@ -812,9 +812,24 @@
<font>{{getDate(item.TicketTime)}}</font>&nbsp;&nbsp;<font>{{item.StartPlace}}</font> <font>{{getDate(item.TicketTime)}}</font>&nbsp;&nbsp;<font>{{item.StartPlace}}</font>
&nbsp;/&nbsp;<font>{{item.ArrivePlace}}</font>&nbsp;&nbsp;航班号<font>{{item.FlightNum}}</font> &nbsp;/&nbsp;<font>{{item.ArrivePlace}}</font>&nbsp;&nbsp;航班号<font>{{item.FlightNum}}</font>
</p> </p>
<p>机票金额<font>{{item.TicketPrice}}</font>元/张</p> <p>机票金额<font>{{item.TicketPrice}}</font><template v-if="CtObj.SignType==0">
<p>机场建设费<font>{{item.AirportPirce}}</font>元/张</p> 元
<p>定金<font>{{item.DepositPrice}}</font>元/张</p> </template>
<template v-else>
円
</template>/张</p>
<p>机场建设费<font>{{item.AirportPirce}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张</p>
<p>定金<font>{{item.DepositPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张</p>
</template> </template>
</el-col> </el-col>
</el-row> </el-row>
...@@ -836,7 +851,12 @@ ...@@ -836,7 +851,12 @@
<li> <li>
<el-row> <el-row>
<el-col :span="24" style="text-align:left;"> <el-col :span="24" style="text-align:left;">
<p>机票预定费用总额： <font>{{CtObj.TicketTotalDepositPrice}}</font>元</p> <p>机票预定费用总额： <font>{{CtObj.TicketTotalDepositPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template></p>
</el-col> </el-col>
</el-row> </el-row>
</li> </li>
...@@ -858,8 +878,18 @@ ...@@ -858,8 +878,18 @@
</p> </p>
<p>人数：成人人数：<font>{{item.AdultNum}}</font>人 儿童人数：<font>{{item.ChildrenNum}}</font>人（不占床位、不加床位） <p>人数：成人人数：<font>{{item.AdultNum}}</font>人 儿童人数：<font>{{item.ChildrenNum}}</font>人（不占床位、不加床位）
</p> </p>
<p>房费：<font>{{item.RoomPrice}}</font>元/间/晚</p> <p>房费：<font>{{item.RoomPrice}}</font><template v-if="CtObj.SignType==0">
<p>定金：<font>{{item.DepositPrice}}</font>元/间/晚</p> 元
</template>
<template v-else>
円
</template>/间/晚</p>
<p>定金：<font>{{item.DepositPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/间/晚</p>
<p>入住日期：<font>{{item.CheckInDate}}</font>/离店日期：<font>{{item.OutDate}}</font> <p>入住日期：<font>{{item.CheckInDate}}</font>/离店日期：<font>{{item.OutDate}}</font>
</p> </p>
</template> </template>
...@@ -899,7 +929,12 @@ ...@@ -899,7 +929,12 @@
<li> <li>
<el-row> <el-row>
<el-col :span="24" style="text-align:left;"> <el-col :span="24" style="text-align:left;">
<p>费用共计：<font>{{CtObj.HotelTotalPrice}}</font>元</p> <p>费用共计：<font>{{CtObj.HotelTotalPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template></p>
</el-col> </el-col>
</el-row> </el-row>
</li> </li>
...@@ -925,7 +960,12 @@ ...@@ -925,7 +960,12 @@
<li> <li>
<el-row> <el-row>
<el-col :span="24" style="text-align:left;"> <el-col :span="24" style="text-align:left;">
<p>费用合计：<font>{{CtObj.PickUpTotalPrice}}</font>元</p> <p>费用合计：<font>{{CtObj.PickUpTotalPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template></p>
</el-col> </el-col>
</el-row> </el-row>
</li> </li>
...@@ -942,8 +982,18 @@ ...@@ -942,8 +982,18 @@
<p> <p>
<font>{{item.Country}}</font>国家的个人签证&nbsp;&nbsp;&nbsp;希望停留时间<font>{{item.StopTime}}</font> <font>{{item.Country}}</font>国家的个人签证&nbsp;&nbsp;&nbsp;希望停留时间<font>{{item.StopTime}}</font>
</p> </p>
<p>代办签证费用：<font>{{item.VisaPrice}}</font>元/人&nbsp;&nbsp;&nbsp;交付保证金：<font> <p>代办签证费用：<font>{{item.VisaPrice}}</font><template v-if="CtObj.SignType==0">
{{item.DepositPrice}}</font>元/人</p> 元
</template>
<template v-else>
円
</template>/人&nbsp;&nbsp;&nbsp;交付保证金：<font>
{{item.DepositPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/人</p>
</template> </template>
</el-col> </el-col>
</el-row> </el-row>
...@@ -951,7 +1001,12 @@ ...@@ -951,7 +1001,12 @@
<li> <li>
<el-row> <el-row>
<el-col :span="24" style="text-align:left;"> <el-col :span="24" style="text-align:left;">
<p>合计金额：<font>{{CtObj.VisaTotalPrice}}</font>元</p> <p>合计金额：<font>{{CtObj.VisaTotalPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template></p>
</el-col> </el-col>
</el-row> </el-row>
</li> </li>
...@@ -973,8 +1028,18 @@ ...@@ -973,8 +1028,18 @@
</p> </p>
<p>舱位<font>{{item.TicketSpace}}</font> <p>舱位<font>{{item.TicketSpace}}</font>
</p> </p>
<p>机票金额<font>{{item.TicketPrice}}</font>元/张</p> <p>机票金额<font>{{item.TicketPrice}}</font><template v-if="CtObj.SignType==0">
<p>机场建设费<font>{{item.AirportPirce}}</font>元/张</p> 元
</template>
<template v-else>
円
</template>/张</p>
<p>机场建设费<font>{{item.AirportPirce}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/张</p>
</template> </template>
<template <template
v-if="CtObj.ContractTicketAndHotel && CtObj.ContractTicketAndHotel.ContractHotels && CtObj.ContractTicketAndHotel.ContractHotels.length>0" v-if="CtObj.ContractTicketAndHotel && CtObj.ContractTicketAndHotel.ContractHotels && CtObj.ContractTicketAndHotel.ContractHotels.length>0"
...@@ -986,8 +1051,18 @@ ...@@ -986,8 +1051,18 @@
</p> </p>
<p>入住日期：<font>{{item.CheckInDate}}</font>/离店日期：<font>{{item.OutDate}}</font> <p>入住日期：<font>{{item.CheckInDate}}</font>/离店日期：<font>{{item.OutDate}}</font>
</p> </p>
<p>费用：成人费用：<font>{{item.AdultPrice}}</font>元/人&nbsp;儿童费用：<font>{{item.ChildrenPrice}}</font> <p>费用：成人费用：<font>{{item.AdultPrice}}</font><template v-if="CtObj.SignType==0">
元/人（不占床位、不加床位）</p> 元
</template>
<template v-else>
円
</template>/人&nbsp;儿童费用：<font>{{item.ChildrenPrice}}</font>
<template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>/人（不占床位、不加床位）</p>
</template> </template>
</el-col> </el-col>
</el-row> </el-row>
...@@ -995,7 +1070,12 @@ ...@@ -995,7 +1070,12 @@
<li> <li>
<el-row> <el-row>
<el-col :span="24" style="text-align:left;"> <el-col :span="24" style="text-align:left;">
<p>费用合计：<font>{{CtObj.TicketAndHotelTotalPrice}}</font>元</p> <p>费用合计：<font>{{CtObj.TicketAndHotelTotalPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template></p>
</el-col> </el-col>
</el-row> </el-row>
</li> </li>
...@@ -1080,7 +1160,12 @@ ...@@ -1080,7 +1160,12 @@
<li> <li>
<el-row> <el-row>
<el-col :span="24" style="text-align:left;"> <el-col :span="24" style="text-align:left;">
<p>费用合计：<font>{{CtObj.OtherConventionPrice}}</font>元</p> <p>费用合计：<font>{{CtObj.OtherConventionPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template></p>
</el-col> </el-col>
</el-row> </el-row>
</li> </li>
...@@ -1150,7 +1235,6 @@ ...@@ -1150,7 +1235,6 @@
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII=" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;width:3rem;" /> style="margin-bottom: -4px;width:3rem;" />
</template> </template>
等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p> 等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1158,7 +1242,12 @@ ...@@ -1158,7 +1242,12 @@
<li> <li>
<el-row> <el-row>
<el-col :span="24" style="text-align:left;"> <el-col :span="24" style="text-align:left;">
<p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span>元&nbsp;&nbsp;（大写）人民币<span> <p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span><template v-if="CtObj.SignType==0">
{{getCurrencyStr()}}
</template>
<template v-else>
円
</template>&nbsp;&nbsp;（大写）人民币<span>
<font>{{number_chinese(CtObj.C_TotalPrice)}}</font> <font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
</span></p> </span></p>
</el-col> </el-col>
...@@ -1253,7 +1342,20 @@ ...@@ -1253,7 +1342,20 @@
</template> </template>
等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p> 等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
<p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span>元&nbsp;&nbsp;（大写）人民币<span> <p>费用总额（小写）
<template v-if="CtObj.SigeType==0">
人民币
</template>
<template v-else>
日元
</template>
<span>{{CtObj.C_TotalPrice}}</span>{{getCurrencyStr()}}&nbsp;&nbsp;（大写） <template
v-if="CtObj.SigeType==0">
人民币
</template>
<template v-else>
日元
</template><span>
<font>{{number_chinese(CtObj.C_TotalPrice)}}</font> <font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
</span></p> </span></p>
<br> <br>
...@@ -1712,8 +1814,10 @@ ...@@ -1712,8 +1814,10 @@
<p class="toTopDistance">第二十一条 旅游费用及支付（以人民币为计算单位）</p> <p class="toTopDistance">第二十一条 旅游费用及支付（以人民币为计算单位）</p>
</h3> </h3>
<p> <p>
成人<font>{{CtObj.C_AdultPrice}}</font>元/人，儿童（不满14岁）<font>{{CtObj.C_ChildrenPrice}}</font>元/人；其中，导游服务费 成人<font>{{CtObj.C_AdultPrice}}</font>{{getCurrencyStr()}}/人，儿童（不满14岁）<font>{{CtObj.C_ChildrenPrice}}
<font>{{CtObj.C_GuideServicePrice}}</font>元/人；旅游费用合计：<font>{{CtObj.C_TotalPrice}}</font>元。 </font>{{getCurrencyStr()}}/人；其中，导游服务费
<font>{{CtObj.C_GuideServicePrice}}</font>{{getCurrencyStr()}}/人；旅游费用合计：<font>{{CtObj.C_TotalPrice}}
</font>{{getCurrencyStr()}}。
</p> </p>
<p>旅游费用支付方式： <p>旅游费用支付方式：
<font v-if="CtObj.C_PayType==1">现金</font> <font v-if="CtObj.C_PayType==1">现金</font>
...@@ -2121,7 +2225,7 @@ ...@@ -2121,7 +2225,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-col :span="12" style="text-align:right">费用（元）：</el-col> <el-col :span="12" style="text-align:right">费用（{{getCurrencyStr()}}）：</el-col>
<el-col :span="12" style="text-align:left">{{item.SelfFeePrice}}</el-col> <el-col :span="12" style="text-align:left">{{item.SelfFeePrice}}</el-col>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
...@@ -2285,25 +2389,10 @@ ...@@ -2285,25 +2389,10 @@
<p>旅游费用： <p>旅游费用：
成人<font>{{CtObj.C_AdultNum}}</font>人 成人<font>{{CtObj.C_AdultNum}}</font>人
×<font>{{CtObj.C_AdultPrice}}</font><template v-if="CtObj.SignType==0"> ×<font>{{CtObj.C_AdultPrice}}</font>{{getCurrencyStr()}}/人
元
</template>
<template v-else>
円
</template>/人
+儿童<font>{{CtObj.C_ChildrenNum}}</font>人 +儿童<font>{{CtObj.C_ChildrenNum}}</font>人
×<font>{{CtObj.C_ChildrenPrice}}</font><template v-if="CtObj.SignType==0"> ×<font>{{CtObj.C_ChildrenPrice}}</font>{{getCurrencyStr()}}/人
元 = {{getCurrencyStr()}}
</template>
<template v-else>
円
</template>/人
= <font>{{CtObj.C_TotalPrice}}</font><template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>
</p> </p>
<p> <p>
含：<font>{{CtObj.C_IncludeRemark}}</font> 含：<font>{{CtObj.C_IncludeRemark}}</font>
...@@ -2954,8 +3043,10 @@ ...@@ -2954,8 +3043,10 @@
<p class="toTopDistance">第二十一条 旅游费用及支付（以人民币为计算单位）</p> <p class="toTopDistance">第二十一条 旅游费用及支付（以人民币为计算单位）</p>
</h3> </h3>
<p> <p>
成人<font>{{dataList.adultPrice}}</font>元/人，小孩<font>{{dataList.childPrice}}</font>元/人；其中，导游服务费 成人<font>{{dataList.adultPrice}}</font>{{getCurrencyStr()}}/人，小孩<font>{{dataList.childPrice}}</font>
<font>{{dataList.servicePrice}}</font>元/人；旅游费用合计：<font>{{dataList.orderPrice}}</font>元。 {{getCurrencyStr()}}/人；其中，导游服务费
<font>{{dataList.servicePrice}}</font>{{getCurrencyStr()}}/人；旅游费用合计：<font>{{dataList.orderPrice}}</font>
{{getCurrencyStr()}}。
</p> </p>
<p>旅游费用支付方式：<font>{{dataList.payType==1?'现金':'转账'}}</font> <p>旅游费用支付方式：<font>{{dataList.payType==1?'现金':'转账'}}</font>
</p> </p>
...@@ -2966,7 +3057,7 @@ ...@@ -2966,7 +3057,7 @@
</h3> </h3>
<p> <p>
旅游者<font>{{dataList.insuranceOpinion==1?'同意':'不同意'}}</font>（同意或者不同意，打勾无效）委托出境社办理人身意外伤害保险，保险公司名称 旅游者<font>{{dataList.insuranceOpinion==1?'同意':'不同意'}}</font>（同意或者不同意，打勾无效）委托出境社办理人身意外伤害保险，保险公司名称
<font></font>（投保的相关信息以实际保单为准）；保险金额：<font>{{dataList.insuranceAmount}}</font>元人民币。 <font></font>（投保的相关信息以实际保单为准）；保险金额：<font>{{dataList.insuranceAmount}}</font>{{getCurrencyStr()}}人民币。
</p> </p>
<p>旅游者<font>{{dataList.clientName}}</font>（姓名）已阅读知悉保险条款，个人旅游人身意外伤害保险赔付标准按相关保险条款规定执行。</p> <p>旅游者<font>{{dataList.clientName}}</font>（姓名）已阅读知悉保险条款，个人旅游人身意外伤害保险赔付标准按相关保险条款规定执行。</p>
<h3> <h3>
...@@ -3720,7 +3811,7 @@ ...@@ -3720,7 +3811,7 @@
Tourists_Sign: '', Tourists_Sign: '',
CreateTimeStr: "", CreateTimeStr: "",
IsTravelAgencySignature: 0, //判断是否盖章 IsTravelAgencySignature: 0, //判断是否盖章
SignType:0,// SignType: 0, //
}, },
}; };
}, },
...@@ -3731,6 +3822,13 @@ ...@@ -3731,6 +3822,13 @@
} }
}, },
methods: { methods: {
getCurrencyStr() {
var str = "元";
if (this.CtObj.SignType == 1) {
str = "円"
}
return str;
},
getCount() { getCount() {
var serviceCount = 0; var serviceCount = 0;
if (this.CtObj.ContractTicketList != null && this.CtObj.ContractTicketList.length > 0) { if (this.CtObj.ContractTicketList != null && this.CtObj.ContractTicketList.length > 0) {
...@@ -3867,8 +3965,8 @@ ...@@ -3867,8 +3965,8 @@
this.CtObj.ZhangImg = tempObj.ZhangImg; this.CtObj.ZhangImg = tempObj.ZhangImg;
this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name; this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address; this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.TravelAgency_LicenseNum=tempObj.TravelAgency_LicenseNum; this.CtObj.TravelAgency_LicenseNum = tempObj.TravelAgency_LicenseNum;
this.CtObj.SignType=tempObj.SignType; this.CtObj.SignType = tempObj.SignType;
this.CtObj.TicketAndHotelTotalPrice = this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice; tempObj.TicketAndHotelTotalPrice;
if ( if (
...@@ -4132,8 +4230,11 @@ ...@@ -4132,8 +4230,11 @@
//小写金额转大写 //小写金额转大写
number_chinese(str) { number_chinese(str) {
var num = parseFloat(str); var num = parseFloat(str);
var strOutput = "", var strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分';
strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分'; var strOutput="";
if (this.CtObj.SignType == 1) {
strUnit = '仟佰拾亿仟佰拾万仟佰拾円角分';
}
num += "00"; num += "00";
var intPos = num.indexOf('.'); var intPos = num.indexOf('.');
if (intPos >= 0) { if (intPos >= 0) {
...@@ -4143,8 +4244,13 @@ ...@@ -4143,8 +4244,13 @@
for (var i = 0; i < num.length; i++) { for (var i = 0; i < num.length; i++) {
strOutput += '零壹贰叁肆伍陆柒捌玖'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1); strOutput += '零壹贰叁肆伍陆柒捌玖'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
} }
if (this.CtObj.SignType == 1) {
return strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(
/零([亿|万])/g, '$1').replace(/零+元/, '円').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零円")
} else {
return strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace( return strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(
/零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元") /零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元")
}
}, },
getCanvas() { getCanvas() {
let el = document.getElementById("canvas"); let el = document.getElementById("canvas");
......
src/components/TravelContractView.vue
View file @ 82c4ba2c
...@@ -593,9 +593,9 @@ ...@@ -593,9 +593,9 @@
&nbsp;/&nbsp; &nbsp;/&nbsp;
<font>{{item.ArrivePlace}}</font>&nbsp;&nbsp;航班号<font>{{item.FlightNum}}</font> <font>{{item.ArrivePlace}}</font>&nbsp;&nbsp;航班号<font>{{item.FlightNum}}</font>
</p> </p>
<p>机票金额<font>{{item.TicketPrice}}</font>元/张</p> <p>机票金额<font>{{item.TicketPrice}}</font>{{getCurrencyStr()}}/张</p>
<p>机场建设费<font>{{item.AirportPirce}}</font>元/张</p> <p>机场建设费<font>{{item.AirportPirce}}</font>{{getCurrencyStr()}}/张</p>
<p>定金<font>{{item.DepositPrice}}</font>元/张</p> <p>定金<font>{{item.DepositPrice}}</font>{{getCurrencyStr()}}/张</p>
</template> </template>
</td> </td>
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
<p>共计：<font>{{CtObj.TicketTotalNum}}</font>张机票</p> <p>共计：<font>{{CtObj.TicketTotalNum}}</font>张机票</p>
<p>合同签订后 <font>{{CtObj.TicketOutDayNum}}</font>日内出票，本机票出票后不得退票、改签。由于旅游者原因退、改签机票款全部损失，由旅游者自行承担。 <p>合同签订后 <font>{{CtObj.TicketOutDayNum}}</font>日内出票，本机票出票后不得退票、改签。由于旅游者原因退、改签机票款全部损失，由旅游者自行承担。
</p> </p>
<p>机票预定费用总额： <font>{{CtObj.TicketTotalDepositPrice}}</font>元</p> <p>机票预定费用总额： <font>{{CtObj.TicketTotalDepositPrice}}</font>{{getCurrencyStr()}}</p>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -617,8 +617,8 @@ ...@@ -617,8 +617,8 @@
</p> </p>
<p>人数：成人人数：<font>{{item.AdultNum}}</font>人 儿童人数：<font>{{item.ChildrenNum}}</font>人（不占床位、不加床位） <p>人数：成人人数：<font>{{item.AdultNum}}</font>人 儿童人数：<font>{{item.ChildrenNum}}</font>人（不占床位、不加床位）
</p> </p>
<p>房费：<font>{{item.RoomPrice}}</font>元/间/晚</p> <p>房费：<font>{{item.RoomPrice}}</font>{{getCurrencyStr()}}/间/晚</p>
<p>定金：<font>{{item.DepositPrice}}</font>元/间/晚</p> <p>定金：<font>{{item.DepositPrice}}</font>{{getCurrencyStr()}}/间/晚</p>
<p>入住日期：<font>{{item.CheckInDate}}</font>/离店日期：<font>{{item.OutDate}}</font> <p>入住日期：<font>{{item.CheckInDate}}</font>/离店日期：<font>{{item.OutDate}}</font>
</p> </p>
</template> </template>
...@@ -630,7 +630,7 @@ ...@@ -630,7 +630,7 @@
<p>下订单后通知旅游者的方式：<font>{{CtObj.HotelNotice}}</font> <p>下订单后通知旅游者的方式：<font>{{CtObj.HotelNotice}}</font>
</p> </p>
<p>该酒店一经下订单不退、不改，如因客人原因退、改房，房费全损，由旅游者承担。</p> <p>该酒店一经下订单不退、不改，如因客人原因退、改房，房费全损，由旅游者承担。</p>
<p>费用共计：<font>{{CtObj.HotelTotalPrice}}</font>元</p> <p>费用共计：<font>{{CtObj.HotelTotalPrice}}</font>{{getCurrencyStr()}}</p>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -646,7 +646,7 @@ ...@@ -646,7 +646,7 @@
</template> </template>
</td> </td>
<td> <td>
<p>费用合计：<font>{{CtObj.PickUpTotalPrice}}</font>元</p> <p>费用合计：<font>{{CtObj.PickUpTotalPrice}}</font>{{getCurrencyStr()}}</p>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -657,12 +657,12 @@ ...@@ -657,12 +657,12 @@
<p> <p>
<font>{{item.Country}}</font>国家的个人签证&nbsp;&nbsp;&nbsp;希望停留时间<font>{{item.StopTime}}</font> <font>{{item.Country}}</font>国家的个人签证&nbsp;&nbsp;&nbsp;希望停留时间<font>{{item.StopTime}}</font>
</p> </p>
<p>代办签证费用：<font>{{item.VisaPrice}}</font>元/人&nbsp;&nbsp;&nbsp;交付保证金：<font> <p>代办签证费用：<font>{{item.VisaPrice}}</font>{{getCurrencyStr()}}/人&nbsp;&nbsp;&nbsp;交付保证金：<font>
{{item.DepositPrice}}</font>元/人</p> {{item.DepositPrice}}</font>{{getCurrencyStr()}}/人</p>
</template> </template>
</td> </td>
<td> <td>
<p>合计金额：<font>{{CtObj.VisaTotalPrice}}</font>元</p> <p>合计金额：<font>{{CtObj.VisaTotalPrice}}</font>{{getCurrencyStr()}}</p>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -678,8 +678,8 @@ ...@@ -678,8 +678,8 @@
</p> </p>
<p>舱位<font>{{item.TicketSpace}}</font> <p>舱位<font>{{item.TicketSpace}}</font>
</p> </p>
<p>机票金额<font>{{item.TicketPrice}}</font>元/张</p> <p>机票金额<font>{{item.TicketPrice}}</font>{{getCurrencyStr()}}/张</p>
<p>机场建设费<font>{{item.AirportPirce}}</font>元/张</p> <p>机场建设费<font>{{item.AirportPirce}}</font>{{getCurrencyStr()}}/张</p>
</template> </template>
<template <template
v-if="CtObj.ContractTicketAndHotel && CtObj.ContractTicketAndHotel.ContractHotels && CtObj.ContractTicketAndHotel.ContractHotels.length>0" v-if="CtObj.ContractTicketAndHotel && CtObj.ContractTicketAndHotel.ContractHotels && CtObj.ContractTicketAndHotel.ContractHotels.length>0"
...@@ -691,12 +691,13 @@ ...@@ -691,12 +691,13 @@
</p> </p>
<p>入住日期：<font>{{item.CheckInDate}}</font>/离店日期：<font>{{item.OutDate}}</font> <p>入住日期：<font>{{item.CheckInDate}}</font>/离店日期：<font>{{item.OutDate}}</font>
</p> </p>
<p>费用：成人费用：<font>{{item.AdultPrice}}</font>元/人&nbsp;儿童费用：<font>{{item.ChildrenPrice}}</font> <p>费用：成人费用：<font>{{item.AdultPrice}}</font>{{getCurrencyStr()}}/人&nbsp;儿童费用：<font>
元/人（不占床位、不加床位）</p> {{item.ChildrenPrice}}</font>
{{getCurrencyStr()}}/人（不占床位、不加床位）</p>
</template> </template>
</td> </td>
<td> <td>
<p>费用合计：<font>{{CtObj.TicketAndHotelTotalPrice}}</font>元</p> <p>费用合计：<font>{{CtObj.TicketAndHotelTotalPrice}}</font>{{getCurrencyStr()}}</p>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -769,7 +770,7 @@ ...@@ -769,7 +770,7 @@
</div> </div>
</td> </td>
<td> <td>
<p>费用合计：<font>{{CtObj.OtherConventionPrice}}</font>元</p> <p>费用合计：<font>{{CtObj.OtherConventionPrice}}</font>{{getCurrencyStr()}}</p>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -833,7 +834,20 @@ ...@@ -833,7 +834,20 @@
style="margin-bottom: -4px;width:17px;heigth:17px" /> style="margin-bottom: -4px;width:17px;heigth:17px" />
</template> </template>
等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p> 等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
<p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span>元&nbsp;&nbsp;（大写）人民币<span> <p>费用总额（小写）
<template v-if="CtObj.SignType==0">
人民币
</template>
<template v-else>
日元
</template>
<span>{{CtObj.C_TotalPrice}}</span>{{getCurrencyStr()}}&nbsp;&nbsp;（大写） <template
v-if="CtObj.SignType==0">
人民币
</template>
<template v-else>
日元
</template><span>
<font>{{number_chinese(CtObj.C_TotalPrice)}}</font> <font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
</span></p> </span></p>
<br> <br>
...@@ -1233,8 +1247,10 @@ ...@@ -1233,8 +1247,10 @@
<p class="toTopDistance">第二十一条 旅游费用及支付（以人民币为计算单位）</p> <p class="toTopDistance">第二十一条 旅游费用及支付（以人民币为计算单位）</p>
</h3> </h3>
<p> <p>
成人<font>{{CtObj.C_AdultPrice}}</font>元/人，儿童（不满14岁）<font>{{CtObj.C_ChildrenPrice}}</font>元/人；其中，导游服务费 成人<font>{{CtObj.C_AdultPrice}}</font>{{getCurrencyStr()}}/人，儿童（不满14岁）<font>{{CtObj.C_ChildrenPrice}}
<font>{{CtObj.C_GuideServicePrice}}</font>元/人；旅游费用合计：<font>{{CtObj.C_TotalPrice}}</font>元。 </font>{{getCurrencyStr()}}/人；其中，导游服务费
<font>{{CtObj.C_GuideServicePrice}}</font>{{getCurrencyStr()}}/人；旅游费用合计：<font>{{CtObj.C_TotalPrice}}
</font>{{getCurrencyStr()}}。
</p> </p>
<p>旅游费用支付方式： <p>旅游费用支付方式：
<font v-if="CtObj.C_PayType==1">现金</font> <font v-if="CtObj.C_PayType==1">现金</font>
...@@ -1588,7 +1604,7 @@ ...@@ -1588,7 +1604,7 @@
<td>具体时间</td> <td>具体时间</td>
<td>地点</td> <td>地点</td>
<td>项目名称和内容</td> <td>项目名称和内容</td>
<td>费用（元）</td> <td>费用（{{getCurrencyStr()}}）</td>
<td>项目时长（分钟）</td> <td>项目时长（分钟）</td>
<td>其他说明</td> <td>其他说明</td>
<td>旅游者签名同意</td> <td>旅游者签名同意</td>
...@@ -1729,25 +1745,10 @@ ...@@ -1729,25 +1745,10 @@
<p>旅游费用： <p>旅游费用：
成人<font>{{CtObj.C_AdultNum}}</font>人 成人<font>{{CtObj.C_AdultNum}}</font>人
×<font>{{CtObj.C_AdultPrice}}</font> <template v-if="CtObj.SignType==0"> ×<font>{{CtObj.C_AdultPrice}}</font> {{getCurrencyStr()}}/人
元
</template>
<template v-else>
円
</template>/人
+儿童<font>{{CtObj.C_ChildrenNum}}</font>人 +儿童<font>{{CtObj.C_ChildrenNum}}</font>人
×<font>{{CtObj.C_ChildrenPrice}}</font> <template v-if="CtObj.SignType==0"> ×<font>{{CtObj.C_ChildrenPrice}}</font> {{getCurrencyStr()}}/人
元 = <font>{{CtObj.C_TotalPrice}}</font> {{getCurrencyStr()}}。
</template>
<template v-else>
円
</template>/人
= <font>{{CtObj.C_TotalPrice}}</font> <template v-if="CtObj.SignType==0">
元
</template>
<template v-else>
円
</template>。
</p> </p>
<p> <p>
含：<font>{{CtObj.C_IncludeRemark}}</font> 含：<font>{{CtObj.C_IncludeRemark}}</font>
...@@ -2199,6 +2200,13 @@ ...@@ -2199,6 +2200,13 @@
}, },
methods: { methods: {
getCurrencyStr() {
var str = "元";
if (this.CtObj.SignType == 1) {
str = "円"
}
return str;
},
getCount() { getCount() {
var serviceCount = 0; var serviceCount = 0;
if (this.CtObj.ContractTicketList != null && this.CtObj.ContractTicketList.length > 0) { if (this.CtObj.ContractTicketList != null && this.CtObj.ContractTicketList.length > 0) {
...@@ -2224,7 +2232,6 @@ ...@@ -2224,7 +2232,6 @@
ChangeTab(num) { ChangeTab(num) {
this.ActiveTab = num; this.ActiveTab = num;
}, },
//获取数据 //获取数据
getList() { getList() {
this.pdfLoading = true; this.pdfLoading = true;
...@@ -2604,8 +2611,11 @@ ...@@ -2604,8 +2611,11 @@
//小写金额转大写 //小写金额转大写
number_chinese(str) { number_chinese(str) {
var num = parseFloat(str); var num = parseFloat(str);
var strOutput = "", var strOutput = "";
strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分'; var strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分';
if (this.CtObj.SignType == 1) {
strUnit = '仟佰拾亿仟佰拾万仟佰拾円角分';
}
num += "00"; num += "00";
var intPos = num.indexOf('.'); var intPos = num.indexOf('.');
if (intPos >= 0) { if (intPos >= 0) {
...@@ -2615,8 +2625,13 @@ ...@@ -2615,8 +2625,13 @@
for (var i = 0; i < num.length; i++) { for (var i = 0; i < num.length; i++) {
strOutput += '零壹贰叁肆伍陆柒捌玖'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1); strOutput += '零壹贰叁肆伍陆柒捌玖'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
} }
if (this.CtObj.SignType == 0) {
return strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace( return strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(
/零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元") /零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元")
} else {
return strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(
/零([亿|万])/g, '$1').replace(/零+元/, '円').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零円")
}
}, },
}, },
mounted() { mounted() {
......
src/components/administrative/model/unTravelMessage.vue 0 → 100644
View file @ 82c4ba2c
<template>
<el-dialog custom-class='PingFangSC' title="未收齐团款/未结团提醒" :visible.sync="outerVisibleNot" center
:before-close="closeChangeMachie" width="1100px">
<div v-if="UnTravelDate && UnTravelDate.rlist&&UnTravelDate.rlist.length>0" style="margin-top: 10px;">
<p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;">未完款订单列表</p>
<el-table :data="UnTravelDate.rlist" tooltip-effect="dark" style="width: 100%">
<!-- <el-table-column label="机票编码" width="">
<template slot-scope="scope">
{{scope.row.ID}}
</template>
</el-table-column> -->
<el-table-column prop="OrderId" label="订单号"></el-table-column>
<el-table-column label="团号" width="">
<template slot-scope="scope">
{{scope.row.TCID}}
<p>{{scope.row.TCNUM}}</p>
</template>
</el-table-column>
<el-table-column prop="EnterName" label="销售"></el-table-column>
<el-table-column prop="StartDate" label="出团日期"></el-table-column>
<el-table-column prop="PreferPrice" label="应收"></el-table-column>
<el-table-column prop="DueinMoney" label="待收"></el-table-column>
<el-table-column prop="CreateDate" label="创建日期"></el-table-column>
</el-table>
</div>
<div v-if="UnTravelDate && UnTravelDate.olist&&UnTravelDate.olist.length>0">
<p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;">未结团列表</p>
<el-table :data="UnTravelDate.olist" tooltip-effect="dark" style="width: 100%">
<!-- <el-table-column label="团ID/团号" width="">
<template slot-scope="scope">
{{scope.row.TCID}}
<p>{{scope.row.TCNUM}}</p>
</template>
</el-table-column> -->
<!-- <el-table-column prop="StartDate" label="出团日期">
<template slot-scope="scope">
{{getBeforeDate(0, new Date(scope.row.StartDate).Format("yyyy-MM-dd"))}}
</template>
</el-table-column> -->
<el-table-column prop="QStartDate" label="月份"></el-table-column>
<el-table-column prop="TeamTypeName" label="团队类型"></el-table-column>
<el-table-column prop="OPName" label="操作OP"></el-table-column>
<el-table-column prop="TCIDStr" label="团队信息"></el-table-column>
</el-table>
</div>
<div v-if="UnTravelDate && UnTravelDate.olist&&UnTravelDate.olist.length==0
&&UnTravelDate.rlist&&UnTravelDate.rlist.length==0" style="padding: 40px 0;text-align: center;">
暂无数据
</div>
</el-dialog>
</template>
<script>
export default {
props:["UnTravelDate"],
data() {
return {
outerVisibleNot: true
}
},
watch: {
},
methods: {
closeChangeMachie(done) {
this.$emit('unTravelVisible')
},
}
}
</script>
src/components/confirmationOrderDownLoadNew.vue
View file @ 82c4ba2c
...@@ -38,8 +38,7 @@ ...@@ -38,8 +38,7 @@
</style> </style>
<template> <template>
<div class="travelControlTrip" <div class="travelControlTrip" :style="{'width':dataAll&&dataAll.featurePageType==2?'1123px':'1754px'}">
:style="{'width':dataAll&&dataAll.featurePageType==2?'1123px':'1754px'}">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div> <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;"> <el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
<el-col :span="14" class="row-aic"> <el-col :span="14" class="row-aic">
...@@ -74,20 +73,23 @@ ...@@ -74,20 +73,23 @@
</el-col> </el-col>
</el-row> </el-row>
<div id="pdfNode" class="LeaveGroupDownload-form LeaveGroupDownload-formHV"> <div id="pdfNode" class="LeaveGroupDownload-form LeaveGroupDownload-formHV">
<div id="pdfDom" :class="[dataAll.featurePageType==1?'pdfDomHV':'']"> <div id="pdfDom" :class="[dataAll&&dataAll.featurePageType==1?'pdfDomHV':'']">
<!-- 首页 --> <!-- 首页 -->
<LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc" <LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
:orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId"
:priceList="priceList"> :priceList="priceList">
</LeaveGroupDownload> </LeaveGroupDownload>
<!-- 行程特色 --> <!-- 行程特色 -->
<ItineraryFeatures :dataAll="dataAll" :feature="feature" :vshowC="vshowC" :showType="showType"></ItineraryFeatures> <ItineraryFeatures :dataAll="dataAll" :feature="feature" :vshowC="vshowC" :showType="showType">
</ItineraryFeatures>
<!-- 行程天数 --> <!-- 行程天数 -->
<travelDays v-if="dataAll&&dataAll.featurePageType==2" :dataAll="dataAll" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :tripList="tripList" <travelDays v-if="dataAll&&dataAll.featurePageType==2" :dataAll="dataAll" :orderMsg="orderMsg"
:vshowD="vshowD" :vshowK="vshowK" :feature="feature"></travelDays> :orderTripdiff="orderTripdiff" :tripList="tripList" :vshowD="vshowD" :vshowK="vshowK" :feature="feature">
<travelDaysHV v-if="dataAll&&dataAll.featurePageType==1" :dataAll="dataAll" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :tripList="tripList" </travelDays>
:vshowD="vshowD" :vshowK="vshowK" :feature="feature"></travelDaysHV> <travelDaysHV v-if="dataAll&&dataAll.featurePageType==1" :dataAll="dataAll" :orderMsg="orderMsg"
:orderTripdiff="orderTripdiff" :tripList="tripList" :vshowD="vshowD" :vshowK="vshowK" :feature="feature">
</travelDaysHV>
<!-- 团队费用说明 --> <!-- 团队费用说明 -->
<TourFareDescription :vshowE="vshowE" :vshowF="vshowF" :dataList="dataList" :feature="feature"> <TourFareDescription :vshowE="vshowE" :vshowF="vshowF" :dataList="dataList" :feature="feature">
</TourFareDescription> </TourFareDescription>
......
src/components/index.vue
View file @ 82c4ba2c
...@@ -1211,7 +1211,9 @@ ...@@ -1211,7 +1211,9 @@
<!-- 机票未绑团提示 --> <!-- 机票未绑团提示 -->
<unbundlingMessage v-if="unbundlingVisible" :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"> <unbundlingMessage v-if="unbundlingVisible" :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false">
</unbundlingMessage> </unbundlingMessage>
<!-- 机票未绑团提示 -->
<unTravelMessage v-if="unTravelVisible" :UnTravelDate="UnTravelDate" @unTravelVisible="unTravelVisible=false">
</unTravelMessage>
<!-- 改价提醒/审核改价提醒 --> <!-- 改价提醒/审核改价提醒 -->
<ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible" :type="1" :msg="ExamineThePriceMsg" <ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible" :type="1" :msg="ExamineThePriceMsg"
:ChangeThePriceObj="ChangeThePriceObj" :ChangeThePriceObj="ChangeThePriceObj"
...@@ -1242,6 +1244,7 @@ ...@@ -1242,6 +1244,7 @@
import commissionDetail from "./commonPage/commissionDetail.vue"; import commissionDetail from "./commonPage/commissionDetail.vue";
import Voting from "../components/administrative/model/Voting"; import Voting from "../components/administrative/model/Voting";
import unbundlingMessage from "../components/administrative/model/unbundlingMessage"; import unbundlingMessage from "../components/administrative/model/unbundlingMessage";
import unTravelMessage from "../components/administrative/model/unTravelMessage";
import ChangeThePriceMessage from "../components/administrative/model/ChangeThePriceMessage"; import ChangeThePriceMessage from "../components/administrative/model/ChangeThePriceMessage";
import pptIframe from './commonPage/pptIframe/index'; import pptIframe from './commonPage/pptIframe/index';
...@@ -1258,6 +1261,7 @@ ...@@ -1258,6 +1261,7 @@
unbundlingMessage, unbundlingMessage,
ChangeThePriceMessage, ChangeThePriceMessage,
pptIframe, pptIframe,
unTravelMessage,
}, },
data() { data() {
return { return {
...@@ -1285,7 +1289,9 @@ ...@@ -1285,7 +1289,9 @@
ChangeThePriceData: [], ChangeThePriceData: [],
}, },
UnboundDate: {}, UnboundDate: {},
UnTravelDate: {},
unbundlingVisible: false, //未绑团提醒 unbundlingVisible: false, //未绑团提醒
unTravelVisible: false,//销售未完款提醒
b2bDomain: "", b2bDomain: "",
useRed: false, useRed: false,
//提成账单弹窗 //提成账单弹窗
...@@ -1895,6 +1901,7 @@ ...@@ -1895,6 +1901,7 @@
if (!localStorage.getItem("UnboundDateTime") || if (!localStorage.getItem("UnboundDateTime") ||
(localStorage.getItem("UnboundDateTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))) { (localStorage.getItem("UnboundDateTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))) {
this.GetTravelAirNotBind() this.GetTravelAirNotBind()
this.GetSaleOrOPRemind();
} else { } else {
if (localStorage.getItem("UnboundDate")) { if (localStorage.getItem("UnboundDate")) {
if (this.userInfo.DepartName.indexOf("操作部") != -1 || this.userInfo.DepartName.indexOf("总部财务部") != -1 || if (this.userInfo.DepartName.indexOf("操作部") != -1 || this.userInfo.DepartName.indexOf("总部财务部") != -1 ||
...@@ -2083,15 +2090,32 @@ ...@@ -2083,15 +2090,32 @@
if ((res.data.data.TravelList && res.data.data.TravelList.length > 0) || if ((res.data.data.TravelList && res.data.data.TravelList.length > 0) ||
(res.data.data.AirList && res.data.data.AirList.length > 0)) { (res.data.data.AirList && res.data.data.AirList.length > 0)) {
localStorage.setItem("UnboundDate", JSON.stringify(res.data.data)); localStorage.setItem("UnboundDate", JSON.stringify(res.data.data));
localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
this.UnboundDate = res.data.data this.UnboundDate = res.data.data
this.unbundlingVisible = true this.unbundlingVisible = true
} }
localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
} }
} }
); );
} }
}, },
// 获取未完款的数据
GetSaleOrOPRemind() {
this.UnTravelDate = {}
this.apipost(
"opcommission_GetSaleOrOPRemind", {},
res => {
if (res.data.resultCode == 1) {
if ((res.data.data.rlist && res.data.data.rlist.length > 0) ||
(res.data.data.olist && res.data.data.olist.length > 0)) {
this.UnTravelDate = res.data.data
this.unTravelVisible = true
}
localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
}
}
);
},
testApi() { testApi() {
// var postMsg = {}; // var postMsg = {};
// var cmd = ""; // var cmd = "";
......
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