Skip to content

S
SuperMan
Commit 15032513 authored by Mac's avatar Mac
Browse files
Options

样式的修改和旅客名单的房间信息增加

parent 979e3470
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 63 deletions
src/assets/css/DMC.css
View file @ 15032513
......@@ -16,6 +16,7 @@
margin-top: 30px;
font-size: 12px;
min-width: 1200px;
overflow-y: auto;
}
.changInfo .resource-baseinfo {
float: left;
......@@ -93,7 +94,7 @@
position: relative;
top: 1px;
}
.changInfo .re-img {
width: 140px;
height: 93px;
......@@ -151,7 +152,7 @@
border-radius: 10px;
position: absolute;
text-align: center;
line-height: 93px;
line-height: 93px;
top: 0;
}
.changInfo .reimg-add:hover .ad-one {
......@@ -242,12 +243,12 @@
.changInfo .el-form-item__label {
width: 100px;
}
.changInfo .jiudianyouhuiDiv .el-form-item__label{
width: 72px;
font-size: 12px;
}
.changInfo .el-form-item__error {
left: 100px;
}
......@@ -390,4 +391,4 @@
outline: none;
cursor: pointer;
border: 1px solid #e95252;
}
\ No newline at end of file
}
src/components/SalesModule/addPassenger.vue
View file @ 15032513
......@@ -137,25 +137,25 @@
<div class="addPassenger">
<p class="btmTitle">旅客基本资料</p>
<div class="contOut" v-loading='loading' element-loading-text="努力识别中...." element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.7)">
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="中文姓" prop="SurName">
<el-input v-model='addMsg.SurName' class="w230" @input="Transformation(addMsg.SurName,'SurName')"
placeholder="请输入中文"></el-input>
placeholder="请输入中文"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="中文名" prop="Name">
<el-input v-model='addMsg.Name' class="w230" @input="Transformation(addMsg.Name,'Name')"
placeholder="请输入中文"></el-input>
placeholder="请输入中文"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="性别" prop="Sex">
<el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2'>男</el-checkbox>
<el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1'>女</el-checkbox>
<el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2' @change="Roominformation()">男</el-checkbox>
<el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1' @change="Roominformation()">女</el-checkbox>
</el-form-item>
</li>
<li>
......@@ -173,44 +173,44 @@
<li>
<el-form-item label="手机号码" prop="MobilePhone">
<el-input v-model="addMsg.MobilePhone" type="text" size=mini class="w230" maxlength="20"
placeholder="请填写"></el-input>
placeholder="请填写"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="出生日期" prop="Birthday">
<el-date-picker v-model='addMsg.Birthday' class="w230" value-format="yyyy-MM-dd" type="date"
placeholder="选择日期"></el-date-picker>
placeholder="选择日期"></el-date-picker>
</el-form-item>
</li>
<li>
<el-form-item label="出生地" prop="BirthdayAddress">
<el-input v-model="addMsg.BirthdayAddress" type="text" size=mini class="w230" maxlength="20"
placeholder="请填写"></el-input>
placeholder="请填写"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="护照号" prop="PassportNo">
<el-input v-model='addMsg.PassportNo' type="text" size=mini class="w230" maxlength="20"
placeholder="请填写护照号"></el-input>
placeholder="请填写护照号"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="护照签发地" prop="PassportAddress">
<el-input v-model='addMsg.PassportAddress' type="text" size=mini class="w230" maxlength="100"
placeholder="请填写"></el-input>
placeholder="请填写"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="护照签发日期" prop="PassportIssued">
<el-date-picker v-model='addMsg.PassportIssued' class="w230" value-format="yyyy-MM-dd" type="date"
placeholder="选择日期"></el-date-picker>
placeholder="选择日期"></el-date-picker>
</el-form-item>
</li>
<li>
<el-form-item label="护照过期日" prop="PassportExpiry">
<el-date-picker v-model='addMsg.PassportExpiry' class="w230" value-format="yyyy-MM-dd" type="date"
placeholder="选择日期"></el-date-picker>
placeholder="选择日期"></el-date-picker>
</el-form-item>
</li>
<li>
......@@ -245,7 +245,7 @@
<li>
<el-form-item label="家庭详细地址" prop="AddressDetail">
<el-input v-model="addMsg.AddressDetail" type="text" class="w230" size=mini maxlength="200"
placeholder="请填写"></el-input>
placeholder="请填写"></el-input>
</el-form-item>
</li>
<li>
......@@ -261,7 +261,7 @@
<li>
<el-form-item label="出境记录" prop="HistoryRecord">
<el-select v-model="addMsg.HistoryRecord" filterable size=mini class="w230"
v-if="addMsg.HistoryRecord==''">
v-if="addMsg.HistoryRecord==''">
<el-option v-for="item in VisaDeparturesType" :key="item.Id" :label="item.Name" :value="item.Name">
</el-option>
</el-select>
......@@ -291,21 +291,30 @@
</li>
<li>
<el-form-item label="是否占床">
<el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='1' :false-label='0'>是</el-checkbox>
<el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='0' :false-label='1'>否</el-checkbox>
<el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='1' :false-label='0' @change="Roominformation()">是</el-checkbox>
<el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='0' :false-label='1' @change="Roominformation()">否</el-checkbox>
</el-form-item>
</li>
<li>
<el-form-item label="房间信息" prop="HouseId">
<el-select v-model="addMsg.HouseId" filterable size=mini class="w230">
<el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
</el-option>
</el-select>
<input type="button" value="新增" class="normalBtn" @click="addhouse()" />
</el-form-item>
</li>
<li>
<el-form-item label="是否需签证">
<el-checkbox v-model='addMsg.IsVisaFree' name="IsVisaFree"
:disabled="IsMustVisa==1||(IsMustVisa==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>是
:disabled="IsMustVisa==1||(IsMustVisa==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>是
</el-checkbox>
<el-checkbox v-model='addMsg.IsVisaFree' name="IsVisaFree"
:disabled="IsMustVisa==1||(IsMustVisa==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>否
:disabled="IsMustVisa==1||(IsMustVisa==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>否
</el-checkbox>
&nbsp;&nbsp;
<el-select v-model="addMsg.VisaReplaceId" filterable size=mini class="w120"
v-if="IsMustVisa==2&addMsg.Id>0&VisaStartStatus==2&addMsg.IsVisaFree==1">
v-if="IsMustVisa==2&addMsg.Id>0&VisaStartStatus==2&addMsg.IsVisaFree==1">
<el-option v-for="item in VisaNotNeedList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
......@@ -324,12 +333,12 @@
<li>
<el-form-item label="是否单地接">
<el-checkbox v-model='addMsg.IsNeedAirticket' name="IsNeedAirticket"
:disabled="IsMustAir==1||(IsMustAir==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>是</el-checkbox>
:disabled="IsMustAir==1||(IsMustAir==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>是</el-checkbox>
<el-checkbox v-model='addMsg.IsNeedAirticket' name="IsNeedAirticket"
:disabled="IsMustAir==1||(IsMustAir==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>否</el-checkbox>
:disabled="IsMustAir==1||(IsMustAir==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>否</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">
v-if="IsMustAir==2&addMsg.Id>0&AirStartStatus==1&addMsg.IsNeedAirticket==2">
<el-option v-for="item in AirNoeNeedList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
......@@ -338,14 +347,14 @@
<li>
<el-form-item label="是否需保险">
<el-checkbox v-model='addMsg.IsNeedSafe' name="IsNeedSafe"
:disabled="IsMustSafe==1||(IsMustSafe==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>是
:disabled="IsMustSafe==1||(IsMustSafe==2&&addMsg.Id<=0)" :true-label='1' :false-label='2'>是
</el-checkbox>
<el-checkbox v-model='addMsg.IsNeedSafe' name="IsNeedSafe"
:disabled="IsMustSafe==1||(IsMustSafe==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>否
:disabled="IsMustSafe==1||(IsMustSafe==2&&addMsg.Id<=0)" :true-label='2' :false-label='1'>否
</el-checkbox>
&nbsp;&nbsp;
<el-select v-model="addMsg.SafeReplaceId" filterable size=mini class="w120"
v-if="IsMustSafe==2&addMsg.Id>0&SafeStartStatus==1&addMsg.IsNeedSafe==2">
v-if="IsMustSafe==2&addMsg.Id>0&SafeStartStatus==1&addMsg.IsNeedSafe==2">
<el-option v-for="item in SafeNotNeedList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
......@@ -359,7 +368,7 @@
</el-form>
<div class="_addPassengerEconomicCapability">
<span v-for="item in EconomicCapabilityS" @click="addEconomicCapability(item)"
:class="{_active:item.isShow}">{{item.Name}}</span>
:class="{_active:item.isShow}">{{item.Name}}</span>
</div>
</div>
<div class="contPic">
......@@ -564,9 +573,9 @@
<p style="text-align: center; padding: 20px 0;">
<input type="button" class="hollowFixedBtn" value="取消" @click="goBack" />
<input type="button" class="normalBtn" value="保存" :style="btnState===true?'':'background-color: gray'"
@click="submitForm('addMsg',1)" />
@click="submitForm('addMsg',1)" />
<input v-if="this.addMsg.Id==0" type="button" class="normalBtn" value="保存并继续添加"
:style="btnState===true?'':'background-color: gray'" @click="submitForm('addMsg',2)" />
:style="btnState===true?'':'background-color: gray'" @click="submitForm('addMsg',2)" />
</p>
</div>
</template>
......@@ -647,6 +656,7 @@
VisaReplaceId: "0",
SafeReplaceId: "0",
VisaState: 0, //签证状态
HouseId:'',//房间信息
},
EconomicCapabilityS: [],
rules: {
......@@ -666,20 +676,20 @@
trigger: "change"
}],
ESurName: [{
required: true,
message: "请填写英文姓",
trigger: "blur"
},
required: true,
message: "请填写英文姓",
trigger: "blur"
},
{
pattern: /^[a-zA-Z]/,
message: "请输入英文姓"
}
],
EName: [{
required: true,
message: "请填写英文名",
trigger: "blur"
},
required: true,
message: "请填写英文名",
trigger: "blur"
},
{
pattern: /^[a-zA-Z]/,
message: "请输入英文姓"
......@@ -691,10 +701,10 @@
trigger: "blur"
}],
PassportNo: [{
required: true,
message: "请填写护照号",
trigger: "blur"
},
required: true,
message: "请填写护照号",
trigger: "blur"
},
{
pattern: /^[0-9a-zA-Z]+$/,
message: "正确的护照号"
......@@ -716,10 +726,10 @@
trigger: "blur"
}],
MobilePhone: [{
required: true,
message: "请填写手机号码",
trigger: "blur"
},
required: true,
message: "请填写手机号码",
trigger: "blur"
},
{
pattern: /^1[123457890]\d{9}$/,
message: "正确的手机号码"
......@@ -756,7 +766,8 @@
VisaStartStatus: 2,
AirStartStatus: 2,
SafeStartStatus: 2,
btnState: true
btnState: true,
roomlist:[],
};
},
methods: {
......@@ -1513,7 +1524,7 @@
this.addMsg.Marriage = "0";
}
this.apipost(
"sellorder_post_SetTravelGuestInfo",
"sellorder_post_SetTravelGuestInfo_V2",
this.addMsg,
res => {
if (res.data.resultCode == 1) {
......@@ -1735,8 +1746,9 @@
this.AirStartStatus = this.addMsg.IsNeedAirticket;
this.SafeStartStatus = this.addMsg.IsNeedSafe;
this.$forceUpdate();
this.getHouselist(obj.Sex.toString(),obj.TCID,obj.OrderId,obj.IsBed)
} else {
this.$message.error(res.data.message);
this.$message.error();
}
},
err => {}
......@@ -1841,7 +1853,58 @@
this.addMsg.PassportAddress = "湖南";
}
this.addMsg.IssuingAuthority = "公安部出入境管理局";
}
},
Roominformation(){
let TCIDs = this.addMsg.TCID;
let OrderId = this.addMsg.OrderId;
let IsBed = this.addMsg.IsBed;
let Sex = this.addMsg.Sex;
this.apipost(
"sellorder_post_GetHouseDetailsByOrderID",
{TCIDs:TCIDs,OrderId:OrderId,Sex:Sex,IsBed:IsBed},
res => {
if (res.data.resultCode == 1) {
this.roomlist = res.data.data;
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
getHouselist(Sex,TCID,OrderId,IsBed){
if(Sex ==1 || Sex == 2){
this.apipost(
"sellorder_post_GetHouseDetailsByOrderID",
{TCIDs:TCID,OrderId:OrderId,Sex:Sex,IsBed:IsBed},
res => {
if (res.data.resultCode == 1) {
this.roomlist = res.data.data;
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
}
},
addhouse(){
let orderId = this.addMsg.OrderId;
let sex = this.addMsg.Sex;
this.apipost(
"sellorder_get_BatchSetOrderHouse_V2",
{orderId:orderId,sex:sex,},
res => {
if (res.data.resultCode == 1) {
this.Roominformation()
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
},
mounted() {
this.getCountry();
......@@ -1869,4 +1932,4 @@
this.addMsg.IssuingAuthority = "公安部出入境管理局";
}
};
</script>
\ No newline at end of file
</script>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 15032513
......@@ -2012,14 +2012,14 @@
<div>
<span>发票单据：</span>
<span v-for="(item2,index2) in childItem.InvoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3"
class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 "
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-if="item2.InvoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.InvoiceApplyState === 1 || item2.InvoiceApplyState === 3"
class="groupTourOrder_tickets_green" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.InvoiceApplyState === 5 || item2.InvoiceApplyState === 4 "
class="groupTourOrder_tickets_red" @click="goIisDetail(item2.ID)">{{item2.ID}}</span>
<span v-else-if="item2.InvoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.ID)">{{item2.ID}}</span>
</span>
<span v-if="childItem.InvoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
</div>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 15032513
......@@ -212,7 +212,10 @@
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;text-decoration:underline;" :title="item.orderId"
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}</p>
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;text-decoration: none;display: inline-block;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
style="color:red">({{item.leaveStr}})</span></p>
......
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