Skip to content

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

解决冲突

parents 692c8132 494bd448
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 225 deletions
src/components/dmc/manager/LeaderHander.vue
View file @ 62c5f619
...@@ -41,19 +41,14 @@ ...@@ -41,19 +41,14 @@
.Lh_detailTable td { .Lh_detailTable td {
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
text-align: center; text-align: left;
padding: 10px 0; padding: 10px 5px;
} }
.Lh_detailTable th { .Lh_detailTable th {
background-color: #E6E6E6; background-color: #E6E6E6;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
} }
/* .Lh_detailTable tr td > div {
margin-bottom: 10px;
} */
.Lh_TabTitle { .Lh_TabTitle {
width: 100%; width: 100%;
text-align: center; text-align: center;
...@@ -80,7 +75,9 @@ ...@@ -80,7 +75,9 @@
.LH_LastTable tr { .LH_LastTable tr {
height: 30px !important; height: 30px !important;
} }
.LH_commonCenter{
text-align: center!important;
}
.LH_contentDiv { .LH_contentDiv {
width: 1000px; width: 1000px;
height: 1500px; height: 1500px;
...@@ -111,17 +108,17 @@ ...@@ -111,17 +108,17 @@
<tr> <tr>
<td colspan="9"> <td colspan="9">
<div style="float:left;">团名：</div> <div style="float:left;">团名：</div>
<div style="float:left;width:95%;">{{sendReceiptData.Title}}</div> <div style="float:left;width:95%;">{{sendReceiptData.TeamTitle}}</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="300"> <td width="300">
订团号：{{NewCombinationNum}}
</td>
<td colspan="8" style="display:none;">
团号： 团号：
<el-input type="text" class="w160" v-model="sendReceiptData.TCNUM"/> <el-input type="text" class="w160" v-model="sendReceiptData.TCNUM"/>
</td> </td>
<td colspan="8">
订团号：{{NewCombinationNum}}
</td>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -136,17 +133,17 @@ ...@@ -136,17 +133,17 @@
<tr> <tr>
<td> <td>
人数：{{sendReceiptData.StartCityName}}出发 人数：{{sendReceiptData.StartCityName}}出发
<el-input type="text" class="w100" v-model="sendReceiptData.CityGuestNum"/> <el-input type="text" class="w100" v-model="sendReceiptData.StartCityNum"/>
位 位
</td> </td>
<td width="250"> <td width="250">
其他：凑票 其他：凑票
<el-input type="text" class="w135" v-model="sendReceiptData.TogetherGuestNum"/> <el-input type="text" class="w135" v-model="sendReceiptData.TogetherNum"/>
位 位
</td> </td>
<td colspan="7"> <td colspan="7">
外站JOIN 外站JOIN
<el-input type="text" class="w100" v-model="sendReceiptData.OutsideGuestNum"/> <el-input type="text" class="w100" v-model="sendReceiptData.OutsideNum"/>
位 位
</td> </td>
</tr> </tr>
...@@ -158,19 +155,19 @@ ...@@ -158,19 +155,19 @@
</td> </td>
<td> <td>
人数：共 人数：共
<el-input type="text" class="w150" v-model="sendReceiptData.TotalGuestNum"/> <el-input type="text" class="w150" v-model="sendReceiptData.TripNum"/>
位 位
</td> </td>
<td colspan="7"> <td colspan="7">
总计： 总计：
<el-input type="text" class="w120"/> <el-input type="text" class="w120" v-model="sendReceiptData.TripTotal"/>
万日元 万日元
</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.TeamPrice"/>
人民币 人民币
</td> </td>
<td colspan="8"> <td colspan="8">
...@@ -185,12 +182,15 @@ ...@@ -185,12 +182,15 @@
<th colspan="9">查核明细</th> <th colspan="9">查核明细</th>
</tr> </tr>
<tr> <tr>
<th width="250">项目</th> <th width="220">项目</th>
<th width="60">操作</th> <th width="60">操作</th>
<th with="150">项目</th> <th width="60">领队</th>
<th with="220">项目</th>
<th width="60">操作</th> <th width="60">操作</th>
<th width="250">项目</th> <th width="60">领队</th>
<th width="220">项目</th>
<th width="60">操作</th> <th width="60">操作</th>
<th width="60">领队</th>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -201,19 +201,22 @@ ...@@ -201,19 +201,22 @@
本 本
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.EffectivePassport" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td>景点变更与自费书</td> <td></td>
<td> <td class="LH_commonCenter">景点变更与自费书</td>
<input type="checkbox"/> <td class="LH_commonCenter">
<el-checkbox v-model="sendReceiptData.ScenicChangeAndSelfFee" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td rowspan="3"> <td></td>
<td rowspan="3" class="LH_commonCenter">
团体分房表 团体分房表
</td> </td>
<td rowspan="3"> <td rowspan="3" class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.TeamHouse" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td rowspan="3"></td>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -223,13 +226,15 @@ ...@@ -223,13 +226,15 @@
本 本
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.OldEffectivePassport" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td>旅客联系电话</td> <td></td>
<td> <td class="LH_commonCenter">旅客联系电话</td>
<input type="checkbox"/> <td class="LH_commonCenter">
<el-checkbox v-model="sendReceiptData.GuestTel" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -239,37 +244,42 @@ ...@@ -239,37 +244,42 @@
位 位
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.SelfEffectivePassport" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td>海关出入境名单</td> <td></td>
<td> <td class="LH_commonCenter">海关出入境名单</td>
<input type="checkbox"/> <td class="LH_commonCenter">
<el-checkbox v-model="sendReceiptData.CustomsInOut" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
</tr> </tr>
<tr> <tr>
<td>护照首页及复印件</td> <td class="LH_commonCenter">护照首页复印件</td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.PassportCopy" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td>团体关系表</td> <td></td>
<td> <td class="LH_commonCenter">团体关系表</td>
<input type="checkbox"/> <td class="LH_commonCenter">
<el-checkbox v-model="sendReceiptData.TeamRelation" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
<td> <td>
<div> <div>
<span class="Lh_ComSpan" style="width:60px;">餐单</span>共 <span class="Lh_ComSpan" style="width:60px;">餐单</span>共
<el-input type="text" class="w60"/> <el-input type="text" class="w60" v-model="sendReceiptData.DinnerCount"/>
张 张
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.DinnerMenu" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div>团体签证</div> <div class="Lh_TabTitle">团体签证</div>
<div> <div>
<span class="Lh_ComSpanTwo">1.签证 共<el-input type="text" class="w60" v-model="sendReceiptData.Visa"/>本</span> <span class="Lh_ComSpanTwo">1.签证 共<el-input type="text" class="w60" v-model="sendReceiptData.Visa"/>本</span>
</div> </div>
...@@ -277,115 +287,130 @@ ...@@ -277,115 +287,130 @@
<span class="Lh_ComSpanTwo">2.送签行程表</span> <span class="Lh_ComSpanTwo">2.送签行程表</span>
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.IsVisa" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
<td> <td>
<div>暂住证</div> <div class="Lh_TabTitle">暂住证</div>
<div>借调证明</div> <div class="Lh_TabTitle">借调证明</div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.TempResidentialPermit" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td> <td></td>
<div style="border-bottom:1px solid black;padding-bottom:5px;"> <td style="padding:0">
<div style="border-bottom:1px solid #d1d1d1;padding:0 0 5px 5px;">
意见调查表 共 意见调查表 共
<el-input type="text" class="w60" v-model="sendReceiptData.Questionnaire"/> <el-input type="text" class="w60" v-model="sendReceiptData.Questionnaire"/>
份 份
</div> </div>
<div style="text-align:left;padding-top:5px;"> <div style="padding:5px 0 0 5px;">
告知书+安全信息卡 告知书+安全信息卡
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.OpinionPolls" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
</tr> </tr>
<tr> <tr>
<td>团体签证表</td> <td class="LH_commonCenter">团体签证表</td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.IsTeamVisa" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td>中文出团通知（行程表）</td> <td></td>
<td> <td class="LH_commonCenter">中文出团通知（行程表）</td>
<input type="checkbox"/> <td class="LH_commonCenter">
<el-checkbox v-model="sendReceiptData.ChineseOutNotice" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td>领队证</td> <td></td>
<td> <td class="LH_commonCenter">领队证</td>
<input type="checkbox"/> <td class="LH_commonCenter">
<el-checkbox v-model="sendReceiptData.LeaderCertificate" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div>机票</div> <div class="Lh_TabTitle">机票</div>
<div> <div>
<span class="Lh_ComSpan">国际段</span>共 <span class="Lh_ComSpan">国际段</span>共
<el-input type="text" class="w60"/>张 <el-input type="text" class="w60" v-model="sendReceiptData.LuggageCard"/>张
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.IsInternationalTicket" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
<td> <td>
<div>日文出团通知（行程表）</div> <div>日文出团通知（行程表）</div>
<div>1.酒店手配书</div> <div>1.酒店手配书</div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.HotelSouPei" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
<td> <td>
<div>领队WORKING FILE</div> <div>领队WORKING FILE</div>
<div>1.导游报账单</div> <div>1.导游报账单</div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.GuideExpense" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div> <div>
<span class="Lh_ComSpan">2.F.I.T</span>共 <span class="Lh_ComSpan">2.F.I.T</span>共
<el-input type="text" class="w60"/>张 <el-input type="text" class="w60" v-model="sendReceiptData.FIT"/>张
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.IsFITTicket" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
<td> <td>
2.用车手配书 2.用车手配书
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.BusSouPei" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
<td> <td>
2.进店表 2.进店表
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.InShop" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div> <div>
<span class="Lh_ComSpan">3.凑票</span>共 <span class="Lh_ComSpan">3.凑票</span>共
<el-input type="text" class="w60"/>张 <el-input type="text" class="w60" v-model="sendReceiptData.TogetherTicket"/>张
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.IsTogetherTicket" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
<td> <td>
3.司机信息 3.司机信息
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.DriverInfo" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
<td> <td>
3.归国报告书 3.归国报告书
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.BackCountry" :true-label='1' :false-label='0'></el-checkbox>
</td> </td>
<td></td>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -393,152 +418,31 @@ ...@@ -393,152 +418,31 @@
<span class="Lh_ComSpan">4.机票行程单</span> <span class="Lh_ComSpan">4.机票行程单</span>
</div> </div>
</td> </td>
<td> <td class="LH_commonCenter">
<input type="checkbox"/> <el-checkbox v-model="sendReceiptData.IsTicketTrip" :true-label='1' :false-label='0'></el-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>
<span class="Lh_ComSpan">有效护照原件</span>共
<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.ValidPassport"/>
本
</div>
<div>
<span class="Lh_ComSpan">旧护照原件</span>共
<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.OldPassport"/>
本
</div>
<div>
<span class="Lh_ComSpan">自带</span>共
<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.BringOwn"/>
位
</div>
</td>
<td></td>
<td></td>
<td>
<div>存款证明单</div>
<div>旅客职业背景表</div>
<div>边防出入境名单</div>
</td> </td>
<td></td> <td></td>
<td></td>
<td> <td>
团体分房表 4.中日文行程核对
</td> </td>
<td></td> <td class="LH_commonCenter">
<td></td> <el-checkbox v-model="sendReceiptData.ChineseAndJapaneseTripCheck" :true-label='1' :false-label='0'></el-checkbox>
</tr>
<tr>
<td>护照首页复印件</td>
<td></td>
<td></td>
<td>团体关系表</td>
<td></td>
<td></td>
<td>
<div>
<span>行李牌</span>
共
<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.LuggageCard"/>份
</div>
</td> </td>
<td></td> <td></td>
<td></td>
</tr>
<tr>
<td> <td>
<div>团体签证</div> 4.领队日志
<div>
<span class="Lh_ComSpanTwo">1.签证 共<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.Visa"/>本</span>
</div>
<div>
<span class="Lh_ComSpanTwo">2.送签行程表</span>
</div>
</td> </td>
<td></td> <td class="LH_commonCenter">
<td></td> <el-checkbox v-model="sendReceiptData.LeaderLog" :true-label='1' :false-label='0'></el-checkbox>
<td>
<div>暂住证</div>
<div>借调证明</div>
</td> </td>
<td></td> <td></td>
<td></td>
<td>
<div>
意见调查表 共
<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.Questionnaire"/>
份
</div>
</td>
<td></td>
<td></td>
</tr> </tr>
<tr>
<td>团体签证表</td>
<td></td>
<td></td>
<td>中文出团通知（行程表）</td>
<td></td>
<td></td>
<td>领队证</td>
<td></td>
<td></td>
</tr>
<tr>
<td>
<div>机票</div>
<div class="Lh_ComSpanThree">1.护照首页复印件</div>
<div class="Lh_ComSpanThree">2.F.I.T 共
<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.FIT"/>
张
</div>
<div class="Lh_ComSpanThree">3.凑票 共
<el-input type="text" class="w60" v-model="sendReceiptData.SendairportDelivery.TogetherTicket"/>
张
</div>
<div class="Lh_ComSpanThree">4.机票行程单</div>
</td>
<td></td>
<td></td>
<td>
<div>日文出团通知（行程表）</div>
<div class="Lh_ComSpanThree">1.酒店手配书</div>
<div class="Lh_ComSpanThree">2.用车手配表</div>
<div class="Lh_ComSpanThree">3.司机信息</div>
<div class="Lh_ComSpanThree">4.保险</div>
</td>
<td></td>
<td></td>
<td>
<div>领队WORKING FILE</div>
<div>1.游客告知书</div>
<div>2.安全信息卡</div>
<div>3.归国报告书</div>
<div>4.变更说明书</div>
</td>
<td></td>
<td></td>
</tr> -->
</table> </table>
<table> <table style="width:100%;margin-top:30px;font-size:12px;">
<tr> <tr>
<td>备注</td> <td width="30" style="vertical-align:top;">备注</td>
<td> <td>
<input type="textarea" :row="10" /> <el-input type="textarea" v-model="sendReceiptData.DRemark" resize='none' :rows="5" />
</td> </td>
</tr> </tr>
</table> </table>
...@@ -630,7 +534,7 @@ ...@@ -630,7 +534,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.sendReceiptData = res.data.data; this.sendReceiptData = res.data.data;
console.log(this.sendReceiptData,'sssssssssssss'); console.log("sendReceiptData",this.sendReceiptData);
this.isShow=true; this.isShow=true;
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
...@@ -641,7 +545,7 @@ ...@@ -641,7 +545,7 @@
); );
}, },
saveDelivery() { saveDelivery() {
var msg = this.sendReceiptData.SendairportDelivery; var msg = this.sendReceiptData;
this.apipost( this.apipost(
"dmcstatistics_post_SaveSendairportDelivery", "dmcstatistics_post_SaveSendairportDelivery",
msg, msg,
...@@ -649,6 +553,8 @@ ...@@ -649,6 +553,8 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success("保存成功"); this.Success("保存成功");
this.getLeaderGuideSendReceipt(); this.getLeaderGuideSendReceipt();
}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