Skip to content

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

新增单机票价格

parent a4a0ad13
Show whitespace changes
Inline Side-by-side
Showing with 223 additions and 137 deletions
src/assets/common/lang/en.js
View file @ e1871811
...@@ -2171,6 +2171,7 @@ export const salesModule = { ...@@ -2171,6 +2171,7 @@ export const salesModule = {
ChildBed: 'Baby in bed', ChildBed: 'Baby in bed',
ChildNoBed: 'Children dont occupy the bed', ChildNoBed: 'Children dont occupy the bed',
SingleJ: 'single ground connection', SingleJ: 'single ground connection',
SingleAirticket:'Single Ticket',
OtherPrice: 'other price', OtherPrice: 'other price',
VisaBack: 'Visa Fee (return fee)', VisaBack: 'Visa Fee (return fee)',
PeoPle: 'People', PeoPle: 'People',
......
src/assets/common/lang/jp.js
View file @ e1871811
...@@ -2082,6 +2082,7 @@ export const salesModule={ ...@@ -2082,6 +2082,7 @@ export const salesModule={
ChildBed:'子どもがベッドをとる', ChildBed:'子どもがベッドをとる',
ChildNoBed:'子供はベッドを取らない', ChildNoBed:'子供はベッドを取らない',
SingleJ:'単接地', SingleJ:'単接地',
SingleAirticket:'シングル航空券',
OtherPrice:'その他価格', OtherPrice:'その他価格',
VisaBack:'査証料(さいりょうりょう)', VisaBack:'査証料(さいりょうりょう)',
PeoPle:'人', PeoPle:'人',
......
src/assets/common/lang/zh-tw.js
View file @ e1871811
...@@ -2156,6 +2156,7 @@ export const salesModule={ ...@@ -2156,6 +2156,7 @@ export const salesModule={
ChildBed:'小孩占床', ChildBed:'小孩占床',
ChildNoBed:'小孩不占床', ChildNoBed:'小孩不占床',
SingleJ:'單地接', SingleJ:'單地接',
SingleAirticket:'單機票',
OtherPrice:'其他價格', OtherPrice:'其他價格',
VisaBack:'簽證費（退簽證費）', VisaBack:'簽證費（退簽證費）',
PeoPle:'人', PeoPle:'人',
......
src/assets/common/lang/zh.js
View file @ e1871811
...@@ -2171,6 +2171,7 @@ export const salesModule={ ...@@ -2171,6 +2171,7 @@ export const salesModule={
ChildBed:'小孩占床', ChildBed:'小孩占床',
ChildNoBed:'小孩不占床', ChildNoBed:'小孩不占床',
SingleJ:'单地接', SingleJ:'单地接',
SingleAirticket:'单机票',
OtherPrice:'其他价格', OtherPrice:'其他价格',
VisaBack:'签证费（退签证费）', VisaBack:'签证费（退签证费）',
PeoPle:'人', PeoPle:'人',
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ e1871811
...@@ -910,7 +910,8 @@ ...@@ -910,7 +910,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('hotel.suplier_contact')" prop="ContactName" v-show="addMsg.CustomerType == 3 || addMsg.CustomerType == 4"> <el-form-item :label="$t('hotel.suplier_contact')" prop="ContactName"
v-show="addMsg.CustomerType == 3 || addMsg.CustomerType == 4">
<el-input v-model="addMsg.ContactName"></el-input> <el-input v-model="addMsg.ContactName"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('scen.sc_tel')" prop="ContactMobile" <el-form-item :label="$t('scen.sc_tel')" prop="ContactMobile"
...@@ -1059,7 +1060,8 @@ ...@@ -1059,7 +1060,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.SSPT')" prop="BrandId" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4"> <el-form-item :label="$t('salesModule.SSPT')" prop="BrandId"
v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId" <el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId"
:key="item.dictId+6000"> :key="item.dictId+6000">
...@@ -1137,7 +1139,8 @@ ...@@ -1137,7 +1139,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('hotel.suplier_contact')" prop="ContactName" v-show="addMsg.CustomerType == 3 || addMsg.CustomerType == 4"> <el-form-item :label="$t('hotel.suplier_contact')" prop="ContactName"
v-show="addMsg.CustomerType == 3 || addMsg.CustomerType == 4">
<el-input v-model="addMsg.ContactName"></el-input> <el-input v-model="addMsg.ContactName"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('scen.sc_tel')" prop="ContactMobile" <el-form-item :label="$t('scen.sc_tel')" prop="ContactMobile"
...@@ -1159,13 +1162,14 @@ ...@@ -1159,13 +1162,14 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId"> <el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId">
<el-select filterable v-model="addMsg.DepartureCityId" filterable :placeholder="$t('pub.pleaseSel')" <el-select filterable v-model="addMsg.DepartureCityId" :placeholder="$t('pub.pleaseSel')"
@change="addMsg.IsIntermodal = 2"> @change="addMsg.IsIntermodal = 2">
<el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID+20000"> <el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID+20000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('salesModule.IsLianYn')" prop="IsIntermodal" v-show="addMsg.DepartureCityId != SetOutCityId"> <el-form-item :label="$t('salesModule.IsLianYn')" prop="IsIntermodal"
v-show="addMsg.DepartureCityId != SetOutCityId">
<el-switch v-model="addMsg.IsIntermodal" active-value="1" inactive-value="2" <el-switch v-model="addMsg.IsIntermodal" active-value="1" inactive-value="2"
@change="getUnionTravelPrice(addObj, 1)"></el-switch> @change="getUnionTravelPrice(addObj, 1)"></el-switch>
</el-form-item> </el-form-item>
...@@ -1179,13 +1183,14 @@ ...@@ -1179,13 +1183,14 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId"> <el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId">
<el-select filterable v-model="addMsg.ReturnArriveCityId" filterable :placeholder="$t('pub.pleaseSel')" <el-select filterable v-model="addMsg.ReturnArriveCityId" :placeholder="$t('pub.pleaseSel')"
@change="addMsg.IsReturnIntermodal = 2"> @change="addMsg.IsReturnIntermodal = 2">
<el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID+30000"> <el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID+30000">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('salesModule.IsLianYn')" prop="IsReturnIntermodal" v-show="addMsg.ReturnArriveCityId != reOutCityId"> <el-form-item :label="$t('salesModule.IsLianYn')" prop="IsReturnIntermodal"
v-show="addMsg.ReturnArriveCityId != reOutCityId">
<el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2" <el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2"
@change="getUnionTravelPrice(addObj, 2)"></el-switch> @change="getUnionTravelPrice(addObj, 2)"></el-switch>
</el-form-item> </el-form-item>
...@@ -1237,7 +1242,7 @@ ...@@ -1237,7 +1242,7 @@
<p v-if="LessMoney == 0" style="line-height: 18px; color: #e95252"> <p v-if="LessMoney == 0" style="line-height: 18px; color: #e95252">
{{$t('salesModule.Notice1')}} {{$t('salesModule.Notice1')}}
</p> </p>
<p v-else="LessMoney > 0" style="line-height: 18px; color: #e95252"> <p v-else-if="LessMoney > 0" style="line-height: 18px; color: #e95252">
{{$t('salesModule.Notice2')}}{{ LessMoney }}{{$t('salesModule.Notice3')}} {{$t('salesModule.Notice2')}}{{ LessMoney }}{{$t('salesModule.Notice3')}}
</p> </p>
</el-form-item> </el-form-item>
...@@ -1425,7 +1430,8 @@ ...@@ -1425,7 +1430,8 @@
<el-input v-model="addMsg_form.BabyPrice" :disabled="!IsUpdateOrderMoney"></el-input> <el-input v-model="addMsg_form.BabyPrice" :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="IsUpdateOrderMoney"> <el-form-item v-if="IsUpdateOrderMoney">
<el-button type="primary" style="padding: 6px 15px" @click="submitYSZEForm">{{$t('pub.sureBtn')}}</el-button> <el-button type="primary" style="padding: 6px 15px" @click="submitYSZEForm">{{$t('pub.sureBtn')}}
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1538,7 +1544,8 @@ ...@@ -1538,7 +1544,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.SSPT')" prop="BrandId" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4"> <el-form-item :label="$t('salesModule.SSPT')" prop="BrandId"
v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.BrandId" :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId" <el-option v-for="item in ssptList" :label="item.brandName" :value="item.dictId"
:key="item.dictId+70000"> :key="item.dictId+70000">
...@@ -1789,7 +1796,8 @@ ...@@ -1789,7 +1796,8 @@
<td rowspan="3" style="position: relative"> <td rowspan="3" style="position: relative">
<span class="TC_neibu" <span class="TC_neibu"
style="float: inherit;margin-left: 5px;margin-right: 5px;position: absolute;top: 10px;left:3px" style="float: inherit;margin-left: 5px;margin-right: 5px;position: absolute;top: 10px;left:3px"
v-if="item.standardCurrencyName" :class="{'TCneibu':item.standardCurrencyName=='人民币','TCb2b':item.standardCurrencyName=='日元', v-if="item.standardCurrencyName"
:class="{'TCneibu':item.standardCurrencyName=='人民币','TCb2b':item.standardCurrencyName=='日元',
'TCb2c':item.standardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='', 'TCb2c':item.standardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='',
'otherPlat':item.standardCurrencyName=='',}">{{item.standardCurrencyName}}{{$t('objFill.jiesuan')}}</span> 'otherPlat':item.standardCurrencyName=='',}">{{item.standardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
<p v-if="item.isUnionOrder == 1" class="GO_union">{{$t('Operation.Op_lian')}}</p> <p v-if="item.isUnionOrder == 1" class="GO_union">{{$t('Operation.Op_lian')}}</p>
...@@ -1862,8 +1870,8 @@ ...@@ -1862,8 +1870,8 @@
</p> </p>
</div> </div>
</div> </div>
<div v-if="op.groupName === '单团' &&item.quotationUrl&&item.quotationUrl!=''" style="color: red; cursor: pointer;" <div v-if="op.groupName === '单团' &&item.quotationUrl&&item.quotationUrl!=''"
@click="seeBJD(item.quotationUrl)"> style="color: red; cursor: pointer;" @click="seeBJD(item.quotationUrl)">
{{$t('objFill.ckbjd')}} {{$t('objFill.ckbjd')}}
</div> </div>
<div v-if="item.autoCouponId>-1">{{$t('active.ad_yhq')}}： <div v-if="item.autoCouponId>-1">{{$t('active.ad_yhq')}}：
...@@ -2040,8 +2048,8 @@ ...@@ -2040,8 +2048,8 @@
<th>{{$t('advmanager.v_type')}}</th> <th>{{$t('advmanager.v_type')}}</th>
<th>{{$t('system.label_info')}}</th> <th>{{$t('system.label_info')}}</th>
<th> <th>
{{$t('salesModule.Time')}}（<span @click="goUrlHappy(item)" style="cursor: pointer" colspan="4" {{$t('salesModule.Time')}}（<span @click="goUrlHappy(item)" style="cursor: pointer"
align="center">{{$t('salesModule.LookMore')}}</span>） colspan="4" align="center">{{$t('salesModule.LookMore')}}</span>）
</th> </th>
</tr> </tr>
<tr v-for="(item2, index2) in redBagList" :key="index2+130000"> <tr v-for="(item2, index2) in redBagList" :key="index2+130000">
...@@ -2121,7 +2129,8 @@ ...@@ -2121,7 +2129,8 @@
(item.confirmFileList.length == 0 && item.isOwn == 1) || (item.confirmFileList.length == 0 && item.isOwn == 1) ||
IsSupperOrderEdit IsSupperOrderEdit
" :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action=""> " :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action="">
<el-button size="small" type="danger" @click="getItem(item)">{{$t('objFill.shangchuan')}}</el-button> <el-button size="small" type="danger" @click="getItem(item)">{{$t('objFill.shangchuan')}}
</el-button>
</el-upload> </el-upload>
</template> </template>
</td> </td>
...@@ -2347,7 +2356,9 @@ ...@@ -2347,7 +2356,9 @@
"> ">
<span v-for="childItem in item.guestList" style="color: blue"> <span v-for="childItem in item.guestList" style="color: blue">
{{childItem.userName}} {{childItem.userName}}
<span :style="childItem.isBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.isBed==1?'占床':'不占床'}}） </span> <span
:style="childItem.isBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.isBed==1?'占床':'不占床'}}）
</span>
<span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span> <span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span> <span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span style="cursor:pointer;" <span style="cursor:pointer;"
...@@ -2355,8 +2366,10 @@ ...@@ -2355,8 +2366,10 @@
<span v-if="item.isShowDisclaimer==1&&( isShow===index||childItem.disclaimerId>0)" <span v-if="item.isShowDisclaimer==1&&( isShow===index||childItem.disclaimerId>0)"
style="cursor:pointer;" style="cursor:pointer;"
@click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>0?"查看参团免责承诺函":"签订参团免责承诺函"}}</span> @click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>0?"查看参团免责承诺函":"签订参团免责承诺函"}}</span>
<span v-if="childItem.isApplyPhoto == 1" style="color: red">({{$t('salesModule.Zhao')}})</span>&nbsp;&nbsp;</span> <span v-if="childItem.isApplyPhoto == 1"
<span v-if="item.photoNum > 0">（{{$t('salesModule.NoPhoto')}} {{ item.photoNum }}{{$t('salesModule.Fen')}}）</span> style="color: red">({{$t('salesModule.Zhao')}})</span>&nbsp;&nbsp;</span>
<span v-if="item.photoNum > 0">（{{$t('salesModule.NoPhoto')}}
{{ item.photoNum }}{{$t('salesModule.Fen')}}）</span>
</span> </span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length > 0"> <p v-if="item.cancelGuestList && item.cancelGuestList.length > 0">
<span class="">{{$t('salesModule.CancelOrder')}}:</span> <span class="">{{$t('salesModule.CancelOrder')}}:</span>
...@@ -2367,8 +2380,9 @@ ...@@ -2367,8 +2380,9 @@
</span> </span>
</p> </p>
<span style="display: block">{{$t('salesModule.RoomInfo')}}<span v-if="item.oneSex > 0" <span style="display: block">{{$t('salesModule.RoomInfo')}}<span v-if="item.oneSex > 0"
style="color: #e95252">（{{ item.oneSex == 1 ?$t('objFill.dannan') : $t('objFill.dannv') }}）</span><span v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（{{ item.oneSex == 1 ?$t('objFill.dannan') : $t('objFill.dannv') }}）</span><span
style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人 ）</span>： v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人
）</span>：
{{ item.orderGuestHouseStr }} {{ item.orderGuestHouseStr }}
<el-popover trigger="click" popper-class="KT_Scenic"> <el-popover trigger="click" popper-class="KT_Scenic">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
...@@ -2441,7 +2455,8 @@ ...@@ -2441,7 +2455,8 @@
</div> </div>
<div style="color: red"> <div style="color: red">
<p> <p>
{{$t('pub.pubRemark')}}：<span v-if="item.tsIdList.length > 0">{{$t('salesModule.ComplaintNum')}}: {{$t('pub.pubRemark')}}：<span
v-if="item.tsIdList.length > 0">{{$t('salesModule.ComplaintNum')}}:
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click=" <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="
goUrlTS( goUrlTS(
'ComplaintsDetail', 'ComplaintsDetail',
...@@ -2478,7 +2493,8 @@ ...@@ -2478,7 +2493,8 @@
{{uItem.guestNames}} 航班信息： {{uItem.guestNames}} 航班信息：
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span <span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【{{$t('visa.v_zanding')}}】</span> v-else>【{{$t('visa.v_zanding')}}】</span>
<a v-if="(item.orderGuestFlightList&&item.orderGuestFlightList.length>1&&item.outNotice == 1)||(uItem.ticketUnionId&&uItem.ticketUnionId>0)" @click="toTrip(item,uItem.ticketUnionId,uItem.guestIds)" <a v-if="(item.orderGuestFlightList&&item.orderGuestFlightList.length>1&&item.outNotice == 1)||(uItem.ticketUnionId&&uItem.ticketUnionId>0)"
@click="toTrip(item,uItem.ticketUnionId,uItem.guestIds)"
style="cursor:pointer;text-decoration:underline;color:green;"> style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}}) {{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : "暂定"}})
</a> </a>
...@@ -2540,14 +2556,15 @@ ...@@ -2540,14 +2556,15 @@
<span style="color:red;">改价申请:</span> <span> {{item.changePriceTime}} 申请金额【<span <span style="color:red;">改价申请:</span> <span> {{item.changePriceTime}} 申请金额【<span
style="color:red;">{{item.changePriceMoney}}</span>{{$t('hotel.hotel_yuan')}}】{{item.changePriceReason}}</span> style="color:red;">{{item.changePriceMoney}}</span>{{$t('hotel.hotel_yuan')}}】{{item.changePriceReason}}</span>
<div style="text-align:right;" v-if="item.changePriceState==1"> 待{{item.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{item.managerExamineName}}审核 </div> <div style="text-align:right;" v-if="item.changePriceState==1">
待{{item.ChangePriceType=="2"?"OP":$t('fnc.zhuguan')}}{{item.managerExamineName}}审核 </div>
<div style="text-align:right;" v-if="item.changePriceState==2"> <div style="text-align:right;" v-if="item.changePriceState==2">
{{$t('objFill.dai')}}{{item.ChangePriceType=="2"?$t('objFill.kuaiji'):$t('visa.v_zongjingli')}}{{item.examineByName}}{{$t('fnc.shenhe')}} {{$t('objFill.dai')}}{{item.ChangePriceType=="2"?$t('objFill.kuaiji'):$t('visa.v_zongjingli')}}{{item.examineByName}}{{$t('fnc.shenhe')}}
</div> </div>
<div style="text-align:right;" v-if="item.changePriceState==4" > <div style="text-align:right;" v-if="item.changePriceState==4">
已驳回 已驳回
</div> </div>
<div style="text-align:right;" v-if="item.changePriceState==3" > <div style="text-align:right;" v-if="item.changePriceState==3">
已通过 已通过
</div> </div>
</div> </div>
...@@ -2561,8 +2578,10 @@ ...@@ -2561,8 +2578,10 @@
</template> </template>
<template v-else> <template v-else>
<span class="font-color-red" v-if="item.orderspecialofferState === -1">{{$t('visa.v_jujue')}}</span> <span class="font-color-red" v-if="item.orderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org" v-if="item.orderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span> <span class="font-color-org"
<span class="font-color-green" v-if="item.orderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span> v-if="item.orderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green"
v-if="item.orderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template> </template>
</div> </div>
<div class="font-color-red" v-if="item.orderspecialofferId !== 0"> <div class="font-color-red" v-if="item.orderspecialofferId !== 0">
...@@ -2576,7 +2595,7 @@ ...@@ -2576,7 +2595,7 @@
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px"> <td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div> <div>
<div>{{$t('fnc.skdanju')}}：</div> <div>{{$t('fnc.skdanju')}}：</div>
<div > <div>
<span v-for="(item2, index2) in item.financeList" :key="index2+210000" <span v-for="(item2, index2) in item.financeList" :key="index2+210000"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span> <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
...@@ -2594,7 +2613,7 @@ ...@@ -2594,7 +2613,7 @@
<!--@click="(item.orderState==1||item.orderState==2)?goUrlSFD('SalesFinancialDetail', '销售财务单据', item):''"--> <!--@click="(item.orderState==1||item.orderState==2)?goUrlSFD('SalesFinancialDetail', '销售财务单据', item):''"-->
<div> <div>
<div>{{$t('fnc.fkdanju')}}：</div> <div>{{$t('fnc.fkdanju')}}：</div>
<div > <div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2+220000" <span v-for="(item2, index2) in item.refundFinanceList" :key="index2+220000"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span> <span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
...@@ -2942,7 +2961,8 @@ ...@@ -2942,7 +2961,8 @@
<span v-if="childItem.isApplyPhoto == 1" style="color: red">({{$t('salesModule.Zhao')}})</span> <span v-if="childItem.isApplyPhoto == 1" style="color: red">({{$t('salesModule.Zhao')}})</span>
</span> </span>
<span v-if="item.photoNum > 0">（{{$t('salesModule.NoPhoto')}} {{ item.photoNum }}{{$t('salesModule.Fen')}}）</span> <span v-if="item.photoNum > 0">（{{$t('salesModule.NoPhoto')}}
{{ item.photoNum }}{{$t('salesModule.Fen')}}）</span>
</span> </span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length > 0"> <p v-if="item.cancelGuestList && item.cancelGuestList.length > 0">
<span class="">{{$t('salesModule.CancelOrder')}}:</span> <span class="">{{$t('salesModule.CancelOrder')}}:</span>
...@@ -2953,8 +2973,9 @@ ...@@ -2953,8 +2973,9 @@
</span> </span>
</p> </p>
<span style="display: block">{{$t('salesModule.RoomInfo')}}<span v-if="item.oneSex > 0" <span style="display: block">{{$t('salesModule.RoomInfo')}}<span v-if="item.oneSex > 0"
style="color: #e95252">（{{ item.oneSex == 1 ?$t('objFill.dannan') : $t('objFill.dannv') }}）</span><span v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（{{ item.oneSex == 1 ?$t('objFill.dannan') : $t('objFill.dannv') }}）</span><span
style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人 ）</span>：{{ item.orderGuestHouseStr }}</span> v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人
）</span>：{{ item.orderGuestHouseStr }}</span>
<span v-if="item.tipMoney" style="color: red">（{{$t('fnc.xiaofei')}}：{{ item.tipMoney }}）</span> <span v-if="item.tipMoney" style="color: red">（{{$t('fnc.xiaofei')}}：{{ item.tipMoney }}）</span>
</td> </td>
</tr> </tr>
...@@ -2983,7 +3004,8 @@ ...@@ -2983,7 +3004,8 @@
IsLookOrder || IsLookOrder ||
isUpdateOrder isUpdateOrder
"> ">
<span v-if="item.clientSource == 1 && item.brandName != ''">{{ item.brandName }}{{$t('fnc.dingdan')}} <span
v-if="item.clientSource == 1 && item.brandName != ''">{{ item.brandName }}{{$t('fnc.dingdan')}}
{{ item.platformOrder }};</span>{{ item.remarks }} {{ item.platformOrder }};</span>{{ item.remarks }}
</template> </template>
</template> </template>
...@@ -3086,7 +3108,8 @@ ...@@ -3086,7 +3108,8 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow" center> <el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow"
center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2"> <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2">
</tripDownLoadCommon> </tripDownLoadCommon>
</el-dialog> </el-dialog>
...@@ -3127,7 +3150,8 @@ ...@@ -3127,7 +3150,8 @@
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan> <updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div> </div>
<!--修改OP备注--> <!--修改OP备注-->
<el-dialog custom-class="w350" :title="$t('ground.xgopbz')" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg"> <el-dialog custom-class="w350" :title="$t('ground.xgopbz')" :visible.sync="zhuanLoading" center
:before-close="initOPRemarkMsg">
<el-form label-width="110px"> <el-form label-width="110px">
<el-form-item :label="$t('Operation.Op_remark')+'：'" class="w280"> <el-form-item :label="$t('Operation.Op_remark')+'：'" class="w280">
<el-input type="textarea" :rows="2" v-model="OPRemarkMsg.OP_Remarks"></el-input> <el-input type="textarea" :rows="2" v-model="OPRemarkMsg.OP_Remarks"></el-input>
...@@ -3143,7 +3167,8 @@ ...@@ -3143,7 +3167,8 @@
</div> </div>
</el-dialog> </el-dialog>
<!--修改提成--> <!--修改提成-->
<el-dialog custom-class="w350" :title="$t('ground.xgtcheng')" :visible.sync="TiChengLoading" center :before-close="initTCMsg"> <el-dialog custom-class="w350" :title="$t('ground.xgtcheng')" :visible.sync="TiChengLoading" center
:before-close="initTCMsg">
<el-form label-width="110px"> <el-form label-width="110px">
<el-form-item :label="$t('salesModule.TCmoney')+'：'" class="w280"> <el-form-item :label="$t('salesModule.TCmoney')+'：'" class="w280">
<el-input :placeholder="$t('pub.pleaseImport')" type="number" v-model="TCMsg.LatestCommissionMoney"> <el-input :placeholder="$t('pub.pleaseImport')" type="number" v-model="TCMsg.LatestCommissionMoney">
...@@ -3209,13 +3234,13 @@ ...@@ -3209,13 +3234,13 @@
<el-dialog custom-class="w350" :title="$t('ground.xgddanewjine')" :visible.sync="OrderMoneyDialog" center> <el-dialog custom-class="w350" :title="$t('ground.xgddanewjine')" :visible.sync="OrderMoneyDialog" center>
<el-form label-width="110px"> <el-form label-width="110px">
<el-form-item :label="$t('salesModule.EWJLJE')+'：'" class="w280"> <el-form-item :label="$t('salesModule.EWJLJE')+'：'" class="w280">
<el-input :placeholder="$t('pub.pleaseImport')" type="text" @keyup.native="checkPrice(EwMsg, 'ExtraRewardMoney')" <el-input :placeholder="$t('pub.pleaseImport')" type="text"
v-model="EwMsg.ExtraRewardMoney"> @keyup.native="checkPrice(EwMsg, 'ExtraRewardMoney')" v-model="EwMsg.ExtraRewardMoney">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('salesModule.EWKCJE')+'：'" class="w280"> <el-form-item :label="$t('salesModule.EWKCJE')+'：'" class="w280">
<el-input :placeholder="$t('pub.pleaseImport')" type="number" @keyup.native="checkPrice(EwMsg, 'ExtraDeductMoney')" <el-input :placeholder="$t('pub.pleaseImport')" type="number"
v-model="EwMsg.ExtraDeductMoney"> @keyup.native="checkPrice(EwMsg, 'ExtraDeductMoney')" v-model="EwMsg.ExtraDeductMoney">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -3229,7 +3254,8 @@ ...@@ -3229,7 +3254,8 @@
</div> </div>
</el-dialog> </el-dialog>
<a id="groupTourOrderByTuan_DownLoad" target="_blank" style="display: none">1不要删除</a> <a id="groupTourOrderByTuan_DownLoad" target="_blank" style="display: none">1不要删除</a>
<el-dialog :title="$t('objFill.xuanzhelk')" width="400px" :visible.sync="ShenQingPhotoShow" center :before-close="closeChangeMachie"> <el-dialog :title="$t('objFill.xuanzhelk')" width="400px" :visible.sync="ShenQingPhotoShow" center
:before-close="closeChangeMachie">
<div> <div>
<label><input type="checkbox" v-model="SQcheckdAll" />{{$t('system.table_chekAll')}}</label> <label><input type="checkbox" v-model="SQcheckdAll" />{{$t('system.table_chekAll')}}</label>
</div> </div>
...@@ -3334,7 +3360,7 @@ ...@@ -3334,7 +3360,7 @@
cityId: 0, cityId: 0,
orderId: 0, orderId: 0,
unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id) unionfid: 0, //订单旅客联运编号(rb_airticket_union表Id)
GuestIds:'', GuestIds: '',
}, },
userId: "", userId: "",
customerId: "", customerId: "",
...@@ -4175,13 +4201,13 @@ ...@@ -4175,13 +4201,13 @@
); );
} }
}, },
toTrip: function (obj, TicketUnionId,GuestIds) { toTrip: function (obj, TicketUnionId, GuestIds) {
this.tripObj.tcid = obj.tcid; this.tripObj.tcid = obj.tcid;
this.tripObj.configId = obj.configId; this.tripObj.configId = obj.configId;
this.tripObj.orderId = obj.orderId; this.tripObj.orderId = obj.orderId;
this.tripObj.cityId = obj.startCityId; this.tripObj.cityId = obj.startCityId;
this.tripObj.unionfid =0; this.tripObj.unionfid = 0;
this.tripObj.GuestIds =GuestIds; this.tripObj.GuestIds = GuestIds;
if (TicketUnionId) { if (TicketUnionId) {
this.tripObj.unionfid = TicketUnionId; this.tripObj.unionfid = TicketUnionId;
} }
...@@ -4309,7 +4335,7 @@ ...@@ -4309,7 +4335,7 @@
); );
}) })
.catch(() => { .catch(() => {
this.$message.info(this.$t('pub.cancelBtn')+'！'); this.$message.info(this.$t('pub.cancelBtn') + '！');
}); });
}, },
getUnionTravelPrice(obj, type) { getUnionTravelPrice(obj, type) {
...@@ -4584,6 +4610,11 @@ ...@@ -4584,6 +4610,11 @@
if (this.addMsg.GroupType == 4) { if (this.addMsg.GroupType == 4) {
this.HightUnitPrice = "1"; this.HightUnitPrice = "1";
this.Unit_Price = x.Unit_Price; this.Unit_Price = x.Unit_Price;
} else if (this.addMsg.GroupType == 5) {
this.HightUnitPrice = "1";
this.Unit_Price = modelPrice.AirticketMoney;
this.addMsg.Unit_Price = modelPrice.AirticketMoney;
this.addMsg.TC_Price = modelPrice.AirticketMoney;
} else { } else {
this.HightUnitPrice = "2"; this.HightUnitPrice = "2";
this.Unit_Price = this.addObj.SingleDMCPrice; this.Unit_Price = this.addObj.SingleDMCPrice;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ e1871811
...@@ -743,8 +743,12 @@ ...@@ -743,8 +743,12 @@
<td> <td>
<b>{{item.SingleDMCPrice|priceFormat(item.SingleDMCPrice)}}</b> <b>{{item.SingleDMCPrice|priceFormat(item.SingleDMCPrice)}}</b>
</td> </td>
<td class="TC_cusTitle">{{$t('salesModule.SingleAirticket')}}</td>
<td>
<b>{{item.AirticketMoney|priceFormat(item.AirticketMoney)}}</b>
</td>
<td class="TC_cusTitle">{{$t('op.RTXF')}}</td> <td class="TC_cusTitle">{{$t('op.RTXF')}}</td>
<td colspan="3"> <td>
<b>{{item.TipAmount|priceFormat(item.TipAmount)}}</b> <b>{{item.TipAmount|priceFormat(item.TipAmount)}}</b>
</td> </td>
</tr> </tr>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ e1871811
...@@ -457,7 +457,8 @@ ...@@ -457,7 +457,8 @@
:false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}} :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange" <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange"
:true-label="CheckedVaule" :false-label="UnCheckedLessPrice">{{$t('objFill.v101.myOrdersAllType.shifouxyst')}} :true-label="CheckedVaule" :false-label="UnCheckedLessPrice">
{{$t('objFill.v101.myOrdersAllType.shifouxyst')}}
</el-checkbox> </el-checkbox>
<template v-if="CurrentUserInfo.RB_Group_id==2"> <template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
...@@ -519,6 +520,12 @@ ...@@ -519,6 +520,12 @@
<template slot="prepend">{{$t('salesModule.SingleJ')}}</template> <template slot="prepend">{{$t('salesModule.SingleJ')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.AirticketMoney" @keyup.native="checkPrice(priceData,'AirticketMoney')">
<template slot="prepend">{{$t('salesModule.SingleAirticket')}}</template>
</el-input>
</el-form-item>
<el-form-item> <el-form-item>
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.TipAmount" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.TipAmount"
@keyup.native="checkPrice(priceData,'TipAmount')"> @keyup.native="checkPrice(priceData,'TipAmount')">
...@@ -704,7 +711,8 @@ ...@@ -704,7 +711,8 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}</span> <span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}</span>
<el-select class="w180" v-model="priceData.IsLeaderDaiTuan"> <el-select class="w180" v-model="priceData.IsLeaderDaiTuan">
<template v-for="item in DaiTuanList"> <template v-for="item in DaiTuanList">
<el-option :key="item.Id" :label="item.name" :value="item.Id"> <el-option :key="item.Id" :label="item.name" :value="item.Id">
...@@ -718,7 +726,8 @@ ...@@ -718,7 +726,8 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.daoydtbdt')}}</span> <span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.daoydtbdt')}}</span>
<el-select class="w180" v-model="priceData.IsGuideDaiTuan"> <el-select class="w180" v-model="priceData.IsGuideDaiTuan">
<template v-for="item in DaiTuanList"> <template v-for="item in DaiTuanList">
<el-option :key="item.Id" :label="item.name" :value="item.Id"> <el-option :key="item.Id" :label="item.name" :value="item.Id">
...@@ -757,8 +766,8 @@ ...@@ -757,8 +766,8 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="SendPersion"> <el-form-item prop="SendPersion">
<el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle" :placeholder="$t('objFill.v101.myOrdersAllType.qingsrstr')" <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle"
v-model="priceData.SendPersion"> :placeholder="$t('objFill.v101.myOrdersAllType.qingsrstr')" v-model="priceData.SendPersion">
<template slot="prepend">{{$t('objFill.v101.myOrdersAllType.shongtuanr')}}</template> <template slot="prepend">{{$t('objFill.v101.myOrdersAllType.shongtuanr')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -907,7 +916,8 @@ ...@@ -907,7 +916,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-top:1px;"> <el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span> <span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;" <el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action=""> :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="primary">{{$t('objFill.shangchuan')}}</el-button> <el-button size="small" type="primary">{{$t('objFill.shangchuan')}}</el-button>
...@@ -1814,7 +1824,8 @@ ...@@ -1814,7 +1824,8 @@
parseInt(this.priceData.FSeat); parseInt(this.priceData.FSeat);
if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) { if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
fitem.BindNum = 0; fitem.BindNum = 0;
this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei')); this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem
.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
} }
this.selectFilghtList.forEach((x, index) => { this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) { if (x.IsSelected) {
...@@ -1920,9 +1931,9 @@ ...@@ -1920,9 +1931,9 @@
that.$emit("saveMsg"); that.$emit("saveMsg");
} }
if (type == 2) { if (type == 2) {
that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd')+'...'; that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd') + '...';
} else { } else {
that.btnText = this.$t('pub.saveBtn')+'...'; that.btnText = this.$t('pub.saveBtn') + '...';
} }
}); });
}, },
......
src/components/orderCommon/order-form2.vue
View file @ e1871811
...@@ -58,7 +58,8 @@ ...@@ -58,7 +58,8 @@
<template> <template>
<div class="commonOrderForm" :style="{ height: ScreenHeight }"> <div class="commonOrderForm" :style="{ height: ScreenHeight }">
<p class="title"> <p class="title">
{{ $t("salesModule.SignImdi") }} &nbsp;<span style="color:red;font-weight:bold;">{{$t('objFill.lianyunxxqtxm')}}</span> {{ $t("salesModule.SignImdi") }} &nbsp;<span
style="color:red;font-weight:bold;">{{$t('objFill.lianyunxxqtxm')}}</span>
<span v-if="crmOrderObj"> <span v-if="crmOrderObj">
<span style="color: red">{{$t('objFill.yinliuren')}}：{{ crmOrderObj.LureEmpNmae }} </span> <span style="color: red">{{$t('objFill.yinliuren')}}：{{ crmOrderObj.LureEmpNmae }} </span>
<span style="color: #2aaef2">/{{$t('objFill.keren')}}：{{ crmOrderObj.CRMGuestName }}</span> <span style="color: #2aaef2">/{{$t('objFill.keren')}}：{{ crmOrderObj.CRMGuestName }}</span>
...@@ -141,10 +142,7 @@ ...@@ -141,10 +142,7 @@
</el-col> </el-col>
<template v-if="showCity && pagesTitle == '跟团游产品'"> <template v-if="showCity && pagesTitle == '跟团游产品'">
<el-col :span="4"> <el-col :span="4">
<!--出发城市 :disabled=" <!--出发城市 -->
priceObj.SonControlID !== -1 &&
priceObj.OutBranchId !== priceObj.SonControlID
" HK 2023-05-25去掉联运限制 -->
<el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId"> <el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId">
<el-select v-model="addMsg.DepartureCityId" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.DepartureCityId" filterable :placeholder="$t('pub.pleaseSel')"
@change="addMsg.IsIntermodal = 2"> @change="addMsg.IsIntermodal = 2">
...@@ -155,18 +153,14 @@ ...@@ -155,18 +153,14 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<!--出发是否联运 v-show=" <!--出发是否联运 -->
addMsg.DepartureCityId != priceObj.StartCityID &&
addMsg.DepartureCityId != ''
" -->
<el-form-item :label="$t('salesModule.goUnion')" prop="IsIntermodal"> <el-form-item :label="$t('salesModule.goUnion')" prop="IsIntermodal">
<el-switch v-model="addMsg.IsIntermodal" active-value="1" inactive-value="2" <el-switch v-model="addMsg.IsIntermodal" active-value="1" inactive-value="2"
@change="getUnionTravelPrice(priceObj, 1)"></el-switch> @change="getUnionTravelPrice(priceObj, 1)"></el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<!--联运时间 && <!--联运时间-->
addMsg.DepartureCityId != priceObj.StartCityID-->
<el-form-item :label="$t('salesModule.LYtime')" prop="GoCityTime" v-show=" <el-form-item :label="$t('salesModule.LYtime')" prop="GoCityTime" v-show="
addMsg.IsIntermodal == 1 addMsg.IsIntermodal == 1
"> ">
...@@ -175,10 +169,7 @@ ...@@ -175,10 +169,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<!--返回城市 :disabled=" <!--返回城市-->
priceObj.SonControlID !== -1 &&
priceObj.OutBranchId !== priceObj.SonControlID
"-->
<el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId"> <el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId">
<el-select v-model="addMsg.ReturnArriveCityId" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.ReturnArriveCityId" filterable :placeholder="$t('pub.pleaseSel')"
@change="addMsg.IsReturnIntermodal = 2"> @change="addMsg.IsReturnIntermodal = 2">
...@@ -188,21 +179,16 @@ ...@@ -188,21 +179,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<!--返程是否联运 v-show=" <!--返程是否联运-->
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId &&
addMsg.ReturnArriveCityId != ''
"-->
<el-form-item :label="$t('salesModule.backUnion')" prop="IsReturnIntermodal"> <el-form-item :label="$t('salesModule.backUnion')" prop="IsReturnIntermodal">
<el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2" <el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2"
@change="getUnionTravelPrice(priceObj, 2)"></el-switch> @change="getUnionTravelPrice(priceObj, 2)"></el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<!--返程联运时间 && <!--返程联运时间-->
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId-->
<el-form-item :label="$t('salesModule.backUnionTime')" prop="IsReturnIntermodal" v-show=" <el-form-item :label="$t('salesModule.backUnionTime')" prop="IsReturnIntermodal" v-show="
addMsg.IsReturnIntermodal == 1 addMsg.IsReturnIntermodal == 1">
">
<el-date-picker :picker-options="pickerOptions1" v-model="addMsg.BackCityTime" value-format="yyyy-MM-dd" <el-date-picker :picker-options="pickerOptions1" v-model="addMsg.BackCityTime" value-format="yyyy-MM-dd"
type="date" @change="getUnionTravelPrice(priceObj, 2)"></el-date-picker> type="date" @change="getUnionTravelPrice(priceObj, 2)"></el-date-picker>
</el-form-item> </el-form-item>
...@@ -210,15 +196,21 @@ ...@@ -210,15 +196,21 @@
</template> </template>
<el-col :span="4"> <el-col :span="4">
<!--prop="TC_Price"--> <!--prop="TC_Price"-->
<el-form-item :label="$t('salesModule.TeamPrice')" > <el-form-item :label="$t('salesModule.TeamPrice')">
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" <template v-if="addMsg.GroupType==4">
:disabled="pagesTitle == '跟团游产品' ? false : true" @input="getTotalPrice()"> <el-input v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input>
</template>
<template v-else-if="addMsg.GroupType==5">
<el-input v-model="SingleAirticketMoney" :disabled="true" @change="getTotalPrice()"></el-input>
</template>
<template v-else>
<el-input v-model="addMsg.TC_Price" :disabled="pagesTitle == '跟团游产品' ? false : true"
@input="getTotalPrice()">
</el-input> </el-input>
<el-input v-else v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input> </template>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--&& <!--&& addMsg.DepartureCityId != priceObj.StartCityID-->
addMsg.DepartureCityId != priceObj.StartCityID-->
<el-col :span="4" v-show=" <el-col :span="4" v-show="
addMsg.IsIntermodal == 1 addMsg.IsIntermodal == 1
"> ">
...@@ -227,8 +219,7 @@ ...@@ -227,8 +219,7 @@
<span class="colorE95252" v-show="!stratPriceShow">{{ $t("pub.NoPrice") }}！</span> <span class="colorE95252" v-show="!stratPriceShow">{{ $t("pub.NoPrice") }}！</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--&& <!--&&addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId-->
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId-->
<el-col :span="4" v-show=" <el-col :span="4" v-show="
addMsg.IsReturnIntermodal == 1 addMsg.IsReturnIntermodal == 1
"> ">
...@@ -247,10 +238,18 @@ ...@@ -247,10 +238,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-else> <el-col :span="4" v-else>
<!--成交单价-->
<el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price"> <el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price">
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.Unit_Price" @change="getTotalPrice(3)"> <template v-if="addMsg.GroupType == 4">
</el-input> <el-input v-model="SingleDMCPrice" @change="getTotalPrice(3)"></el-input>
<el-input v-else v-model="SingleDMCPrice" @change="getTotalPrice(3)"></el-input> </template>
<template v-else-if="addMsg.GroupType == 5">
<el-input v-model="SingleAirticketMoney" @change="getTotalPrice(3)"></el-input>
</template>
<template v-else>
<el-input v-model="addMsg.Unit_Price" @change="getTotalPrice(3)"> </el-input>
</template>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-show="addMsg.GroupType != '4'"> <el-col :span="4" v-show="addMsg.GroupType != '4'">
...@@ -281,7 +280,8 @@ ...@@ -281,7 +280,8 @@
</el-col> </el-col>
<el-col :span="4" v-if="(addMsg.GroupType==1||addMsg.GroupType==2)&&couponList&&couponList.length>0"> <el-col :span="4" v-if="(addMsg.GroupType==1||addMsg.GroupType==2)&&couponList&&couponList.length>0">
<el-form-item :label="$t('active.ad_yhq')" prop=""> <el-form-item :label="$t('active.ad_yhq')" prop="">
<el-select v-model="DiscountAmountId" :placeholder="$t('objFill.xuanzheyhq')" @change="getDiscountAmount" clearable> <el-select v-model="DiscountAmountId" :placeholder="$t('objFill.xuanzheyhq')" @change="getDiscountAmount"
clearable>
<el-option v-for="item in couponList" :label="item.couponName" :value="item.id" :key="item.id" <el-option v-for="item in couponList" :label="item.couponName" :value="item.id" :key="item.id"
:disabled="expiredTime(item)"> :disabled="expiredTime(item)">
<span> <span>
...@@ -289,7 +289,8 @@ ...@@ -289,7 +289,8 @@
<span style="color: sandybrown;">{{item.couponName}}</span> <span style="color: sandybrown;">{{item.couponName}}</span>
</span> </span>
<span> <span>
/ <span style="color: sandybrown;">{{item.couponsType==1?$t('active.cl_dyquan'):$t('objFill.zhekequan')}}</span> / <span
style="color: sandybrown;">{{item.couponsType==1?$t('active.cl_dyquan'):$t('objFill.zhekequan')}}</span>
</span> </span>
<span style="margin-left: 10px;margin-right: 10px;"> <span style="margin-left: 10px;margin-right: 10px;">
{{$t('active.cl_man')}} {{$t('active.cl_man')}}
...@@ -358,10 +359,9 @@ ...@@ -358,10 +359,9 @@
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="priceObj.IsSupportChildren == 1" > <el-col :span="4" v-if="priceObj.IsSupportChildren == 1&&addMsg.GroupType!=5">
<el-form-item :label="$t('Operation.Op_childBed')" prop="ChirdNeedBedNum"> <el-form-item :label="$t('Operation.Op_childBed')" prop="ChirdNeedBedNum">
<el-input v-model="addMsg.ChirdNeedBedNum" <el-input v-model="addMsg.ChirdNeedBedNum" @keyup.native="checkInteger(addMsg, 'ChirdNeedBedNum')" @input="
@keyup.native="checkInteger(addMsg, 'ChirdNeedBedNum')" @input="
getNumber(); getNumber();
getHouseNo(); getHouseNo();
getTotalPrice(); getTotalPrice();
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
"> ">
{{ $t("salesModule.NoSupplier") }}! {{ $t("salesModule.NoSupplier") }}!
</p> </p>
<!-- getHouseNo(); -->
<el-form-item v-if="priceObj.IsSupportChildren == 1" v-show="addMsg.GroupType !== '4'" <el-form-item v-if="priceObj.IsSupportChildren == 1" v-show="addMsg.GroupType !== '4'"
:label="$t('salesModule.ChildNum')" prop="ChirdNum"> :label="$t('salesModule.ChildNum')" prop="ChirdNum">
<el-input v-model="addMsg.ChirdNum" :disabled="addMsg.GroupType === '4'" <el-input v-model="addMsg.ChirdNum" :disabled="addMsg.GroupType === '4'"
...@@ -587,7 +587,8 @@ ...@@ -587,7 +587,8 @@
<!--报价单--> <!--报价单-->
<el-col :span="4" style="display:none;"> <el-col :span="4" style="display:none;">
<el-form-item :label="$t('ground.bjd')" prop="QuotationUrl" v-show="addMsg.GroupType == '2'"> <el-form-item :label="$t('ground.bjd')" prop="QuotationUrl" v-show="addMsg.GroupType == '2'">
<div style="margin-bottom: 10px; width: 32%" v-loading="uploadLloading" :element-loading-text="$t('objFill.pingminscz')"> <div style="margin-bottom: 10px; width: 32%" v-loading="uploadLloading"
:element-loading-text="$t('objFill.pingminscz')">
<el-upload ref="my-upload" class="upload-demo" :http-request="uploadFileBtn" :multiple="true" <el-upload ref="my-upload" class="upload-demo" :http-request="uploadFileBtn" :multiple="true"
:show-file-list="true" :on-preview="previewFile" :on-remove="removeFile" :limit="1" action> :show-file-list="true" :on-preview="previewFile" :on-remove="removeFile" :limit="1" action>
<el-button size="small" type="primary">{{$t('tips.dianjishanhcuan')}}</el-button> <el-button size="small" type="primary">{{$t('tips.dianjishanhcuan')}}</el-button>
...@@ -616,22 +617,25 @@ ...@@ -616,22 +617,25 @@
<tr v-for="(item, index) in addMsg.GuestList" :key="index"> <tr v-for="(item, index) in addMsg.GuestList" :key="index">
<td width="20%" style="min-width: 260px"> <td width="20%" style="min-width: 260px">
<div style="display: flex; flex-direction: row"> <div style="display: flex; flex-direction: row">
<el-form-item style="width: 50%" :label="`${$t('admin.admin_xing')} ${index + 1} `" :prop="`GuestList.${index}.SurName`" <el-form-item style="width: 50%" :label="`${$t('admin.admin_xing')} ${index + 1} `"
:rules="rules.SurName" label-width="50px" label-position="left"> :prop="`GuestList.${index}.SurName`" :rules="rules.SurName" label-width="50px"
<el-input size="small" v-model="item.SurName" :placeholder="$t('objFill.shuruxin')" style="width: 100%" @input=" label-position="left">
<el-input size="small" v-model="item.SurName" :placeholder="$t('objFill.shuruxin')"
style="width: 100%" @input="
Transformation(item.SurName, 'SurName', index) Transformation(item.SurName, 'SurName', index)
"></el-input> "></el-input>
</el-form-item> </el-form-item>
<el-form-item style="width: 50%" :label="`${$t('admin.admin_ming')} ${index + 1} `" :prop="`GuestList.${index}.Name`" <el-form-item style="width: 50%" :label="`${$t('admin.admin_ming')} ${index + 1} `"
:rules="rules.Name" label-width="50px" label-position="left"> :prop="`GuestList.${index}.Name`" :rules="rules.Name" label-width="50px"
<el-input size="small" v-model="item.Name" :placeholder="$t('objFill.shuruming')" style="width: 100%" label-position="left">
@input="Transformation(item.Name, 'Name', index)"></el-input> <el-input size="small" v-model="item.Name" :placeholder="$t('objFill.shuruming')"
style="width: 100%" @input="Transformation(item.Name, 'Name', index)"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</td> </td>
<td width="20%" style="min-width: 220px"> <td width="20%" style="min-width: 220px">
<el-form-item :label="`${$t('system.table_sex')} ${index + 1} `" :prop="`GuestList.${index}.Sex`" :rules="rules.Sex" <el-form-item :label="`${$t('system.table_sex')} ${index + 1} `" :prop="`GuestList.${index}.Sex`"
label-width="70px" label-position="left"> :rules="rules.Sex" label-width="70px" label-position="left">
<el-select v-model="item.Sex" :placeholder="$t('rule.qxzxb')" style="width: 100%"> <el-select v-model="item.Sex" :placeholder="$t('rule.qxzxb')" style="width: 100%">
<el-option v-for="item in optionsList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in optionsList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
...@@ -639,16 +643,18 @@ ...@@ -639,16 +643,18 @@
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px"> <td width="20%" style="min-width: 220px">
<el-form-item :label="`${$t('admin.admin_BirthDate')} ${index + 1} `" :prop="`GuestList.${index}.Birthday`" <el-form-item :label="`${$t('admin.admin_BirthDate')} ${index + 1} `"
:rules="rules.Birthday" label-width="100px" label-position="left"> :prop="`GuestList.${index}.Birthday`" :rules="rules.Birthday" label-width="100px"
label-position="left">
<el-date-picker v-model="item.Birthday" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="item.Birthday" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('objFill.xuanzhecsrq')"> :placeholder="$t('objFill.xuanzhecsrq')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px"> <td width="20%" style="min-width: 220px">
<el-form-item :label="`${$t('visaT.nationality')} ${index + 1} `" :prop="`GuestList.${index}.Nationality`" <el-form-item :label="`${$t('visaT.nationality')} ${index + 1} `"
:rules="rules.PassportNo" label-width="80px" label-position="left"> :prop="`GuestList.${index}.Nationality`" :rules="rules.PassportNo" label-width="80px"
label-position="left">
<el-select v-model="item.Nationality" filterable size="mini" class="w230"> <el-select v-model="item.Nationality" filterable size="mini" class="w230">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -656,17 +662,20 @@ ...@@ -656,17 +662,20 @@
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px"> <td width="20%" style="min-width: 220px">
<el-form-item :label="`${$t('system.table_Passport')} ${index + 1} `" :prop="`GuestList.${index}.PassportNo`" <el-form-item :label="`${$t('system.table_Passport')} ${index + 1} `"
:rules="rules.PassportNo" label-width="80px" label-position="left"> :prop="`GuestList.${index}.PassportNo`" :rules="rules.PassportNo" label-width="80px"
<el-input size="small" v-model="item.PassportNo" :placeholder="$t('system.ph_Passport')" style="width: 100%"> label-position="left">
<el-input size="small" v-model="item.PassportNo" :placeholder="$t('system.ph_Passport')"
style="width: 100%">
</el-input> </el-input>
</el-form-item> </el-form-item>
</td> </td>
<td width="20%" style="min-width: 220px"> <td width="20%" style="min-width: 220px">
<el-form-item :label="`${$t('system.table_phone')} ${index + 1} `" :prop="`GuestList.${index}.MobilePhone`" <el-form-item :label="`${$t('system.table_phone')} ${index + 1} `"
:rules="rules.MobilePhone" label-width="80px" label-position="left"> :prop="`GuestList.${index}.MobilePhone`" :rules="rules.MobilePhone" label-width="80px"
<el-input size="small" type="Number" v-model="item.MobilePhone" :placeholder="$t('admin.admin_phPhone')" label-position="left">
style="width: 100%"></el-input> <el-input size="small" type="Number" v-model="item.MobilePhone"
:placeholder="$t('admin.admin_phPhone')" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
...@@ -682,8 +691,8 @@ ...@@ -682,8 +691,8 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" v-if="pagesTitle == '当地游产品'"> <el-col :span="12" v-if="pagesTitle == '当地游产品'">
<el-form-item :label="$t('objFill.jihedi')" prop="GatherAddress" label-width="125px" label-position="left"> <el-form-item :label="$t('objFill.jihedi')" prop="GatherAddress" label-width="125px" label-position="left">
<el-input type="textarea" size="small" v-model="addMsg.GatherAddress" :placeholder="$t('objFill.qingsrjhed')" <el-input type="textarea" size="small" v-model="addMsg.GatherAddress"
style="width: 100%"></el-input> :placeholder="$t('objFill.qingsrjhed')" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--备注--> <!--备注-->
...@@ -989,6 +998,7 @@ ...@@ -989,6 +998,7 @@
otherRemark: "", otherRemark: "",
SingleDMCPricex: 0, // 单地接; SingleDMCPricex: 0, // 单地接;
SingleDMCPrice: 0, // 单地接; SingleDMCPrice: 0, // 单地接;
SingleAirticketMoney: 0, //单机票
optionsList: [{ optionsList: [{
Name: this.$t('pub.man'), Name: this.$t('pub.man'),
Id: 1 Id: 1
...@@ -1821,8 +1831,8 @@ ...@@ -1821,8 +1831,8 @@
} }
} }
if (this.pagesTitle != "当地游产品") { if (this.pagesTitle != "当地游产品") {
this.addMsg.ChirdNum = //儿童人数=儿童占床人数+儿童不占床人数
this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1; this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1;
} }
var DiscountPrice = 0; //早鸟优惠价格 var DiscountPrice = 0; //早鸟优惠价格
//享受早鸟优惠 //享受早鸟优惠
...@@ -1868,6 +1878,9 @@ ...@@ -1868,6 +1878,9 @@
// Number(this.addMsg.OldPeopleNum)) * // Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice)); // (Number(this.stratPrice) + Number(this.returnPrice));
//退景点费用
var refundScenicPrice = this.ScenicRefundMoney * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
//单地接 //单地接
let dandijie = 0; let dandijie = 0;
if (this.addMsg.GroupType == 4) { if (this.addMsg.GroupType == 4) {
...@@ -1876,12 +1889,22 @@ ...@@ -1876,12 +1889,22 @@
ertong = 0; ertong = 0;
ertongbed = 0; ertongbed = 0;
zafeiqianzhen = 0; zafeiqianzhen = 0;
} else if (this.addMsg.GroupType == 5) {
dandijie = 0;
lianyun = 0;
ertong = 0;
yinger = 0;
laoren = 0;
ertongbed = 0;
zafeiqianzhen = 0;
danfang = 0;
refundScenicPrice = 0;
chengren = this.SingleAirticketMoney * (Number(this.TotalNumber));
} else { } else {
dandijie = this.priceObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); dandijie = this.priceObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
} }
//退景点费用
var refundScenicPrice = this.ScenicRefundMoney * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
//总应收价格 //总应收价格
this.addMsg.PreferPrice = this.addMsg.PreferPrice =
dandijie + dandijie +
...@@ -1907,7 +1930,7 @@ ...@@ -1907,7 +1930,7 @@
} }
//提交创建、修改表单 //提交创建、修改表单
this.$refs[addMsg].validate((valid) => { this.$refs[addMsg].validate((valid) => {
console.log("valid",valid) console.log("valid", valid)
if (valid) { if (valid) {
this.saveOrder(); this.saveOrder();
} else { } else {
...@@ -2501,6 +2524,8 @@ ...@@ -2501,6 +2524,8 @@
this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime; this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
this.addMsg.SonControlID = oldValue.SonControlID; this.addMsg.SonControlID = oldValue.SonControlID;
this.SingleDMCPrice = oldValue.SingleDMCPrice; this.SingleDMCPrice = oldValue.SingleDMCPrice;
this.SingleAirticketMoney = oldValue.AirticketMoney;
console.log("SingleAirticketMoney", this.SingleAirticketMoney);
this.SingleDMCPricex = oldValue.SingleDMCPrice; this.SingleDMCPricex = oldValue.SingleDMCPrice;
this.priceObj = JSON.parse(JSON.stringify(oldValue)); this.priceObj = JSON.parse(JSON.stringify(oldValue));
if (this.pagesTitle == "当地游产品") { if (this.pagesTitle == "当地游产品") {
......
src/components/orderCommon/productOrderList.vue
View file @ e1871811
...@@ -592,7 +592,8 @@ ...@@ -592,7 +592,8 @@
<p> <p>
<span>{{ $t("scen.sc_cp") }}</span>{{ item.OutBranchName }} <span>{{ $t("scen.sc_cp") }}</span>{{ item.OutBranchName }}
<span class="TC_neibu" style="float: inherit;color: #ffffff;margin-left: 5px;" <span class="TC_neibu" style="float: inherit;color: #ffffff;margin-left: 5px;"
v-if="item.StandardCurrencyName" :class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元', v-if="item.StandardCurrencyName"
:class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元',
'TCb2c':item.StandardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='', 'TCb2c':item.StandardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='',
'otherPlat':item.StandardCurrencyName=='',}">{{item.StandardCurrencyName}}{{$t('objFill.jiesuan')}}</span> 'otherPlat':item.StandardCurrencyName=='',}">{{item.StandardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
</p> </p>
...@@ -729,6 +730,14 @@ ...@@ -729,6 +730,14 @@
}} }}
</td> </td>
</tr> </tr>
<tr>
<td>{{ $t("salesModule.SingleAirticket") }}</td>
<td colspan="5">
{{
item.AirticketMoney | priceFormat(item.AirticketMoney)
}}
</td>
</tr>
<tr> <tr>
<td>{{ $t("Operation.Op_baby") }}</td> <td>{{ $t("Operation.Op_baby") }}</td>
<td colspan="5"> <td colspan="5">
...@@ -959,7 +968,8 @@ ...@@ -959,7 +968,8 @@
" icon="iconfont icon-erweima"></el-button> " icon="iconfont icon-erweima"></el-button>
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('objFill.guangaosl') + item.AdvertCount" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('objFill.guangaosl') + item.AdvertCount"
placement="top-start">
<el-button type="primary" style="background-color: #e95252 !important; border-color: #e95252 !important" <el-button type="primary" style="background-color: #e95252 !important; border-color: #e95252 !important"
v-if="!TCIDList" icon="iconfont icon-guanggao" @click="goUrlX(item)"></el-button> v-if="!TCIDList" icon="iconfont icon-guanggao" @click="goUrlX(item)"></el-button>
</el-tooltip> </el-tooltip>
...@@ -997,7 +1007,8 @@ ...@@ -997,7 +1007,8 @@
<commonTeamInfo ref="comTeam"></commonTeamInfo> <commonTeamInfo ref="comTeam"></commonTeamInfo>
</el-dialog> </el-dialog>
<!-- 行程下载 --> <!-- 行程下载 -->
<el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow" center> <el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow"
center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1"> <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
</tripDownLoadCommon> </tripDownLoadCommon>
</el-dialog> </el-dialog>
......
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