Skip to content

S
SuperMan
Commit cc7de4ea authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 411c76c1 6288fff3
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 120 deletions
src/components/LeaderManagement/leaderManagement.vue
View file @ cc7de4ea
......@@ -517,8 +517,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" class="other_input"
v-if="addMsg.LeaderGuidClass==0">
<el-form-item :label="$t('admin.admin_IDcard')" class="other_input" v-if="addMsg.LeaderGuidClass==0">
<el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210">
</el-input>
</el-form-item>
......@@ -1067,38 +1066,34 @@
});
},
initAddMsg() {
//初始化创建、修改表单数据
let newMsg = {
ID: "0",
Type: "3",
EmployeeId: "",
Surname: "",
Name: "",
EnSurname: "",
EnName: "",
IdCard: "",
BirthDate: "",
BirthPlace: "",
Sex: "",
MobilePhone: "",
Passport: "",
IssuePlace: "",
IssueDate: "",
ExpiryDate: "",
CountryID: "",
LanguageId: "",
Remarks: "",
VisaNumber: "",
LeaderGuidType: "",
LeaderGuidClass: 0,
SpareTel: '',
emRB_Department_Id: '',
emRB_Post_Id: '',
RB_Branch_id: '',
EmAccount: '',
EmPassword: ''
};
this.addMsg = newMsg;
this.addMsg.ID = "0";
this.addMsg.Type = "3";
this.addMsg.EmployeeId = "";
this.addMsg.Surname = "";
this.addMsg.Name = "";
this.addMsg.EnSurname = "";
this.addMsg.EnName = "";
this.addMsg.IdCard = "";
this.addMsg.BirthDate = "";
this.addMsg.BirthPlace = "";
this.addMsg.Sex = "";
this.addMsg.MobilePhone = "";
this.addMsg.Passport = "";
this.addMsg.IssuePlace = "";
this.addMsg.IssueDate = "";
this.addMsg.ExpiryDate = "";
this.addMsg.CountryID = "";
this.addMsg.LanguageId = "";
this.addMsg.Remarks = "";
this.addMsg.VisaNumber = "";
this.addMsg.LeaderGuidType = "";
this.addMsg.LeaderGuidClass = 0;
this.addMsg.SpareTel = '';
this.addMsg.emRB_Department_Id = '';
this.addMsg.emRB_Post_Id = '';
this.addMsg.RB_Branch_id = "";
this.addMsg.EmAccount = "";
this.addMsg.EmPassword = '';
},
//翻页功能按钮
handleCurrentChange(val) {
......@@ -1118,6 +1113,7 @@
ID: ID
},
res => {
console.log("leaderData",res.data.data);
let LanguageIdArr = [];
this.addMsg = res.data.data;
this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0;
......@@ -1150,7 +1146,8 @@
},
//弹出框取消 初始化谈框内表单
resetForm(formName) {
this.$refs[formName].resetFields();
// this.$refs[formName].resetFields();
this.initAddMsg();
this.LanguageIdS = [];
}
},
......
src/components/SalesModule/addPassenger.vue
View file @ cc7de4ea
......@@ -144,29 +144,26 @@
<template>
<div class="addPassenger">
<p class="btmTitle">{{$t('objFill.lvkejbzl')}}</p>
<div class="contOut" v-loading='loading' :element-loading-text="$t('objFill.lvlisbz')" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.7)">
<div class="contOut" v-loading='loading' :element-loading-text="$t('objFill.lvlisbz')"
element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.7)">
<div class="contForm">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px">
<li>
<el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" v-if="LineId === 14 || LineId === 2">
<el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" :placeholder="$t('visaT.Pleasefillin')"
@blur.prevent="authentication()">
</el-input>
</el-form-item>
<el-form-item :label="$t('admin.admin_IDcard')" v-else>
<el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" :placeholder="$t('visaT.Pleasefillin')"
@blur.prevent="authentication()">
</el-input>
<el-form-item :label="$t('visaT.nationality')" prop="Nationality">
<el-select v-model="addMsg.Nationality" filterable size=mini class="w230">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<li v-if="addMsg.Nationality==2">
<el-form-item :label="$t('visaT.Chinesesurname')" prop="SurName">
<el-input v-model='addMsg.SurName' class="w230" @input="Transformation(addMsg.SurName,'SurName')"
:placeholder="$t('rule.qsrzwm')"></el-input>
</el-form-item>
</li>
<li>
<li v-if="addMsg.Nationality==2">
<el-form-item :label="$t('admin.admin_Surname')" prop="Name">
<el-input v-model='addMsg.Name' class="w230" @input="Transformation(addMsg.Name,'Name')"
:placeholder="$t('rule.qsrzwm')"></el-input>
......@@ -174,21 +171,37 @@
</li>
<li>
<el-form-item :label="$t('system.table_sex')" prop="Sex">
<el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2' @change="Roominformation()">{{$t('pub.man')}}
<el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2' @change="Roominformation()">
{{$t('pub.man')}}
</el-checkbox>
<el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1' @change="Roominformation()">{{$t('pub.woman')}}
<el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1' @change="Roominformation()">
{{$t('pub.woman')}}
</el-checkbox>
</el-form-item>
</li>
<li>
<el-form-item :label="$t('visaT.Englishsurname')" prop="ESurName">
<el-input v-model='addMsg.ESurName' type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peEnglish')">
<el-input v-model='addMsg.ESurName' type="text" size=mini class="w230" maxlength="20"
:placeholder="$t('visaT.peEnglish')">
</el-input>
</el-form-item>
</li>
<li>
<el-form-item :label="$t('admin.admin_EnSurname')" prop="EName">
<el-input v-model='addMsg.EName' type="text" size=mini class="w230" maxlength="20" :placeholder="$t('visaT.peEnglish')">
<el-input v-model='addMsg.EName' type="text" size=mini class="w230" maxlength="20"
:placeholder="$t('visaT.peEnglish')">
</el-input>
</el-form-item>
</li>
<li v-if="addMsg.Nationality==2">
<el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" v-if="LineId === 14 || LineId === 2">
<el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50"
:placeholder="$t('visaT.Pleasefillin')" @blur.prevent="authentication()">
</el-input>
</el-form-item>
<el-form-item :label="$t('admin.admin_IDcard')" v-else>
<el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50"
:placeholder="$t('visaT.Pleasefillin')" @blur.prevent="authentication()">
</el-input>
</el-form-item>
</li>
......@@ -243,21 +256,16 @@
<li>
<el-form-item :label="$t('objFill.huzhaogqrq')" v-if="LineId==90">
<el-date-picker v-model='addMsg.PassportExpiry' class="w230" :class=" guoqi ? 'colorRed' : ''"
@change="timeOver" value-format="yyyy-MM-dd" type="date" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
@change="timeOver" value-format="yyyy-MM-dd" type="date" :placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('objFill.huzhaogqrq')" prop="PassportExpiry" v-else>
<el-date-picker v-model='addMsg.PassportExpiry' class="w230" :class=" guoqi ? 'colorRed' : ''"
@change="timeOver" value-format="yyyy-MM-dd" type="date" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</el-form-item>
</li>
<li>
<el-form-item :label="$t('visaT.nationality')" prop="Nationality">
<el-select v-model="addMsg.Nationality" filterable size=mini class="w230">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
@change="timeOver" value-format="yyyy-MM-dd" type="date" :placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</el-form-item>
</li>
<li>
<el-form-item :label="$t('visaT.Marriage')" prop="Marriage">
<el-select v-model="addMsg.Marriage" filterable size=mini class="w230">
......@@ -268,7 +276,8 @@
</li>
<li>
<el-form-item :label="$t('visa.v_jtjzd')" prop="Address">
<el-input v-model="addMsg.Address" type="text" size=mini class="w230" maxlength="50" :placeholder="$t('visaT.Pleasefillin')">
<el-input v-model="addMsg.Address" type="text" size=mini class="w230" maxlength="50"
:placeholder="$t('visaT.Pleasefillin')">
</el-input>
</el-form-item>
</li>
......@@ -297,7 +306,8 @@
</el-select>
<el-input v-else v-model="addMsg.HistoryRecord" type="text" size=mini class="w230" maxlength="50">
</el-input>
<el-checkbox v-model='addMsg.IsRecommend' :true-label='1' :false-label='2'>{{$t('visaT.Recommend')}}</el-checkbox>
<el-checkbox v-model='addMsg.IsRecommend' :true-label='1' :false-label='2'>{{$t('visaT.Recommend')}}
</el-checkbox>
</el-form-item>
</li>
<li>
......@@ -366,10 +376,12 @@
<li>
<el-form-item :label="$t('objFill.shifouxyqz')">
<el-checkbox v-model='addMsg.IsVisaFree' name="IsVisaFree"
:disabled="IsMustVisa==1||(IsMustVisa==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>{{$t('pub.yes')}}
:disabled="IsMustVisa==1||(IsMustVisa==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>
{{$t('pub.yes')}}
</el-checkbox>
<el-checkbox v-model='addMsg.IsVisaFree' name="IsVisaFree"
:disabled="IsMustVisa==1||(IsMustVisa==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>{{$t('pub.no')}}
:disabled="IsMustVisa==1||(IsMustVisa==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>
{{$t('pub.no')}}
</el-checkbox>
&nbsp;&nbsp;
<el-select v-model="addMsg.VisaReplaceId" filterable size=mini class="w120"
......@@ -392,9 +404,11 @@
<li>
<el-form-item :label="$t('objFill.shifouddj')">
<el-checkbox v-model='addMsg.IsNeedAirticket' name="IsNeedAirticket"
:disabled="IsMustAir==1||(IsMustAir==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>{{$t('pub.yes')}}</el-checkbox>
:disabled="IsMustAir==1||(IsMustAir==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>
{{$t('pub.yes')}}</el-checkbox>
<el-checkbox v-model='addMsg.IsNeedAirticket' name="IsNeedAirticket"
:disabled="IsMustAir==1||(IsMustAir==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>{{$t('pub.no')}}</el-checkbox>
:disabled="IsMustAir==1||(IsMustAir==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>{{$t('pub.no')}}
</el-checkbox>
&nbsp;&nbsp;
<el-select v-model="addMsg.AirReplaceId" filterable size=mini class="w120"
v-if="IsMustAir==2&addMsg.Id>0&AirStartStatus==1&addMsg.IsNeedAirticket==2">
......@@ -406,10 +420,12 @@
<li>
<el-form-item :label="$t('objFill.shifouxybx')">
<el-checkbox v-model='addMsg.IsNeedSafe' name="IsNeedSafe"
:disabled="IsMustSafe==1||(IsMustSafe==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>{{$t('pub.yes')}}
:disabled="IsMustSafe==1||(IsMustSafe==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>
{{$t('pub.yes')}}
</el-checkbox>
<el-checkbox v-model='addMsg.IsNeedSafe' name="IsNeedSafe"
:disabled="IsMustSafe==1||(IsMustSafe==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>{{$t('pub.no')}}
:disabled="IsMustSafe==1||(IsMustSafe==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>
{{$t('pub.no')}}
</el-checkbox>
&nbsp;&nbsp;
<el-select v-model="addMsg.SafeReplaceId" filterable size=mini class="w120"
......@@ -541,13 +557,15 @@
<el-row :gutter="40">
<el-col :span="6">
<el-form-item :label="$t('objFill.shangciqsj')" prop="Birthday">
<el-date-picker v-model='addMsg.LastTime' value-format="yyyy-MM-dd" type="date" :placeholder="$t('admin.admin_choDate')">
<el-date-picker v-model='addMsg.LastTime' value-format="yyyy-MM-dd" type="date"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('objFill.shangcqdjzsj')">
<el-date-picker v-model='addMsg.DeadlineTime' value-format="yyyy-MM-dd" type="date" :placeholder="$t('admin.admin_choDate')">
<el-date-picker v-model='addMsg.DeadlineTime' value-format="yyyy-MM-dd" type="date"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -622,7 +640,8 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('objFill.shengqirq')+'/'+$t('objFill.baomingshijian')">
<el-date-picker v-model='addMsg.Date' value-format="yyyy-MM-dd" type="date" :placeholder="$t('admin.admin_choDate')">
<el-date-picker v-model='addMsg.Date' value-format="yyyy-MM-dd" type="date"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -631,8 +650,8 @@
</div>
<p style="text-align: center; padding: 20px 0;">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="goBack" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" :style="btnState===true?'':'background-color: gray'"
@click="submitForm('addMsg',1)" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')"
:style="btnState===true?'':'background-color: gray'" @click="submitForm('addMsg',1)" />
<input v-if="this.addMsg.Id==0" type="button" class="normalBtn" :value="$t('objFill.baocbjxtj')"
:style="btnState===true?'':'background-color: gray'" @click="submitForm('addMsg',2)" />
</p>
......@@ -931,7 +950,7 @@
let age = this.jsGetAge(b)
this.ppAge = age
if (age == -1) {
this.$message.error(this.$t('admin.admin_BirthDate')+ b + this.$t('objFill.youwu'))
this.$message.error(this.$t('admin.admin_BirthDate') + b + this.$t('objFill.youwu'))
this.addMsg.Birthday = ''
return
}
......@@ -968,7 +987,7 @@
//OCR识别
commonTextDiscern() {
if (this.imgBase64String == '') {
this.Error(this.$t('objFill .qingxztup')+'!');
this.Error(this.$t('objFill .qingxztup') + '!');
return;
}
let params = {
......@@ -1150,7 +1169,7 @@
},
savePassenger(type) {
this.timeOver()
if ((this.LineId === 14 || this.LineId === 2) && this.addMsg.IdCard === '') {
if ((this.LineId === 14 || this.LineId === 2) && this.addMsg.IdCard === '' && this.addMsg.Nationality == 2) {
return this.$message.error(this.$t('objFill.qingtxsfzhm'));
}
this.addMsg.EconomicCapabilityList = [];
......@@ -1166,19 +1185,6 @@
if (this.addMsg.Marriage == "") {
this.addMsg.Marriage = "0";
}
// if (this.ppAge <= 10 && this.addMsg.IsBed == 1) {
// this.$confirm(this.$t('该游客未满十岁确认占床?'), this.$t('tips.tips'), {
// confirmButtonText: this.$t('restaurant.res_confirm'),
// cancelButtonText: this.$t('pub.cancelBtn'),
// type: 'warning'
// }).then(() => {
// this.seveInfo(type)
// }).catch(() => {
// this.btnState = true
// });
// } else {
// this.seveInfo(type)
// }
this.seveInfo(type)
},
seveInfo(type) {
......@@ -1544,7 +1550,7 @@
OrderId: OrderId,
Sex: Sex,
IsBed: IsBed,
GuestId: this.$route.query.guestId?this.$route.query.guestId:0
GuestId: this.$route.query.guestId ? this.$route.query.guestId : 0
},
res => {
if (res.data.resultCode == 1) {
......
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ cc7de4ea
......@@ -1082,7 +1082,6 @@
},
//机票转出
setOut() {
if (this.outData.ReciveEmployeeId == 0) {
this.Warning(this.$t('objFill.v101.qingxzjsreny'));
return false;
......@@ -1094,7 +1093,7 @@
that.outData,
res => {
if (res.data.resultCode == 1) {
that.Success(this.$t('objFill.v101.zhuancjwcgo'));
that.Success(that.$t('objFill.v101.zhuancjwcgo'));
that.isShowSet = false;
that.outData.ReciveEmployeeId = 0;
that.outData.OutNum = "";
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ cc7de4ea
......@@ -297,7 +297,8 @@
<div class="nainfo">{{$t('admin.admin_xing')}}：<span class="naIn">{{item.Surname}}/{{item.EnSurname}}</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('pub.man')+'/M':$t('pub.woman')+'/F'}}</div>
<div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?$t('pub.man')+'/M':$t('pub.woman')+'/F'}}
</div>
<div>{{$t('system.query_company')}}：{{item.BranchName}}</div>
<div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<div>{{$t('system.table_Passport')}}：{{item.Passport}}</div>
......@@ -383,7 +384,7 @@
</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')" class="other_input">
<el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210">
</el-input>
</el-form-item>
......@@ -875,30 +876,30 @@
});
},
initAddMsg() {
//初始化创建、修改表单数据
let newMsg = {
ID: "0",
Type: 1,
EmployeeId: "",
Surname: "",
Name: "",
EnSurname: "",
EnName: "",
IdCard: "",
BirthDate: "",
BirthPlace: "",
Sex: "",
MobilePhone: "",
Passport: "",
IssuePlace: "",
IssueDate: "",
ExpiryDate: "",
CountryID: "",
LanguageId: "",
Remarks: "",
VisaNumber: ""
};
this.addMsg = newMsg;
this.addMsg.ID = "0";
this.addMsg.Type = 1;
this.addMsg.EmployeeId = "";
this.addMsg.Surname = "";
this.addMsg.Name = "";
this.addMsg.EnSurname = "";
this.addMsg.EnName = "";
this.addMsg.IdCard = "";
this.addMsg.BirthDate = "";
this.addMsg.BirthPlace = "";
this.addMsg.Sex = "";
this.addMsg.MobilePhone = "";
this.addMsg.SpareTel = "";
this.addMsg.Passport = "";
this.addMsg.IssuePlace = "";
this.addMsg.IssueDate = "";
this.addMsg.ExpiryDate = "";
this.addMsg.CountryID = "";
this.addMsg.LanguageId = "";
this.addMsg.Remarks = "";
this.addMsg.VisaNumber = "";
this.addMsg.LeaderGuidType = "";
this.addMsg.LeaderGuidClass = "";
this.addMsg.ValidDate = "";
},
//翻页功能按钮
handleCurrentChange(val) {
......
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