Commit c8a34dab authored by 黄奎's avatar 黄奎

11

parent b0d3821a
...@@ -1361,7 +1361,6 @@ ...@@ -1361,7 +1361,6 @@
this.addMsg.ESurName = this.options[0].label; this.addMsg.ESurName = this.options[0].label;
}, 500); }, 500);
} }
} else { } else {
let findIndex = this.options.findIndex(x => x.label == this.addMsg.ESurName) let findIndex = this.options.findIndex(x => x.label == this.addMsg.ESurName)
if (findIndex != -1) { if (findIndex != -1) {
...@@ -1370,7 +1369,6 @@ ...@@ -1370,7 +1369,6 @@
this.addMsg.SurNameID = ''; this.addMsg.SurNameID = '';
this.addMsg.ESurName = ''; this.addMsg.ESurName = '';
} }
} }
this.$forceUpdate() this.$forceUpdate()
} }
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<template v-if="isOrder==0"> <template v-if="isOrder==0">
<span style="color:red;">{{$t('objFill.opygbddcz')}}</span> <span style="color:red;">{{$t('objFill.opygbddcz')}}</span>
</template> </template>
<template v-if="isOrder==1 && !isDis" > <div v-show="tableList.length<guestNum&&IsLeaderOrder>0" @click="showSetLeader=true;getBranchList()">{{$t('objFill.v101.Rest.xuanzhelddy')}}</div> <template v-if="isOrder==1 && !isDis">
<div v-show="tableList.length<guestNum&&IsLeaderOrder>0" @click="showSetLeader=true;getBranchList()">
{{$t('objFill.v101.Rest.xuanzhelddy')}}</div>
<div v-show="tableList.length<guestNum" @click="goUrlA(0)">{{$t('pub.addBtn')}}</div> <div v-show="tableList.length<guestNum" @click="goUrlA(0)">{{$t('pub.addBtn')}}</div>
</template> </template>
...@@ -57,15 +59,18 @@ ...@@ -57,15 +59,18 @@
<td style="color:red;">{{item.IsHightSchool==1?$t('objFill.xuesheng'):""}}</td> <td style="color:red;">{{item.IsHightSchool==1?$t('objFill.xuesheng'):""}}</td>
<td> <td>
<el-button-group> <el-button-group>
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"> <el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('pub.updateMsg')"
placement="top-start">
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-bianji-smal" @click="goUrlA(item.Id)"></el-button> icon="iconfont icon-bianji-smal" @click="goUrlA(item.Id)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<el-button type="primary" style='background:#e95252; border-color:#e95252' <el-button type="primary" style='background:#e95252; border-color:#e95252'
icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button> icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('objFill.xiazasqb')" placement="top-start"> <el-tooltip v-if="isOrder==1 && !isDis" class="item" effect="dark" :content="$t('objFill.xiazasqb')"
placement="top-start">
<el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3' <el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3'
icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button> icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
</el-tooltip> </el-tooltip>
...@@ -80,7 +85,6 @@ ...@@ -80,7 +85,6 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="combottomDiv" v-if="showSetLeader" v-loading="loadingSet"> <div class="combottomDiv" v-if="showSetLeader" v-loading="loadingSet">
<div class="combottomTitle">{{ $t("ground.szlindui") }}</div> <div class="combottomTitle">{{ $t("ground.szlindui") }}</div>
<div class="clearfix"> <div class="clearfix">
...@@ -103,7 +107,8 @@ ...@@ -103,7 +107,8 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('system.query_name')" prop="lineCode"> <el-form-item :label="$t('system.query_name')" prop="lineCode">
<el-input v-model="leaderQueryMsg.LeaderName" @keyup.enter.native="getLeaderList" :placeholder="$t('tips.srgjzjxguolv')"></el-input> <el-input v-model="leaderQueryMsg.LeaderName" @keyup.enter.native="getLeaderList"
:placeholder="$t('tips.srgjzjxguolv')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -123,7 +128,7 @@ ...@@ -123,7 +128,7 @@
</div> </div>
<div class="RL_ListDiv"> <div class="RL_ListDiv">
<div class="LeaderSpan" :class="{ ckedClass: ckedIndex == index }" v-for="(item, index) in leaderListArr" <div class="LeaderSpan" :class="{ ckedClass: ckedIndex == index }" v-for="(item, index) in leaderListArr"
:key="item.subCode" @click="getLeaderInfo(index, item.LeaderId)" style="margin:5px 0px 0px 5px;" > :key="item.subCode" @click="getLeaderInfo(index, item.LeaderId)" style="margin:5px 0px 0px 5px;">
<span class="RL_LeaderName">{{ item.LeaderName }}:{{item.IdCard }}/ {{item.Passport }} /{{item.MobilePhone }}【{{ <span class="RL_LeaderName">{{ item.LeaderName }}:{{item.IdCard }}/ {{item.Passport }} /{{item.MobilePhone }}【{{
getLeaderTypeStr(item.Type, item.LeaderGuidClass) getLeaderTypeStr(item.Type, item.LeaderGuidClass)
}}】</span> }}】</span>
...@@ -133,9 +138,8 @@ ...@@ -133,9 +138,8 @@
</div> </div>
</div> </div>
<div class="clearfix " style="float: left;width: 5%;"> <div class="clearfix " style="float: left;width: 5%;">
<div > <div>
<input type="button" class="normalBtn" @click="setTheLeader" <input type="button" class="normalBtn" @click="setTheLeader" :value="$t('pub.sureBtn')" />
:value="$t('pub.sureBtn')" />
</div> </div>
</div> </div>
</div> </div>
...@@ -155,10 +159,10 @@ ...@@ -155,10 +159,10 @@
tcid: '0', tcid: '0',
tcnum: '0' tcnum: '0'
}, },
setMsg:{ setMsg: {
OrderId:0, OrderId: 0,
TCID:0, TCID: 0,
NewGuestId:0, NewGuestId: 0,
}, },
guestNum: 0, guestNum: 0,
isOrder: 0, isOrder: 0,
...@@ -167,7 +171,7 @@ ...@@ -167,7 +171,7 @@
LineId: 0, LineId: 0,
EndDateStr: "", EndDateStr: "",
isDis: false, isDis: false,
IsLeaderOrder:0, IsLeaderOrder: 0,
leaderQueryMsg: { leaderQueryMsg: {
QTCID: 0, QTCID: 0,
CountryID: 0, CountryID: 0,
...@@ -177,13 +181,13 @@ ...@@ -177,13 +181,13 @@
}, },
//验证重复提交 //验证重复提交
isSubmit: true, isSubmit: true,
ckedIndex:-1, ckedIndex: -1,
//领队或者领兼地 //领队或者领兼地
isLeaderType: "", isLeaderType: "",
leaderTypeArray: [{ leaderTypeArray: [{
Id: 0, Id: 0,
Text: this.$t('objFill.qingxuanzhe'), Text: this.$t('objFill.qingxuanzhe'),
},{ }, {
Id: 2, Id: 2,
Text: this.$t('objFill.lingduijdy'), Text: this.$t('objFill.lingduijdy'),
}, },
...@@ -198,8 +202,8 @@ ...@@ -198,8 +202,8 @@
], ],
//分公司列表 //分公司列表
BranchList: [], BranchList: [],
showSetLeader:false, showSetLeader: false,
loadingSet:false, loadingSet: false,
leaderListArr: [], leaderListArr: [],
}; };
}, },
...@@ -229,17 +233,16 @@ ...@@ -229,17 +233,16 @@
} }
}, },
//点击选中名单 //点击选中名单
getLeaderInfo(index,LeaderId) { getLeaderInfo(index, LeaderId) {
this.ckedIndex = index; this.ckedIndex = index;
this.setMsg.NewGuestId=LeaderId this.setMsg.NewGuestId = LeaderId
}, },
getLeaderTypeStr: function (type, clas) { getLeaderTypeStr: function (type, clas) {
if (type == 2) { if (type == 2) {
return this.$t('leader.leader_leaderDi'); return this.$t('leader.leader_leaderDi');
} else if (type ==3) { } else if (type == 3) {
return this.$t('leader.leader_Guide'); return this.$t('leader.leader_Guide');
} } else if (type == 1 && clas == 0) {
else if (type == 1 && clas == 0) {
return this.$t('leader.leader_Leader'); return this.$t('leader.leader_Leader');
} else if (type == 1 && clas == 1) { } else if (type == 1 && clas == 1) {
return this.$t('op.THLeader'); return this.$t('op.THLeader');
...@@ -275,11 +278,11 @@ ...@@ -275,11 +278,11 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.leaderListArr = res.data.data.LeaderData; this.leaderListArr = res.data.data.LeaderData;
this.ScheduleArray = res.data.data.ScheduleData; this.ScheduleArray = res.data.data.ScheduleData;
if (this.leaderQueryMsg.LeaderType == 1) {//1领队2领队兼导游3导游 if (this.leaderQueryMsg.LeaderType == 1) { //1领队2领队兼导游3导游
this.isLeaderType = this.$t('leader.leader_Leader'); this.isLeaderType = this.$t('leader.leader_Leader');
} else if (this.leaderQueryMsg.LeaderType == 2){ } else if (this.leaderQueryMsg.LeaderType == 2) {
this.isLeaderType = this.$t('leader.leader_leaderDi'); this.isLeaderType = this.$t('leader.leader_leaderDi');
}else if (this.leaderQueryMsg.LeaderType == 3){ } else if (this.leaderQueryMsg.LeaderType == 3) {
this.isLeaderType = this.$t('leader.leader_Guide'); this.isLeaderType = this.$t('leader.leader_Guide');
} }
} }
...@@ -298,8 +301,8 @@ ...@@ -298,8 +301,8 @@
this.isOneDay = res.data.data.IsOneDay; this.isOneDay = res.data.data.IsOneDay;
this.LineId = res.data.data.LineId; this.LineId = res.data.data.LineId;
this.EndDateStr = res.data.data.EndDateStr; this.EndDateStr = res.data.data.EndDateStr;
this.IsLeaderOrder= res.data.data.IsLeaderOrder; this.IsLeaderOrder = res.data.data.IsLeaderOrder;
this.leaderQueryMsg.QTCID= res.data.data.TCID; this.leaderQueryMsg.QTCID = res.data.data.TCID;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -307,19 +310,20 @@ ...@@ -307,19 +310,20 @@
}); });
}, },
pal_del: function (item) { pal_del: function (item) {
var that = this;
this.$confirm(this.$t('objFill.shifouscglvke'), this.$t('tips.tips'), { this.$confirm(this.$t('objFill.shifouscglvke'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apipost('sellorder_post_DelTravelGuestInfo', { that.apipost('sellorder_post_DelTravelGuestInfo', {
GuestId: item.Id GuestId: item.Id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.Success(this.$t('tips.shanchuchenggong')) that.Success(that.$t('tips.shanchuchenggong'))
this.getData() that.getData()
} else { } else {
this.$message.error(res.data.message) that.Error(res.data.message)
} }
}, err => {}) }, err => {})
}) })
...@@ -377,17 +381,20 @@ ...@@ -377,17 +381,20 @@
background-color: #e95252 !important; background-color: #e95252 !important;
color: #fff; color: #fff;
} }
.RL_ListDiv { .RL_ListDiv {
width: 100%; width: 100%;
height: 174px; height: 174px;
overflow: auto; overflow: auto;
} }
.RL_LeaderListDiv { .RL_LeaderListDiv {
width: 200px; width: 200px;
height: 206px; height: 206px;
margin-left: 30px; margin-left: 30px;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
} }
.RL_infoDiv { .RL_infoDiv {
width: 260px; width: 260px;
height: 140px; height: 140px;
...@@ -395,6 +402,7 @@ ...@@ -395,6 +402,7 @@
padding: 10px; padding: 10px;
font-size: 14px; font-size: 14px;
} }
.RL_LeaderTitle { .RL_LeaderTitle {
width: 100%; width: 100%;
height: 30px; height: 30px;
...@@ -404,6 +412,7 @@ ...@@ -404,6 +412,7 @@
line-height: 30px; line-height: 30px;
font-size: 14px; font-size: 14px;
} }
.RL_LeaderName { .RL_LeaderName {
display: inline-block; display: inline-block;
min-width: 50px; min-width: 50px;
...@@ -414,6 +423,7 @@ ...@@ -414,6 +423,7 @@
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
.passengerSaleList { .passengerSaleList {
width: 100%; width: 100%;
} }
...@@ -479,7 +489,7 @@ ...@@ -479,7 +489,7 @@
} }
/*拒签人员*/ /*拒签人员*/
.passengerSaleList_table .redTr td{ .passengerSaleList_table .redTr td {
color: #E95252; color: #E95252;
} }
......
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