Skip to content

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

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

parents 90ee1d30 4ffe70e3
Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 47 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ f8a01c5b
...@@ -1464,7 +1464,19 @@ export default { ...@@ -1464,7 +1464,19 @@ export default {
var gjzd = guojizhongduan==''?'':'国际中段:'+guojizhongduan; var gjzd = guojizhongduan==''?'':'国际中段:'+guojizhongduan;
var sj = shuijin==''?'':'税金:'+shuijin; var sj = shuijin==''?'':'税金:'+shuijin;
var sc = shengcang==''?'':'升舱:'+shengcang; var sc = shengcang==''?'':'升舱:'+shengcang;
this.Description= gj+`\n`+gn+`\n`+gjzd+`\n`+sj+`\n`+sc if(gj!=''){
gj = gj+`\n`
}
if(gn!=''){
gn = gn+`\n`
}
if(gjzd!=''){
gjzd = gjzd+`\n`
}
if(sj!=''){
sj = sj+`\n`
}
this.Description= gj+gn+gjzd+sj+sc
} }
} }
}, },
......
src/components/FinancialModule/sellCommissionRules.vue
View file @ f8a01c5b
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
v-model="item.BaseVariable" v-model="item.BaseVariable"
class="w200" class="w200"
> >
<template slot="append">{{addMsg.CommissionType==2?'%':'/'+this.$t('hotel.hotel_people')}}</template> <template slot="append">{{addMsg.CommissionType==2?'%':'/'+$t('hotel.hotel_people')}}</template>
</el-input> </el-input>
</td> </td>
<td> <td>
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
> >
<template slot="append"> <template slot="append">
<el-select v-model="item.AddedMethod" class> <el-select v-model="item.AddedMethod" class>
<el-option :label="'/'+this.$t('hotel.hotel_people')" :value="2"></el-option> <el-option :label="'/'+$t('hotel.hotel_people')" :value="2"></el-option>
<el-option label="%" :value="1"></el-option> <el-option label="%" :value="1"></el-option>
</el-select> </el-select>
</template> </template>
......
src/components/Ticketing/PassengerList.vue
View file @ f8a01c5b
...@@ -528,26 +528,29 @@ ...@@ -528,26 +528,29 @@
this.jipiaoObj.shengcangArr.push(x.GuestName); this.jipiaoObj.shengcangArr.push(x.GuestName);
} }
}) })
sessionStorage.setItem("guoji", JSON.stringify(this.jipiaoObj)); if(this.jipiaoObj.guojiArr.length==0&&this.jipiaoObj.guoneiArr.length==0&&this.jipiaoObj.gjzdArr.length==0&&this.jipiaoObj.shuijinArr.length==0&&this.jipiaoObj.shengcangArr.length==0){
this.Error('请选择旅客名单');
let orderObj = { }else{
OrderID: 0, sessionStorage.setItem("guoji", JSON.stringify(this.jipiaoObj));
OrderSource: 4, let orderObj = {
Obj: JSON.parse(this.$route.query.Obj), OrderID: 0,
SourceID: this.$route.query.id, OrderSource: 4,
TCIDList: JSON.parse(this.$route.query.TCIDList), Obj: JSON.parse(this.$route.query.Obj),
companyIDList: JSON.parse(this.$route.query.companyIDList), SourceID: this.$route.query.id,
isFromPassenger: true, TCIDList: JSON.parse(this.$route.query.TCIDList),
} companyIDList: JSON.parse(this.$route.query.companyIDList),
this.$router.push({ isFromPassenger: true,
name: 'ChoiceAddFinancialDocuments',
query: {
"Type": 2,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
} }
}); this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query: {
"Type": 2,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
}
}, },
//设置全选 //设置全选
checkAllbox(x, y) { checkAllbox(x, y) {
......
src/components/dmc/manager/LeaderHander.vue
View file @ f8a01c5b
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
} }
.Lh_detailTable tr td > div { /* .Lh_detailTable tr td > div {
margin-bottom: 10px; margin-bottom: 10px;
} } */
.Lh_TabTitle { .Lh_TabTitle {
width: 100%; width: 100%;
...@@ -88,13 +88,6 @@ ...@@ -88,13 +88,6 @@
background-color: #fff; background-color: #fff;
padding: 20px 10px; padding: 20px 10px;
} }
.LH_btmTable {
position: absolute;
bottom: 10px;
width: auto;
}
.LH_btnList { .LH_btnList {
position: absolute; position: absolute;
top: 20px; top: 20px;
...@@ -160,7 +153,7 @@ ...@@ -160,7 +153,7 @@
<tr> <tr>
<td> <td>
小费：金额 小费：金额
<el-input type="text" class="w128" v-model="sendReceiptData.SendairportDelivery.Trip"/> <el-input type="text" class="w128" v-model="sendReceiptData.Trip"/>
元/位 元/位
</td> </td>
<td> <td>
...@@ -171,18 +164,18 @@ ...@@ -171,18 +164,18 @@
<td colspan="7"> <td colspan="7">
总计： 总计：
<el-input type="text" class="w120"/> <el-input type="text" class="w120"/>
元 万日元
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
团款： 团款：
<el-input type="text" class="w160" v-model="sendReceiptData.GroupMoney"/> <el-input type="text" class="w160" v-model="sendReceiptData.GroupMoney"/>
日币 人民币
</td> </td>
<td colspan="8"> <td colspan="8">
名单表费： 名单表费：
<el-input type="text" class="w135" v-model="sendReceiptData.SendairportDelivery.TableFee"/> <el-input type="text" class="w135" v-model="sendReceiptData.TableFee"/>
元 元
</td> </td>
</tr> </tr>
...@@ -192,18 +185,231 @@ ...@@ -192,18 +185,231 @@
<th colspan="9">查核明细</th> <th colspan="9">查核明细</th>
</tr> </tr>
<tr> <tr>
<th width="180">项目</th> <th width="250">项目</th>
<th width="60">操作</th> <th width="60">操作</th>
<th width="60">领队</th> <th with="150">项目</th>
<th with="260">项目</th>
<th width="60">操作</th> <th width="60">操作</th>
<th width="60">领队</th> <th width="250">项目</th>
<th width="160">项目</th>
<th width="60">操作</th> <th width="60">操作</th>
<th width="60">领队</th>
</tr> </tr>
<tr> <tr>
<td> <td>
<div class="Lh_TabTitle">护照</div>
<div>
<span class="Lh_ComSpan">有效护照原件</span>共
<el-input type="text" class="w60" v-model="sendReceiptData.ValidPassport"/>
本
</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>景点变更与自费书</td>
<td>
<input type="checkbox"/>
</td>
<td rowspan="3">
团体分房表
</td>
<td rowspan="3">
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>
<div>
<span class="Lh_ComSpan">旧护照原件</span>共
<el-input type="text" class="w60" v-model="sendReceiptData.OldPassport"/>
本
</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>旅客联系电话</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>
<div>
<span class="Lh_ComSpan">自带</span>共
<el-input type="text" class="w60" v-model="sendReceiptData.BringOwn"/>
位
</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>海关出入境名单</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>护照首页及复印件</td>
<td>
<input type="checkbox"/>
</td>
<td>团体关系表</td>
<td>
<input type="checkbox"/>
</td>
<td>
<div>
<span class="Lh_ComSpan" style="width:60px;">餐单</span>共
<el-input type="text" class="w60"/>
张
</div>
</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>
<div>团体签证</div>
<div>
<span class="Lh_ComSpanTwo">1.签证 共<el-input type="text" class="w60" v-model="sendReceiptData.Visa"/>本</span>
</div>
<div>
<span class="Lh_ComSpanTwo">2.送签行程表</span>
</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>
<div>暂住证</div>
<div>借调证明</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>
<div style="border-bottom:1px solid black;padding-bottom:5px;">
意见调查表 共
<el-input type="text" class="w60" v-model="sendReceiptData.Questionnaire"/>
份
</div>
<div style="text-align:left;padding-top:5px;">
告知书+安全信息卡
</div>
</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>团体签证表</td>
<td>
<input type="checkbox"/>
</td>
<td>中文出团通知（行程表）</td>
<td>
<input type="checkbox"/>
</td>
<td>领队证</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>
<div>机票</div>
<div>
<span class="Lh_ComSpan">国际段</span>共
<el-input type="text" class="w60"/>张
</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>
<div>日文出团通知（行程表）</div>
<div>1.酒店手配书</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>
<div>领队WORKING FILE</div>
<div>1.导游报账单</div>
</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>
<div>
<span class="Lh_ComSpan">2.F.I.T</span>共
<el-input type="text" class="w60"/>张
</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>
2.用车手配书
</td>
<td>
<input type="checkbox"/>
</td>
<td>
2.进店表
</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>
<div>
<span class="Lh_ComSpan">3.凑票</span>共
<el-input type="text" class="w60"/>张
</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>
3.司机信息
</td>
<td>
<input type="checkbox"/>
</td>
<td>
3.归国报告书
</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<tr>
<td>
<div>
<span class="Lh_ComSpan">4.机票行程单</span>
</div>
</td>
<td>
<input type="checkbox"/>
</td>
<td>
4.中日文行程核对
</td>
<td>
<input type="checkbox"/>
</td>
<td>
4.领队日志
</td>
<td>
<input type="checkbox"/>
</td>
</tr>
<!-- <td>
<div class="Lh_TabTitle">护照</div> <div class="Lh_TabTitle">护照</div>
<div> <div>
<span class="Lh_ComSpan">有效护照原件</span>共 <span class="Lh_ComSpan">有效护照原件</span>共
...@@ -218,7 +424,7 @@ ...@@ -218,7 +424,7 @@
<div> <div>
<span class="Lh_ComSpan">自带</span>共 <span class="Lh_ComSpan">自带</span>共
<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.BringOwn"/> <el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.BringOwn"/>
本 位
</div> </div>
</td> </td>
<td></td> <td></td>
...@@ -326,7 +532,15 @@ ...@@ -326,7 +532,15 @@
</td> </td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr> -->
</table>
<table>
<tr>
<td>备注</td>
<td>
<input type="textarea" :row="10" />
</td>
</tr>
</table> </table>
<table class="Lh_Toptable LH_LastTable" style="margin-top:30px;"> <table class="Lh_Toptable LH_LastTable" style="margin-top:30px;">
<tr> <tr>
...@@ -347,21 +561,26 @@ ...@@ -347,21 +561,26 @@
</tr> </tr>
<tr> <tr>
<td colspan="9"> <td colspan="9">
3 领队归国请务必提供所有消费明细凭据报账。 3 领队回国请务必提供所有消费明细凭据报账。
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="9"> <td colspan="9">
4 领队务必当场确认护照、签证和机票行程单，请仔细核对上面信息，若有错误，请及时将OP票务联系。 4.领队务必当场确认护照、签证和机票行程单，请仔细核对上面信息，若有错误，请及时将OP票务联系。
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="9"> <td colspan="9">
5 如有客人出发当天没到机场（NO SHOW）一定要当日马上回去线控/OP 5.如有客人出发当天没到机场（NO SHOW）一定要当日马上回去线控/OP
</td>
</tr>
<tr>
<td colspan="9">
6.领队出团带出的领队旗和手配旗，结束后需带回，押金50元。
</td> </td>
</tr> </tr>
</table> </table>
<table class="Lh_Toptable LH_btmTable"> <table class="Lh_Toptable">
<tr> <tr>
<td colspan="9">查核无误后，请在以下栏位签名及压日期：</td> <td colspan="9">查核无误后，请在以下栏位签名及压日期：</td>
</tr> </tr>
...@@ -413,6 +632,8 @@ ...@@ -413,6 +632,8 @@
this.sendReceiptData = res.data.data; this.sendReceiptData = res.data.data;
console.log(this.sendReceiptData,'sssssssssssss'); console.log(this.sendReceiptData,'sssssssssssss');
this.isShow=true; this.isShow=true;
}else{
this.Error(res.data.message);
} }
}, },
err => { err => {
......
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