Commit 2d8898e6 authored by youjie's avatar youjie
parents 0e80ea72 d1192d1d
This diff is collapsed.
This diff is collapsed.
......@@ -128,6 +128,7 @@ export const system = {
query_stopAir: 'stopover airport',
query_arrivalCity: 'Reach the city',
query_arrivalAir: 'Arriving at the airport',
query_arrivalAirThreeCode:'Three codes to the airport upon arrival',
query_arrivalTime: 'Arrival time',
quety_area: 'area',
query_workType: 'work type',
......@@ -1773,6 +1774,7 @@ export const visaT = {
sqneirong: 'Application type',
crjtime: 'entry-exit time',
cfAirport: 'Departure Airport',
cfAirportTreeCode:'Departure airport three codes',
chujingtime: 'exit time',
rujingtime: 'time of entry',
Portofentry: 'port ofentry',
......
......@@ -91,6 +91,7 @@ export const system = {
query_stopAir:'経由空港',
query_arrivalCity:'到着都市',
query_arrivalAir:'到着空港',
query_arrivalAirThreeCode:'空港到着3ヤード',
query_arrivalTime:'到着時間',
quety_area:'エリア',
query_workType:'仕事',
......@@ -1719,6 +1720,7 @@ export const visaT = {
sqneirong:'申請タイプ',
crjtime:'出入国時間',
cfAirport:'出発空港',
cfAirportTreeCode:'出発空港3ヤード',
chujingtime:'出国時間',
rujingtime:'入国時間',
Portofentry:'入国口岸',
......
......@@ -126,6 +126,7 @@ export const system = {
query_stopAir:'經停機場',
query_arrivalCity:'到達城市',
query_arrivalAir:'到達機場',
query_arrivalAirThreeCode:'到達機場三碼',
query_arrivalTime:'到達時間',
quety_area:'區域',
query_workType:'工作類型',
......@@ -1759,6 +1760,7 @@ export const visaT = {
sqneirong:'申請類型',
crjtime:'出入境時間',
cfAirport:'出發機場',
cfAirportTreeCode:'出發機場三碼',
chujingtime:'出境時間',
rujingtime:'入境時間',
Portofentry:'入境口岸',
......
......@@ -127,6 +127,7 @@ export const system = {
query_stopAir:'经停机场',
query_arrivalCity:'到达城市',
query_arrivalAir:'到达机场',
query_arrivalAirThreeCode:'到达机场三码',
query_arrivalTime:'到达时间',
quety_area:'区域',
query_workType:'工作类型',
......@@ -1776,6 +1777,7 @@ export const visaT = {
sqneirong:'申请类型',
crjtime:'出入境时间',
cfAirport:'出发机场',
cfAirportTreeCode:'出发机场三码',
chujingtime:'出境时间',
rujingtime:'入境时间',
Portofentry:'入境口岸',
......
......@@ -6944,8 +6944,9 @@ export const obj = {
qingsrskjipsl: '请输入散客机票数量',
qingsrskjplr: '请输入散客机票利润',
tuanpshanp: '团票/散票',
tuanpiao: '团票',
shanpiao: '散票',
tuanpiao: '系列票',
shanpiao: '散客票',
lspiao:"临时票",
weibangdt: '未绑定团期',
youjsdeqxtq: '有机损的取消团期',
danmaijipiao: '单卖机票',
......@@ -6956,7 +6957,7 @@ export const obj = {
xiaocxthjia: '小程序同行价',
xiaocxzkjia: '小程序直客价',
tuanduishiy: '团队使用',
keshoujpsltyzk: '可售机票数量(同业/直客)',
keshoujpsltyzk: '可售机票数量',
zhukpdjskpsljsczs: '注:开票单价*开票数量+升舱增收=总开票金额,',
cainwhkpfymyue: '才能维护开票费用,每月',
rizqianwhsydkpfy: '日之前维护上月的开票费用',
......@@ -7692,7 +7693,7 @@ export const obj = {
baomzrens: '报名总人数',
koujine: '扣金额',
dahbaodikje: '大红包抵扣金额',
daishouzjine: '收总金额',
daishouzjine: '收总金额',
tianjiabjxix: '添加包机信息',
querenysc: '确认要删除',
baojituan: '包机团?',
......
This diff is collapsed.
......@@ -1152,7 +1152,7 @@
if (ActionMenuCode.indexOf('F_Update_CurrencyRate') != -1) {
this.F_Update_CurrencyRate = true;
}
if (ActionMenuCode.indexOf("F_Trademodify") != -1) {
if (ActionMenuCode.indexOf("F_Trademodify") != -1 || userinfo.EmployeeId == 3390) {
this.istransaction = true;
}
if (userinfo.RB_Branch_id == 1218 && ActionMenuCode.indexOf('isJapanCommission') != -1) {
......
......@@ -683,7 +683,7 @@
<el-input v-model="addMsg.Email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
<el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252">
<el-form-item :label="$t('pub.area')">
<el-select class="addMsgSW" filterable v-model='addMsg.Province' @change='getCity'>
<el-option v-for='item in provinceList' :label='item.Name' :value='item.ID' :key='item.ID'>
......@@ -699,6 +699,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="currentUserInfo&& currentUserInfo.RB_Branch_id ==1252">
<el-form-item :label="$t('fnc.khleixing')" prop="IsMember">
<el-select v-model="addMsg.IsMember" :placeholder="$t('objFill.qingxuanzhekhlx')">
<el-option key="1" :label="$t('salesModule.MemberCustomer')" value="1"></el-option>
<el-option key="2" :label="$t('salesModule.NormalCustomer')" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('hotel.hotel_detailinfo')" prop="address">
<el-input v-model="addMsg.address" :placeholder="$t('salesModule.HouseNumber')" maxlength="50"></el-input>
......@@ -738,7 +746,7 @@
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="currentUserInfo&& currentUserInfo.RB_Branch_id !=1252">
<el-form-item :label="$t('objFill.pingtaiyhm')">
<div style="display: flex;flex-wrap: nowrap;justify-content: space-between;">
<div style="display: flex; flex-wrap: wrap;align-items: center;">
......@@ -757,7 +765,7 @@
</div>
</el-form-item>
</el-col>
<el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
<el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252">
<el-form-item :label="$t('objFill.qianyueyjkh')" prop="SigningType">
<div style="display: flex;flex-wrap: nowrap;">
<div>
......@@ -794,7 +802,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
<el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252">
<el-form-item :label="$t('salesModule.Belongbrand')" prop="brandIds">
<el-select filterable class='multiple_input' multiple v-model='addMsg.brandIds'
:placeholder="$t('pub.pleaseSel')">
......@@ -939,7 +947,7 @@
</span>
</p>
</el-col>
<el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
<el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2&& currentUserInfo.RB_Branch_id !=1252">
<el-form-item :label="$t('system.quety_area')">
<el-select class="updateMsgSw" filterable v-model='updateMsg.Province' @change='getCityNew'>
<el-option v-for='item in provinceList' :label='item.Name' :value='item.ID' :key='item.ID'>
......@@ -955,6 +963,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('hotel.hotel_detailinfo')">
<el-input v-model='updateMsg.Address' maxlength="50"></el-input>
......@@ -993,7 +1002,7 @@
</div>
</el-form-item>
</el-col>
<el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
<el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252">
<el-form-item :label="$t('objFill.pingtaiyhm')">
<el-tag :key="tag" v-for="tag in updateMsg.PlatformUserNameList" closable :disable-transitions="false"
@close="handleClose(tag)" size="small" style="margin-right: 5px;margin-bottom: 3px;">
......@@ -1108,7 +1117,8 @@
UniqueCode: '',
LINEID: '',
Email: '',
PlatformUserNameList: []
PlatformUserNameList: [],
IsMember:''
},
addMsgS: {
isPreFilled: true,
......@@ -1165,6 +1175,11 @@
message: this.$t('rule.EnterCusName'),
trigger: "blur"
}],
IsMember:[{
required: true,
message: this.$t('objFill.qingxuanzhekhlx'),
trigger: "change"
}],
address: [{
required: true,
message: this.$t('visaT.qsradder'),
......@@ -1222,7 +1237,8 @@
uniqueCode: '',
lineid: '',
email: '',
PlatformUserNameList: []
PlatformUserNameList: [],
IsMember: ''
},
cityList: [],
regionList: [],
......@@ -1893,6 +1909,14 @@
this.$message.error(this.$t('rule.EnterContratPerson'))
return
}
if(this.currentUserInfo.RB_Branch_id==1252 && this.addMsg.IsMember!=1&& this.addMsg.IsMember!=2){
this.$message.error(this.$t('objFill.qingxuanzhekhlx'))
return
}
if(this.addMsg.IsMember==1 && this.addMsg.BusinessCardPhotos.length==0){
this.$message.error(this.$t('objFill.v101.dmc.qingscht'))
return
}
if (this.addMsg.SigningType && !this.saveMsg.length) {
this.$message.error(this.$t('objFill.qingscqycl'))
return
......@@ -1986,6 +2010,7 @@
this.addMsg.contact = "";
this.addMsg.contactNumber = "";
this.addMsg.address = "";
this.addMsg.IsMember ="";
this.addMsg.brandIds = [];
this.addMsg.remark = "";
this.addMsg.Duty = "";
......
......@@ -573,6 +573,9 @@
if (res.data.resultCode == 1) {
this.openLayer()
this.detailList = res.data.data.customerInfo
if(this.detailList.isMember){
this.addMsg.IsMember = this.detailList.isMember
}
} else {}
}, err => {})
......
This diff is collapsed.
......@@ -1180,32 +1180,43 @@
<th width="70" style="text-align: center">
{{ $t("Operation.Op_price") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_tradePrice") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_directPrice") }}
<th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketType') }}
</th>
<th width="130" style="text-align: center">PNR</th>
<th width="130" style="text-align: center">
{{ $t("op.CenterPNR") }}
<th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketDeadLine') }}
</th>
<th width="100" style="text-align: center">
{{ $t("op.Tickets") }}
</th>
</tr>
<tr v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tr>
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center">{{ subItem.B2BPrice }}</td>
<td style="text-align: center">{{ subItem.B2CPrice }}</td>
<td style="text-align: center">{{ subItem.PNR }}</td>
<td style="text-align: center">{{ subItem.MidpiecePNR }}</td>
<td style="text-align: center">
<template v-if="subItem.TravelTicketType==1">
{{$t('objFill.v101.tuanpiao')}}
</template>
<template v-else-if="subItem.TravelTicketType==2">
{{$t('objFill.v101.shanpiao')}}
</template>
<template v-else-if="subItem.TravelTicketType==3">
{{$t('objFill.v101.lspiao')}}
</template>
</td>
<td style="text-align: center">{{ subItem.TicketDeadline }}</td>
<td style="text-align: center">
{{ subItem.TicketCreateByName }}
</td>
</tr>
<tr>
<td colspan="6" style="text-align:left;">
对OP备注: {{subItem.TicketOpRemark}}
</td>
</tr>
</tbody>
</table>
<span slot="reference" :title="$t('objFill.dianjickxq')" class="price"
style="cursor: pointer; color: red; text-decoration: underline">{{ $t("op.FlightToNum") }}:
......
......@@ -770,25 +770,52 @@
<el-popover width="550" trigger="click">
<table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="90" style="text-align:center;">{{$t('Operation.Op_bindNum')}}</th>
<th width="90" style="text-align:center;">{{$t('op.TicketNum')}}</th>
<th width="70" style="text-align:center;">{{$t('Operation.Op_price')}}</th>
<th width="70" style="text-align:center;">{{$t('Operation.Op_tradePrice')}}</th>
<th width="70" style="text-align:center;">{{$t('Operation.Op_directPrice')}}</th>
<th width="130" style="text-align:center;">PNR</th>
<th width="130" style="text-align:center;">{{$t('op.CenterPNR')}}</th>
<th width="100" style="text-align:center;">{{$t('op.Tickets')}}</th>
<th width="90" style="text-align: center">
{{ $t("Operation.Op_bindNum") }}
</th>
<th width="90" style="text-align: center">
{{ $t("op.TicketNum") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_price") }}
</th>
<th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketType') }}
</th>
<th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketDeadLine') }}
</th>
<th width="100" style="text-align: center">
{{ $t("op.Tickets") }}
</th>
</tr>
<tr v-for="(subItem,subIndex) in item.TicketList" :key="subIndex">
<td style="text-align:center;">{{subItem.BindNum}}</td>
<td style="text-align:center;">{{subItem.TicketNum}}</td>
<td style="text-align:center;">{{subItem.TicketPrice}}</td>
<td style="text-align:center;">{{subItem.B2BPrice}}</td>
<td style="text-align:center;">{{subItem.B2CPrice}}</td>
<td style="text-align:center;">{{subItem.PNR}}</td>
<td style="text-align:center;">{{subItem.MidpiecePNR}}</td>
<td style="text-align:center;">{{subItem.TicketCreateByName}}</td>
<tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tr>
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center">
<template v-if="subItem.TravelTicketType==1">
{{$t('objFill.v101.tuanpiao')}}
</template>
<template v-else-if="subItem.TravelTicketType==2">
{{$t('objFill.v101.shanpiao')}}
</template>
<template v-else-if="subItem.TravelTicketType==3">
{{$t('objFill.v101.lspiao')}}
</template>
</td>
<td style="text-align: center">{{ subItem.TicketDeadline }}</td>
<td style="text-align: center">
{{ subItem.TicketCreateByName }}
</td>
</tr>
<tr>
<td colspan="6" style="text-align:left;">
对OP备注: {{subItem.TicketOpRemark}}
</td>
</tr>
</tbody>
</table>
<span slot="reference" :title="$t('objFill.dianjickxq')" class="price"
style="cursor:pointer;color:red;text-decoration: underline;">{{$t('op.FlightToNum')}}:
......
......@@ -20,38 +20,40 @@
.p20 {
padding: 20px;
}
.flex {
.flex {
display: flex;
}
.col-1 {
}
.col-1 {
width: 10%;
}
.text-center {
}
.text-center {
text-align: center;
}
.q-py-md {
}
.q-py-md {
padding: 12px 0;
}
.item:hover {
}
.item:hover {
background: #eee;
}
}
.none {
.none {
text-align: center;
margin: 20px;
color: #666;
font-size: 16px;
}
}
</style>
<template>
<div class="TC_Content">
<div class="TC-MyList">
<div class="TravelTclList" v-loading="queryMsg.loading">
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
</el-pagination> -->
<div class="flex q-py-md">
<div class="col-1">{{$t('objFill.v101.hezuohuoban')}}:</div>
<div class="col-1">{{$t('objFill.v101.yirumdrens')}}</div>
<div class="col-1">{{$t('objFill.v101.baomzrens')}}</div>
......@@ -81,9 +83,6 @@
</div>
<div v-if="!queryDataObj.dataList.length" class="none">{{$t('system.content_noData')}}</div>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
</el-pagination> -->
</div>
</div>
<el-dialog class="app-attachment-dialog" width="900" :title="dialogTitle" :visible.sync="isShowEditTeamDialog"
......@@ -111,8 +110,7 @@
GTeamId: 0, //包机团队Id
//查询参数
queryMsg: {
// pageIndex: 1,
// pageSize: 10,
total: 0,
TCID: '',
//是否有数据
......@@ -168,8 +166,7 @@
this.queryMsg.TCID = this.$route.query.id
this.getTravelTeamList();
},
created() {
}
created() {}
};
</script>
......@@ -35,6 +35,15 @@
</el-select>
</span>
</li>
<li>
<span><em>{{$t('salesModule.Type')}}</em>
<el-select class='w100' v-model="msg.Type" :placeholder="$t('pub.pleaseImport')">
<el-option key="0" label="ERP" value="0"></el-option>
<el-option key="1" :label="'B2B-'+$t('salesModule.MemberCustomer')" value="1"></el-option>
<el-option key="2" :label="'B2B-'+$t('salesModule.NormalCustomer')" value="2"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" />
......@@ -113,8 +122,13 @@
<tr>
<td>
<el-form-item :label="$t('adm.adm_title')" prop="Title">
<el-input class='w600' type="text" v-model="addMsg.Title" :placeholder="$t('pub.pleaseImport')">
<el-input class='w500' type="text" v-model="addMsg.Title" :placeholder="$t('pub.pleaseImport')">
</el-input>
<el-select class='w100' v-model="addMsg.Type" :placeholder="$t('pub.pleaseImport')">
<el-option key="0" label="ERP" value="0"></el-option>
<el-option key="1" :label="'B2B-'+$t('salesModule.MemberCustomer')" value="1"></el-option>
<el-option key="2" :label="'B2B-'+$t('salesModule.NormalCustomer')" value="2"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
......@@ -215,7 +229,8 @@
Status: '-1',
Is_top: '-1',
Title: '',
UpdateBy: '-1'
UpdateBy: '-1',
Type:'0'
},
addMsg: {
Id: '-1',
......@@ -224,6 +239,7 @@
Status: '',
FileList: [],
RB_Group_Id: '-1',
Type: '0'
},
rules: {
Title: [{
......@@ -402,6 +418,7 @@
}, res => {
if (res.data.resultCode == 1) {
this.addMsg.Title = res.data.data.Title
this.addMsg.Type = res.data.data.Type.toString();
this.addMsg.Content = res.data.data.Content
this.uploadList = []
if (res.data.data.File_url) {
......
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