Skip to content

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

领队导游，设置，列表调整

parent d3b32363
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 43 deletions
src/components/LeaderManagement/leaderArrangement.vue
View file @ fab47f50
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
height: 40px; height: 40px;
border-radius: 50%; border-radius: 50%;
margin-bottom: 5px; margin-bottom: 5px;
margin: 0 auto;
} }
.leaderArrangement .headerImg img { .leaderArrangement .headerImg img {
...@@ -60,10 +61,10 @@ ...@@ -60,10 +61,10 @@
.leaderArrangement .leaderInfo { .leaderArrangement .leaderInfo {
width: 100%; width: 100%;
height: 100px; height: 110px;
background-color: #fff; background-color: #fff;
margin-top: 20px; margin-top: 20px;
line-height: 100px; line-height: 110px;
border: 1px solid #dddddd; border: 1px solid #dddddd;
font-size: 12px; font-size: 12px;
} }
...@@ -399,11 +400,21 @@ ...@@ -399,11 +400,21 @@
<ul class="uu clearfix"> <ul class="uu clearfix">
<li class="Llist" v-for="leader in LeaderList" draggable="true" <li class="Llist" v-for="leader in LeaderList" draggable="true"
@dragstart="drag($event,leader.LeaderId,leader.Type)" :key="leader.subCode"> @dragstart="drag($event,leader.LeaderId,leader.Type)" :key="leader.subCode">
<div class="headerImg"> <el-tooltip class="item" effect="dark" placement="bottom">
<img v-if="!leader.EmPhoto" src="../../assets/img/default_head_img.jpg"> <div slot="content">
<img v-else :src="imgBeforeFile+leader.EmPhoto" :onerror='defaultImg' /> <span v-if="leader.SpareTel&&leader.SpareTel!=''">境外号：{{leader.SpareTel}}</span><br />
</div> <span v-if="leader.MobilePhone&&leader.MobilePhone!=''">手机号：{{leader.MobilePhone}}</span><br />
<span>{{leader.LeaderName}}</span> <span v-if="leader.Passport&&leader.Passport!=''">护照号：{{leader.Passport}}</span><br />
<span v-if="leader.IdCard&&leader.IdCard!=''">身份证：{{leader.IdCard}}</span>
</div>
<div>
<div class="headerImg">
<img v-if="!leader.EmPhoto" src="../../assets/img/default_head_img.jpg">
<img v-else :src="imgBeforeFile+leader.EmPhoto" :onerror='defaultImg' />
</div>
<span>{{leader.LeaderName}}</span>
</div>
</el-tooltip>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -429,7 +440,8 @@ ...@@ -429,7 +440,8 @@
<div class="_oll_line" v-if="item.LeaderType==0"></div> <div class="_oll_line" v-if="item.LeaderType==0"></div>
<div class="_oll_line _o_green" v-if="item.LeaderType>0"></div> <div class="_oll_line _o_green" v-if="item.LeaderType>0"></div>
<el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250">
<div class="Lleader" @click="getJourney(0,item.TCID,item.Title)">【{{item.TCNUM}}({{item.TCID}})】{{item.Title}}</div> <div class="Lleader" @click="getJourney(0,item.TCID,item.Title)">
【{{item.TCNUM}}({{item.TCID}})】{{item.Title}}</div>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
...@@ -467,6 +479,11 @@ ...@@ -467,6 +479,11 @@
<img v-else :src="imgBeforeFile+item.LeaderPhoto" :onerror='defaultImg' /> <img v-else :src="imgBeforeFile+item.LeaderPhoto" :onerror='defaultImg' />
</div> </div>
<div>{{item.LeaderName}}/{{$t('leader.leader_Leader')}}</div> <div>{{item.LeaderName}}/{{$t('leader.leader_Leader')}}</div>
<div style="white-space:nowrap;margin:5px 0;">{{$t('system.table_phone')}}：{{item.LeaderMobilePhone}}
</div>
<div style="white-space:nowrap;" v-if="item.LeaderSpareTel!=null&&item.LeaderSpareTel!=''">
{{$t('ground.jingwaihao')}}：{{item.LeaderSpareTel}}
</div>
</div> </div>
<div class="AssList clearfix" v-if="item.GuideId>0"> <div class="AssList clearfix" v-if="item.GuideId>0">
<div class="litCircle"> <div class="litCircle">
......
src/components/LeaderManagement/leaderManagement.vue
View file @ fab47f50
...@@ -147,13 +147,13 @@ ...@@ -147,13 +147,13 @@
float: right; float: right;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
margin: 15px 30px 0 0; margin: 3px 30px 0 0;
} }
.guideMg .botmInfo { .guideMg .botmInfo {
float: left; float: left;
width: 100%; width: 100%;
margin-top: 15px; margin-top: 3px;
} }
.guideMg .lagurage { .guideMg .lagurage {
...@@ -383,7 +383,11 @@ ...@@ -383,7 +383,11 @@
class="naIn">{{item.Name}}/{{item.EnName}}</span></div> class="naIn">{{item.Name}}/{{item.EnName}}</span></div>
<div class="midList" v-if="!item.LeaderGuidClass"> <div class="midList" v-if="!item.LeaderGuidClass">
{{$t('system.table_sex')}}：{{item.Sex==0?$t('ground.manM'):$t('ground.nvM')}}</div> {{$t('system.table_sex')}}：{{item.Sex==0?$t('ground.manM'):$t('ground.nvM')}}</div>
<div>所属公司：{{item.BranchName}}</div>
<div v-if="!item.LeaderGuidClass">{{$t('system.query_goCoun')}}：{{item.CountryName}}</div> <div v-if="!item.LeaderGuidClass">{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<div>护照号：{{item.Passport}}</div>
<div>身份证：{{item.IdCard}}</div>
<div>护照过期日期：{{item.ExpiryDate}}</div>
<el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" <el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start"
popper-class="max-w200" v-if="!item.LeaderGuidClass"> popper-class="max-w200" v-if="!item.LeaderGuidClass">
<div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}} <div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}}
...@@ -391,10 +395,8 @@ ...@@ -391,10 +395,8 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div class="clearfix botmInfo" v-if="!item.LeaderGuidClass"> <div class="clearfix botmInfo" v-if="!item.LeaderGuidClass">
<div class="leftCode">
</div>
<div class="phoneNum"> <div class="phoneNum">
<i class="iconfont icon-dianhua"></i>{{item.MobilePhone?item.MobilePhone:$t('fnc.no')}}<br /> <i class="iconfont icon-dianhua"></i>{{item.MobilePhone?item.MobilePhone:$t('fnc.no')}} &nbsp;
<i class="iconfont icon-zuoji"></i><span <i class="iconfont icon-zuoji"></i><span
style="margin-left: 0">{{item.SpareTel?item.SpareTel:$t('fnc.no')}}</span> style="margin-left: 0">{{item.SpareTel?item.SpareTel:$t('fnc.no')}}</span>
</div> </div>
...@@ -423,8 +425,12 @@ ...@@ -423,8 +425,12 @@
</div> </div>
<div class="nainfo">{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div> <div class="nainfo">{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div>
<div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?$t('ground.manM'):$t('ground.nvM')}}</div> <div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?$t('ground.manM'):$t('ground.nvM')}}</div>
<div>所属公司：{{item.BranchName}}</div>
<div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div> <div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<div>{{$t("ground.daituanshu")}}：{{item.TourNum}}</div> <div>{{$t("ground.daituanshu")}}：{{item.TourNum}}</div>
<div>护照号：{{item.Passport}}</div>
<div>身份证：{{item.IdCard}}</div>
<div>护照过期日期：{{item.ExpiryDate}}</div>
<el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" <el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start"
popper-class="max-w200"> popper-class="max-w200">
<div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}} <div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}}
...@@ -432,10 +438,8 @@ ...@@ -432,10 +438,8 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div class="clearfix botmInfo"> <div class="clearfix botmInfo">
<div class="leftCode">
</div>
<div class="phoneNum"> <div class="phoneNum">
<i class="iconfont icon-dianhua"></i>{{item.MobilePhone?item.MobilePhone:$t('fnc.no')}}<br /> <i class="iconfont icon-dianhua"></i>{{item.MobilePhone?item.MobilePhone:$t('fnc.no')}} &nbsp;
<i class="iconfont icon-zuoji"></i><span <i class="iconfont icon-zuoji"></i><span
style="margin-left: 0">{{item.SpareTel?item.SpareTel:$t('fnc.no')}}</span> style="margin-left: 0">{{item.SpareTel?item.SpareTel:$t('fnc.no')}}</span>
</div> </div>
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ fab47f50
...@@ -147,13 +147,13 @@ ...@@ -147,13 +147,13 @@
float: right; float: right;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
margin: 35px 30px 0 0; margin: 3px 30px 0 0;
} }
.Leader .botmInfo { .Leader .botmInfo {
float: left; float: left;
width: 100%; width: 100%;
margin-top: 15px; margin-top: 3px;
} }
.Leader .lagurage { .Leader .lagurage {
...@@ -298,7 +298,11 @@ ...@@ -298,7 +298,11 @@
</div> </div>
<div class="nainfo">{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div> <div class="nainfo">{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div>
<div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?'男/M':'女/F'}}</div> <div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?'男/M':'女/F'}}</div>
<div>所属公司：{{item.BranchName}}</div>
<div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div> <div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<div>护照号：{{item.Passport}}</div>
<div>身份证：{{item.IdCard}}</div>
<div>护照过期日期：{{item.ExpiryDate}}</div>
<el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" <el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start"
popper-class="max-w200"> popper-class="max-w200">
<div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}} <div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}}
...@@ -306,12 +310,9 @@ ...@@ -306,12 +310,9 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div class="clearfix botmInfo"> <div class="clearfix botmInfo">
<div class="leftCode">
<!-- <barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode> -->
</div>
<div class="phoneNum"> <div class="phoneNum">
<i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} <i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} <template
v-if="item.SpareTel&&item.SpareTel!=''"> 境外手机:{{item.SpareTel}}</template>
</div> </div>
</div> </div>
<div class="btnList"> <div class="btnList">
...@@ -381,12 +382,7 @@ ...@@ -381,12 +382,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('system.table_acc')" prop="EmployeeId">
<el-select v-model="addMsg.EmployeeId" filterable :placeholder="$t('admin.admin_choAcc')" class="w210">
<el-option v-for='item in EmployeeList' :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" class="other_input"> <el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" class="other_input">
<el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210"> <el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210">
</el-input> </el-input>
...@@ -460,7 +456,8 @@ ...@@ -460,7 +456,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" class="normalBtn" @click="submitForm('addMsg')" :loading="saveLoading">{{$t('pub.saveBtn')}} <el-button type="primary" class="normalBtn" @click="submitForm('addMsg')" :loading="saveLoading">
{{$t('pub.saveBtn')}}
</el-button> </el-button>
<el-button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}} <el-button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}
</el-button> </el-button>
...@@ -674,7 +671,7 @@ ...@@ -674,7 +671,7 @@
trigger: "change" trigger: "change"
}] }]
}, },
saveLoading:false, saveLoading: false,
}; };
}, },
methods: { methods: {
...@@ -823,12 +820,12 @@ ...@@ -823,12 +820,12 @@
}, },
//添加 //添加
addGroupGuide() { addGroupGuide() {
this.saveLoading=true; this.saveLoading = true;
this.apipost( this.apipost(
"leader_post_Set", "leader_post_Set",
this.addMsg, this.addMsg,
res => { res => {
this.saveLoading=false; this.saveLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(this.$t('tips.saveYes')); this.Success(this.$t('tips.saveYes'));
this.getList(); this.getList();
...@@ -839,7 +836,7 @@ ...@@ -839,7 +836,7 @@
} }
}, },
err => { err => {
this.saveLoading=false; this.saveLoading = false;
} }
); );
}, },
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ fab47f50
...@@ -487,7 +487,7 @@ ...@@ -487,7 +487,7 @@
} }
.RL_LeaderListDiv { .RL_LeaderListDiv {
width: 200px; width: 675px;
height: 206px; height: 206px;
margin-left: 30px; margin-left: 30px;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
...@@ -2698,8 +2698,10 @@ ...@@ -2698,8 +2698,10 @@
<span style="display: block"> <span style="display: block">
{{ $t("salesModule.RoomInfo") {{ $t("salesModule.RoomInfo")
}}<span v-if="childItem.OneSex > 0" }}<span v-if="childItem.OneSex > 0"
style="color: #e95252">（{{ childItem.OneSex == 1 ? "单男" : "单女" }}）</span><span v-if="childItem.ChirdNoNeedBedNum > 0" style="color: #e95252">（{{ childItem.OneSex == 1 ? "单男" : "单女" }}）</span><span
style="color: #e95252">（儿童不占床{{ childItem.ChirdNoNeedBedNum }}人 ）</span>：{{ childItem.OrderGuestHouseStr }} v-if="childItem.ChirdNoNeedBedNum > 0"
style="color: #e95252">（儿童不占床{{ childItem.ChirdNoNeedBedNum }}人
）</span>：{{ childItem.OrderGuestHouseStr }}
<el-popover trigger="click" popper-class="RL_Scenic"> <el-popover trigger="click" popper-class="RL_Scenic">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align: center"> <tr class="_color_666" style="text-align: center">
...@@ -2857,17 +2859,17 @@ ...@@ -2857,17 +2859,17 @@
<div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;"> <div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;">
<span>改价申请: {{childItem.ChangePriceTime}}申请金额【<span <span>改价申请: {{childItem.ChangePriceTime}}申请金额【<span
style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span> style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span>
<div style="text-align:right;" v-if="childItem.ChangePriceState==1"> <div style="text-align:right;" v-if="childItem.ChangePriceState==1">
待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核 待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核
</div> </div>
<div style="text-align:right;" v-if="childItem.ChangePriceState==2"> <div style="text-align:right;" v-if="childItem.ChangePriceState==2">
待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核 待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核
</div> </div>
<div v-if="childItem.ChangePriceState==4" style="text-align:right;"> <div v-if="childItem.ChangePriceState==4" style="text-align:right;">
已驳回 {{childItem.ExamineTime}} 已驳回 {{childItem.ExamineTime}}
</div> </div>
<div v-if="childItem.ChangePriceState==3" style="text-align:right;"> <div v-if="childItem.ChangePriceState==3" style="text-align:right;">
已通过 {{childItem.ExamineTime}} 已通过 {{childItem.ExamineTime}}
</div> </div>
</div> </div>
</div> </div>
...@@ -3448,7 +3450,7 @@ ...@@ -3448,7 +3450,7 @@
@click="getLeaderInfo(index, item.LeaderId)" :key="item.subCode"> @click="getLeaderInfo(index, item.LeaderId)" :key="item.subCode">
<span class="RL_LeaderName">{{ item.LeaderName }}【{{ <span class="RL_LeaderName">{{ item.LeaderName }}【{{
getLeaderTypeStr(item.Type, item.LeaderGuidClass) getLeaderTypeStr(item.Type, item.LeaderGuidClass)
}}】</span> }}】【护照：{{item.Passport}} 电话:{{item.MobilePhone}} 身份证:{{item.IdCard}}】</span>
</div> </div>
</div> </div>
</div> </div>
......
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