Skip to content

S
SuperMan
Commit 2093a834 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 5d2bd1af 0bfaa62c
Hide whitespace changes
Inline Side-by-side
Showing with 285 additions and 302 deletions
src/components/SalesModule/addPassenger.vue
View file @ 2093a834
<style> <style>
.heightauto .el-input{ .heightauto .el-input {
height: auto !important; height: auto !important;
} }
.addPassenger .btmTitle { .addPassenger .btmTitle {
padding: 0 10px; padding: 0 10px;
margin: 20px 0 20px 0; margin: 20px 0 20px 0;
...@@ -134,43 +135,49 @@ ...@@ -134,43 +135,49 @@
top: 0; top: 0;
cursor: pointer; cursor: pointer;
} }
.colorRed input{
.colorRed input {
color: red !important; color: red !important;
} }
</style> </style>
<template> <template>
<div class="addPassenger"> <div class="addPassenger">
<p class="btmTitle">旅客基本资料</p> <p class="btmTitle">旅客基本资料</p>
<div class="contOut" v-loading='loading' element-loading-text="努力识别中...." element-loading-spinner="el-icon-loading" <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"> <div class="contForm">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px"> <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px">
<li> <li>
<el-form-item label="身份证号码" prop="IdCard" v-if="LineId === 14 || LineId === 2"> <el-form-item label="身份证号码" prop="IdCard" v-if="LineId === 14 || LineId === 2">
<el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()"> <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写"
@blur.prevent="authentication()">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号码" v-else> <el-form-item label="身份证号码" v-else>
<el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()"> <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写"
@blur.prevent="authentication()">
</el-input> </el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="中文姓" prop="SurName"> <el-form-item label="中文姓" prop="SurName">
<el-input v-model='addMsg.SurName' class="w230" @input="Transformation(addMsg.SurName,'SurName')" <el-input v-model='addMsg.SurName' class="w230" @input="Transformation(addMsg.SurName,'SurName')"
placeholder="请输入中文"></el-input> placeholder="请输入中文"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="中文名" prop="Name"> <el-form-item label="中文名" prop="Name">
<el-input v-model='addMsg.Name' class="w230" @input="Transformation(addMsg.Name,'Name')" <el-input v-model='addMsg.Name' class="w230" @input="Transformation(addMsg.Name,'Name')"
placeholder="请输入中文"></el-input> placeholder="请输入中文"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="性别" prop="Sex"> <el-form-item label="性别" prop="Sex">
<el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2' @change="Roominformation()">男</el-checkbox> <el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2' @change="Roominformation()">男
<el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1' @change="Roominformation()">女</el-checkbox> </el-checkbox>
<el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1' @change="Roominformation()">女
</el-checkbox>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
...@@ -188,44 +195,44 @@ ...@@ -188,44 +195,44 @@
<li> <li>
<el-form-item label="手机号码" prop="MobilePhone"> <el-form-item label="手机号码" prop="MobilePhone">
<el-input v-model="addMsg.MobilePhone" type="text" size=mini class="w230" maxlength="20" <el-input v-model="addMsg.MobilePhone" type="text" size=mini class="w230" maxlength="20"
placeholder="请填写"></el-input> placeholder="请填写"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="出生日期" prop="Birthday"> <el-form-item label="出生日期" prop="Birthday">
<el-date-picker v-model='addMsg.Birthday' class="w230" @change="zhanchuangTips(addMsg.Birthday)" value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='addMsg.Birthday' class="w230" @change="zhanchuangTips(addMsg.Birthday)"
placeholder="选择日期"></el-date-picker> value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="出生地" prop="BirthdayAddress"> <el-form-item label="出生地" prop="BirthdayAddress">
<el-input v-model="addMsg.BirthdayAddress" type="text" size=mini class="w230" maxlength="20" <el-input v-model="addMsg.BirthdayAddress" type="text" size=mini class="w230" maxlength="20"
placeholder="请填写"></el-input> placeholder="请填写"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="护照号" prop="PassportNo"> <el-form-item label="护照号" prop="PassportNo">
<el-input v-model='addMsg.PassportNo' type="text" size=mini class="w230" maxlength="20" <el-input v-model='addMsg.PassportNo' type="text" size=mini class="w230" maxlength="20"
placeholder="请填写护照号"></el-input> placeholder="请填写护照号"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="护照签发地" prop="PassportAddress"> <el-form-item label="护照签发地" prop="PassportAddress">
<el-input v-model='addMsg.PassportAddress' type="text" size=mini class="w230" maxlength="100" <el-input v-model='addMsg.PassportAddress' type="text" size=mini class="w230" maxlength="100"
placeholder="请填写"></el-input> placeholder="请填写"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="护照签发日期" prop="PassportIssued"> <el-form-item label="护照签发日期" prop="PassportIssued">
<el-date-picker v-model='addMsg.PassportIssued' class="w230" value-format="yyyy-MM-dd" type="date" <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> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="护照过期日" prop="PassportExpiry"> <el-form-item label="护照过期日" prop="PassportExpiry">
<el-date-picker v-model='addMsg.PassportExpiry' class="w230" :class=" guoqi ? 'colorRed' : ''" @change="timeOver" value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='addMsg.PassportExpiry' class="w230" :class=" guoqi ? 'colorRed' : ''"
placeholder="选择日期"></el-date-picker> @change="timeOver" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
...@@ -250,12 +257,10 @@ ...@@ -250,12 +257,10 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="家庭详细地址" prop="AddressDetail"> <el-form-item label="家庭详细地址" prop="AddressDetail">
<el-input v-model="addMsg.AddressDetail" type="text" class="w230" size=mini maxlength="200" <el-input v-model="addMsg.AddressDetail" type="text" class="w230" size=mini maxlength="200"
placeholder="请填写"></el-input> placeholder="请填写"></el-input>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
...@@ -271,7 +276,7 @@ ...@@ -271,7 +276,7 @@
<li> <li>
<el-form-item label="出境记录" prop="HistoryRecord"> <el-form-item label="出境记录" prop="HistoryRecord">
<el-select v-model="addMsg.HistoryRecord" filterable size=mini class="w230" <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 v-for="item in VisaDeparturesType" :key="item.Id" :label="item.Name" :value="item.Name">
</el-option> </el-option>
</el-select> </el-select>
...@@ -325,8 +330,10 @@ ...@@ -325,8 +330,10 @@
</li> </li>
<li> <li>
<el-form-item label="是否占床"> <el-form-item label="是否占床">
<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='1' :false-label='0'
<el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='0' :false-label='1' @change="Roominformation()">否</el-checkbox> @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> </el-form-item>
</li> </li>
<li v-if="isOneDay !== 1"> <li v-if="isOneDay !== 1">
...@@ -335,27 +342,29 @@ ...@@ -335,27 +342,29 @@
<el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID"> <el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
<input type="button" value="新增房间" class="normalBtn" v-if="!UpdateOrderHouseBtn" @click="addhouse()" title="需要拼房，但没有双人间（半间）的点击新增房间"/> <input type="button" value="新增房间" class="normalBtn" v-if="!UpdateOrderHouseBtn" @click="addhouse()"
<input type="button" value="刷新房间" class="normalBtn" v-if="UpdateOrderHouseBtn" @click="SellUpdateOrderHouse()" title="选择人数后没有房间的点击刷新"/> title="需要拼房，但没有双人间（半间）的点击新增房间" />
<input type="button" value="刷新房间" class="normalBtn" v-if="UpdateOrderHouseBtn"
@click="SellUpdateOrderHouse()" title="选择人数后没有房间的点击刷新" />
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="是否需签证"> <el-form-item label="是否需签证">
<el-checkbox v-model='addMsg.IsVisaFree' name="IsVisaFree" <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>
<el-checkbox v-model='addMsg.IsVisaFree' name="IsVisaFree" <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> </el-checkbox>
&nbsp;&nbsp; &nbsp;&nbsp;
<el-select v-model="addMsg.VisaReplaceId" filterable size=mini class="w120" <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 v-for="item in VisaNotNeedList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</li> </li>
<li > <li>
<el-form-item label="签证状态"> <el-form-item label="签证状态">
<el-select v-model="addMsg.VisaState" filterable size=mini class="w120"> <el-select v-model="addMsg.VisaState" filterable size=mini class="w120">
<el-option :key="0" label="正常" :value="0"> <el-option :key="0" label="正常" :value="0">
...@@ -368,12 +377,12 @@ ...@@ -368,12 +377,12 @@
<li> <li>
<el-form-item label="是否单地接"> <el-form-item label="是否单地接">
<el-checkbox v-model='addMsg.IsNeedAirticket' name="IsNeedAirticket" <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" <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; &nbsp;&nbsp;
<el-select v-model="addMsg.AirReplaceId" filterable size=mini class="w120" <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 v-for="item in AirNoeNeedList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -382,24 +391,21 @@ ...@@ -382,24 +391,21 @@
<li> <li>
<el-form-item label="是否需保险"> <el-form-item label="是否需保险">
<el-checkbox v-model='addMsg.IsNeedSafe' name="IsNeedSafe" <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>
<el-checkbox v-model='addMsg.IsNeedSafe' name="IsNeedSafe" <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> </el-checkbox>
&nbsp;&nbsp; &nbsp;&nbsp;
<el-select v-model="addMsg.SafeReplaceId" filterable size=mini class="w120" <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 v-for="item in SafeNotNeedList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="景点"> <el-form-item label="景点">
<el-select v-model="addMsg.CouponsIds" multiple placeholder="请选择" class="heightauto"> <el-select v-model="addMsg.CouponsIds" multiple placeholder="请选择" class="heightauto">
<el-option <el-option v-for="item in JingDianList" :key="item.CouponsId" :label="item.CouponsName"
v-for="item in JingDianList"
:key="item.CouponsId"
:label="item.CouponsName"
:value="item.CouponsId"> :value="item.CouponsId">
</el-option> </el-option>
</el-select> </el-select>
...@@ -413,7 +419,7 @@ ...@@ -413,7 +419,7 @@
</el-form> </el-form>
<div class="_addPassengerEconomicCapability"> <div class="_addPassengerEconomicCapability">
<span v-for="item in EconomicCapabilityS" @click="addEconomicCapability(item)" <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> </div>
<div class="contPic"> <div class="contPic">
...@@ -436,7 +442,6 @@ ...@@ -436,7 +442,6 @@
</li> </li>
</div> </div>
<p> <p>
</p> </p>
<div <div
style="width: 100%; min-height: 200px; background: #f1f1f1; line-height: 200px; margin: 10px 0; border-radius: 4px;position: relative; text-align: center;"> style="width: 100%; min-height: 200px; background: #f1f1f1; line-height: 200px; margin: 10px 0; border-radius: 4px;position: relative; text-align: center;">
...@@ -449,7 +454,6 @@ ...@@ -449,7 +454,6 @@
<input type="button" value="开始识别" class="normalBtn" @click="commonTextDiscern" /> <input type="button" value="开始识别" class="normalBtn" @click="commonTextDiscern" />
</div> </div>
</div> </div>
<p class="btmTitle">日本签证补录资料</p> <p class="btmTitle">日本签证补录资料</p>
<div class="cont1"> <div class="cont1">
<el-form label-width="120px"> <el-form label-width="120px">
...@@ -470,7 +474,6 @@ ...@@ -470,7 +474,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="曾有国籍"> <el-form-item label="曾有国籍">
...@@ -493,7 +496,6 @@ ...@@ -493,7 +496,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="配偶/监护人职位"> <el-form-item label="配偶/监护人职位">
...@@ -519,7 +521,6 @@ ...@@ -519,7 +521,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="上次去时间" prop="Birthday"> <el-form-item label="上次去时间" prop="Birthday">
...@@ -544,7 +545,6 @@ ...@@ -544,7 +545,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="酒店电话/友人电话" prop="Birthday"> <el-form-item label="酒店电话/友人电话" prop="Birthday">
...@@ -567,7 +567,6 @@ ...@@ -567,7 +567,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="紧急人电话" prop="Birthday"> <el-form-item label="紧急人电话" prop="Birthday">
...@@ -593,7 +592,6 @@ ...@@ -593,7 +592,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="报名旅行社" prop="Birthday"> <el-form-item label="报名旅行社" prop="Birthday">
...@@ -612,15 +610,14 @@ ...@@ -612,15 +610,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<p style="text-align: center; padding: 20px 0;"> <p style="text-align: center; padding: 20px 0;">
<input type="button" class="hollowFixedBtn" value="取消" @click="goBack" /> <input type="button" class="hollowFixedBtn" value="取消" @click="goBack" />
<input type="button" class="normalBtn" value="保存" :style="btnState===true?'':'background-color: gray'" <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="保存并继续添加" <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> </p>
</div> </div>
</template> </template>
...@@ -629,9 +626,9 @@ ...@@ -629,9 +626,9 @@
export default { export default {
data() { data() {
return { return {
TravelTypeList:[], TravelTypeList: [],
UnitTypeList:[], UnitTypeList: [],
DutyTypeList:[], DutyTypeList: [],
ppAge: 0, ppAge: 0,
loading: false, loading: false,
appkey_ocr: "OGAhU38ib8EweXMtPVqCbkpN", appkey_ocr: "OGAhU38ib8EweXMtPVqCbkpN",
...@@ -667,9 +664,9 @@ ...@@ -667,9 +664,9 @@
Duty: "", Duty: "",
EconomicCapabilityList: [], EconomicCapabilityList: [],
Remarks: "", Remarks: "",
TravelType:'', TravelType: '',
UnitType:'', UnitType: '',
DutyType:'', DutyType: '',
IsHightSchool: "2", IsHightSchool: "2",
IsRecommend: "2", IsRecommend: "2",
PassportIssued: "", PassportIssued: "",
...@@ -708,21 +705,27 @@ ...@@ -708,21 +705,27 @@
VisaReplaceId: "0", VisaReplaceId: "0",
SafeReplaceId: "0", SafeReplaceId: "0",
VisaState: 0, //签证状态 VisaState: 0, //签证状态
HouseId:'',//房间信息 HouseId: '', //房间信息
CouponsIds: [] CouponsIds: []
}, },
UpdateOrderHouseBtn: false, UpdateOrderHouseBtn: false,
EconomicCapabilityS: [], EconomicCapabilityS: [],
rules: { rules: {
DutyType: [ DutyType: [{
{ required: true, message: '请选择职务类型', trigger: 'change' } required: true,
], message: '请选择职务类型',
UnitType: [ trigger: 'change'
{ required: true, message: '请选择单位类型', trigger: 'change' } }],
], UnitType: [{
TravelType: [ required: true,
{ required: true, message: '请选择出游类型', trigger: 'change' } message: '请选择单位类型',
], trigger: 'change'
}],
TravelType: [{
required: true,
message: '请选择出游类型',
trigger: 'change'
}],
IdCard: [{ IdCard: [{
required: true, required: true,
message: "请填身份证号码", message: "请填身份证号码",
...@@ -744,20 +747,20 @@ ...@@ -744,20 +747,20 @@
trigger: "change" trigger: "change"
}], }],
ESurName: [{ ESurName: [{
required: true, required: true,
message: "请填写英文姓", message: "请填写英文姓",
trigger: "blur" trigger: "blur"
}, },
{ {
pattern: /^[a-zA-Z]/, pattern: /^[a-zA-Z]/,
message: "请输入英文姓" message: "请输入英文姓"
} }
], ],
EName: [{ EName: [{
required: true, required: true,
message: "请填写英文名", message: "请填写英文名",
trigger: "blur" trigger: "blur"
}, },
{ {
pattern: /^[a-zA-Z]/, pattern: /^[a-zA-Z]/,
message: "请输入英文姓" message: "请输入英文姓"
...@@ -769,10 +772,10 @@ ...@@ -769,10 +772,10 @@
trigger: "blur" trigger: "blur"
}], }],
PassportNo: [{ PassportNo: [{
required: true, required: true,
message: "请填写护照号", message: "请填写护照号",
trigger: "blur" trigger: "blur"
}, },
{ {
pattern: /^[0-9a-zA-Z]+$/, pattern: /^[0-9a-zA-Z]+$/,
message: "正确的护照号" message: "正确的护照号"
...@@ -797,8 +800,7 @@ ...@@ -797,8 +800,7 @@
required: true, required: true,
message: "请填写手机号码", message: "请填写手机号码",
trigger: "blur" trigger: "blur"
} }],
],
Nationality: [{ Nationality: [{
required: true, required: true,
message: "请选择国籍", message: "请选择国籍",
...@@ -831,7 +833,7 @@ ...@@ -831,7 +833,7 @@
AirStartStatus: 2, AirStartStatus: 2,
SafeStartStatus: 2, SafeStartStatus: 2,
btnState: true, btnState: true,
roomlist:[], roomlist: [],
isOneDay: 0, isOneDay: 0,
LineId: 0, LineId: 0,
EndDateStr: '', EndDateStr: '',
...@@ -840,54 +842,48 @@ ...@@ -840,54 +842,48 @@
}; };
}, },
methods: { methods: {
getDutyType(){ getDutyType() {
this.apipost( this.apipost(
"dict_get_GetDictValueCommonList", "dict_get_GetDictValueCommonList", {
{
Key: 'SK_CRM_DutyType', Key: 'SK_CRM_DutyType',
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DutyTypeList = res.data.data this.DutyTypeList = res.data.data
}else{ } else {}
}
}, },
err => {} err => {}
); );
}, },
getUnitType(){ getUnitType() {
this.apipost( this.apipost(
"dict_get_GetDictValueCommonList", "dict_get_GetDictValueCommonList", {
{
Key: 'SK_CRM_UnitType', Key: 'SK_CRM_UnitType',
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.UnitTypeList = res.data.data this.UnitTypeList = res.data.data
}else{ } else {}
}
}, },
err => {} err => {}
); );
}, },
getTravelType(){ getTravelType() {
this.apipost( this.apipost(
"dict_get_GetDictValueCommonList", "dict_get_GetDictValueCommonList", {
{
Key: 'SK_CRM_TravelType', Key: 'SK_CRM_TravelType',
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TravelTypeList = res.data.data this.TravelTypeList = res.data.data
}else{ } else {}
}
}, },
err => {} err => {}
); );
}, },
jsGetAge(strBirthday){ jsGetAge(strBirthday) {
let returnAge; let returnAge;
let strBirthdayArr=strBirthday.split("-"); let strBirthdayArr = strBirthday.split("-");
let birthYear = Number(strBirthdayArr[0]); let birthYear = Number(strBirthdayArr[0]);
let birthMonth = Number(strBirthdayArr[1]); let birthMonth = Number(strBirthdayArr[1]);
let birthDay = Number(strBirthdayArr[2]); let birthDay = Number(strBirthdayArr[2]);
...@@ -895,73 +891,62 @@ ...@@ -895,73 +891,62 @@
let nowYear = d.getFullYear(); let nowYear = d.getFullYear();
let nowMonth = d.getMonth() + 1; let nowMonth = d.getMonth() + 1;
let nowDay = d.getDate(); let nowDay = d.getDate();
if(nowYear === birthYear){ if (nowYear === birthYear) {
returnAge = 1;//同年 则为0岁 returnAge = 1; //同年 则为0岁
} else { } else {
let ageDiff = nowYear - birthYear ; //年之差 let ageDiff = nowYear - birthYear; //年之差
if(ageDiff > 0){ if (ageDiff > 0) {
if(nowMonth == birthMonth) { if (nowMonth == birthMonth) {
let dayDiff = nowDay - birthDay;//日之差 let dayDiff = nowDay - birthDay; //日之差
if(dayDiff < 0) if (dayDiff < 0) {
{ returnAge = ageDiff - 1;
returnAge = ageDiff - 1; } else {
} returnAge = ageDiff;
else }
{ } else {
returnAge = ageDiff ; let monthDiff = nowMonth - birthMonth; //月之差
} if (monthDiff < 0) {
} returnAge = ageDiff - 1;
else } else {
{ returnAge = ageDiff;
let monthDiff = nowMonth - birthMonth;//月之差 }
if(monthDiff < 0)
{
returnAge = ageDiff - 1;
}
else
{
returnAge = ageDiff ;
}
}
}
else
{
returnAge = -1;//返回-1 表示出生日期输入错误 晚于今天
} }
} else {
returnAge = -1; //返回-1 表示出生日期输入错误 晚于今天
}
} }
return returnAge;//返回周岁年龄 return returnAge; //返回周岁年龄
}, },
zhanchuangTips: function (b){ zhanchuangTips: function (b) {
let age = this.jsGetAge(b) let age = this.jsGetAge(b)
this.ppAge = age this.ppAge = age
if (age == -1) { if (age == -1) {
this.$message.error('出生日期'+ b +'有误') this.$message.error('出生日期' + b + '有误')
this.addMsg.Birthday = '' this.addMsg.Birthday = ''
return return
} }
}, },
getJingDIan: function (){ getJingDIan: function () {
this.apipost( this.apipost(
"sellorder_post_GetGuestScenicRefundList", "sellorder_post_GetGuestScenicRefundList", {
{
TCID: this.addMsg.TCID, TCID: this.addMsg.TCID,
OrderId: this.addMsg.OrderId, OrderId: this.addMsg.OrderId,
GuestId: this.addMsg.Id GuestId: this.addMsg.Id
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.JingDianList = res.data.data this.JingDianList = res.data.data
}else{ } else {
this.$message.error('操作失败') this.$message.error('操作失败')
} }
}, },
err => {} err => {}
); );
}, },
CompareDate(d1, d2){ CompareDate(d1, d2) {
return ((new Date(d1.replace(/-/g,"\/"))) < (new Date(d2.replace(/-/g,"\/")))); return ((new Date(d1.replace(/-/g, "\/"))) < (new Date(d2.replace(/-/g, "\/"))));
}, },
timeOver: function(){ timeOver: function () {
this.guoqi = this.CompareDate(this.addMsg.PassportExpiry, this.EndDateStr) this.guoqi = this.CompareDate(this.addMsg.PassportExpiry, this.EndDateStr)
if (this.guoqi) { if (this.guoqi) {
this.$message.error("客人护照过期时间小于团队出发日期后六个月") this.$message.error("客人护照过期时间小于团队出发日期后六个月")
...@@ -1147,8 +1132,7 @@ ...@@ -1147,8 +1132,7 @@
chinaFirstName = word.substring(0, 1); chinaFirstName = word.substring(0, 1);
chinaLastName = word.substring(1, word.length); chinaLastName = word.substring(1, word.length);
} }
} catch (e) { } catch (e) {}
}
} }
} else if (word_name == '性别') { } else if (word_name == '性别') {
if (word == '女/F' || word.indexOf('女') != -1 || word.indexOf('F') != -1) { if (word == '女/F' || word.indexOf('女') != -1 || word.indexOf('F') != -1) {
...@@ -1180,8 +1164,7 @@ ...@@ -1180,8 +1164,7 @@
enFirstName = word.split('，')[0]; enFirstName = word.split('，')[0];
enLastName = word.split('，')[1]; enLastName = word.split('，')[1];
} }
} catch (e) { } catch (e) {}
}
} }
} else if (word_name == '护照号码') { } else if (word_name == '护照号码') {
if (word.indexOf('i') != -1) { if (word.indexOf('i') != -1) {
...@@ -1270,8 +1253,7 @@ ...@@ -1270,8 +1253,7 @@
chinaFirstName = word.split('/')[0]; chinaFirstName = word.split('/')[0];
enFirstName = word.split('/')[1]; enFirstName = word.split('/')[1];
} }
} catch (e) { } catch (e) {}
}
} else if (word_name == '名') { } else if (word_name == '名') {
try { try {
chinaLastName = word; chinaLastName = word;
...@@ -1281,8 +1263,7 @@ ...@@ -1281,8 +1263,7 @@
chinaLastName = word.split('/')[0]; chinaLastName = word.split('/')[0];
enLastName = word.split('/')[1]; enLastName = word.split('/')[1];
} }
} catch (e) { } catch (e) {}
}
} else if (word_name == '性别') { } else if (word_name == '性别') {
try { try {
if (word == 'M' || word.indexOf('M') != -1 || word.indexOf('m') == -1 || word.indexOf('男') != -1) { if (word == 'M' || word.indexOf('M') != -1 || word.indexOf('m') == -1 || word.indexOf('男') != -1) {
...@@ -1296,8 +1277,7 @@ ...@@ -1296,8 +1277,7 @@
'Name': '女' 'Name': '女'
}; };
} }
} catch (e) { } catch (e) {}
}
} else if (word_name == '出生日期') { } else if (word_name == '出生日期') {
birthday = this.formatDateWithTaiwan(word) birthday = this.formatDateWithTaiwan(word)
} else if (word_name == '护照号') { } else if (word_name == '护照号') {
...@@ -1414,8 +1394,7 @@ ...@@ -1414,8 +1394,7 @@
'Name': '女' 'Name': '女'
}; };
} }
} catch (e) { } catch (e) {}
}
} else if (word_name == '出生日期') { } else if (word_name == '出生日期') {
birthday = this.formatDateWithTaiwan(word) birthday = this.formatDateWithTaiwan(word)
} else if (word_name == 'name') { } else if (word_name == 'name') {
...@@ -1437,8 +1416,7 @@ ...@@ -1437,8 +1416,7 @@
enFirstName = word; enFirstName = word;
enLastName = word; enLastName = word;
} }
} catch (e) { } catch (e) {}
}
} }
} else if (word_name == '护照号码') { } else if (word_name == '护照号码') {
if (word.indexOf('i') != -1) { if (word.indexOf('i') != -1) {
...@@ -1647,7 +1625,6 @@ ...@@ -1647,7 +1625,6 @@
}, },
submitForm(addMsg, type) { submitForm(addMsg, type) {
if (this.btnState === true) { if (this.btnState === true) {
//提交创建、修改表单 //提交创建、修改表单
this.$refs[addMsg].validate(valid => { this.$refs[addMsg].validate(valid => {
this.btnState = false this.btnState = false
...@@ -1663,9 +1640,8 @@ ...@@ -1663,9 +1640,8 @@
savePassenger(type) { savePassenger(type) {
this.timeOver() this.timeOver()
if ((this.LineId === 14 || this.LineId === 2) && this.addMsg.IdCard === '') { if ((this.LineId === 14 || this.LineId === 2) && this.addMsg.IdCard === '') {
return this.$message.error('请填写身份证号码！'); return this.$message.error('请填写身份证号码！');
} }
this.addMsg.EconomicCapabilityList = []; this.addMsg.EconomicCapabilityList = [];
this.EconomicCapabilityS.forEach(x => { this.EconomicCapabilityS.forEach(x => {
if (x.isShow == true) { if (x.isShow == true) {
...@@ -1679,21 +1655,21 @@ ...@@ -1679,21 +1655,21 @@
if (this.addMsg.Marriage == "") { if (this.addMsg.Marriage == "") {
this.addMsg.Marriage = "0"; this.addMsg.Marriage = "0";
} }
if(this.ppAge <= 10 && this.addMsg.IsBed == 1) { if (this.ppAge <= 10 && this.addMsg.IsBed == 1) {
this.$confirm(this.$t('该游客未满十岁确认占床?'), this.$t('tips.tips'), { this.$confirm(this.$t('该游客未满十岁确认占床?'), this.$t('tips.tips'), {
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.seveInfo(type) this.seveInfo(type)
}).catch(() => { }).catch(() => {
this.btnState = true this.btnState = true
}); });
} else { } else {
this.seveInfo(type) this.seveInfo(type)
} }
}, },
seveInfo(type){ seveInfo(type) {
this.apipost( this.apipost(
"sellorder_post_SetTravelGuestInfo_V2", "sellorder_post_SetTravelGuestInfo_V2",
this.addMsg, this.addMsg,
...@@ -1719,7 +1695,7 @@ ...@@ -1719,7 +1695,7 @@
this.apipost( this.apipost(
"dict_post_GetList", { "dict_post_GetList", {
Key: "SK_Visa_EconomicCapability", Key: "SK_Visa_EconomicCapability",
IsTimer:1 IsTimer: 1
}, },
res => { res => {
this.EconomicCapabilityS = res.data.data; this.EconomicCapabilityS = res.data.data;
...@@ -1924,11 +1900,10 @@ ...@@ -1924,11 +1900,10 @@
this.SafeStartStatus = this.addMsg.IsNeedSafe; this.SafeStartStatus = this.addMsg.IsNeedSafe;
this.zhanchuangTips(obj.Birthday) this.zhanchuangTips(obj.Birthday)
this.$forceUpdate(); this.$forceUpdate();
this.getHouselist(obj.Sex.toString(),obj.TCID,obj.OrderId,obj.IsBed) this.getHouselist(obj.Sex.toString(), obj.TCID, obj.OrderId, obj.IsBed)
if ( this.$route.query.isOneDay === 1) { if (this.$route.query.isOneDay === 1) {
this.addMsg.IsBed = 0 this.addMsg.IsBed = 0
} }
// this.Roominformation()
} else { } else {
this.$message.error(); this.$message.error();
} }
...@@ -2023,7 +1998,7 @@ ...@@ -2023,7 +1998,7 @@
this.addMsg.AirReplaceId = "0"; this.addMsg.AirReplaceId = "0";
this.addMsg.VisaReplaceId = "0"; this.addMsg.VisaReplaceId = "0";
this.addMsg.SafeReplaceId = "0"; this.addMsg.SafeReplaceId = "0";
this.addMsg.VisaState=0; this.addMsg.VisaState = 0;
this.GetGuestMustVisaAir(); this.GetGuestMustVisaAir();
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
var BranchName = userInfo.BranchName; var BranchName = userInfo.BranchName;
...@@ -2039,19 +2014,23 @@ ...@@ -2039,19 +2014,23 @@
} }
this.addMsg.IssuingAuthority = "公安部出入境管理局"; this.addMsg.IssuingAuthority = "公安部出入境管理局";
}, },
Roominformation(){ Roominformation() {
let TCIDs = this.addMsg.TCID; let TCIDs = this.addMsg.TCID;
let OrderId = this.addMsg.OrderId; let OrderId = this.addMsg.OrderId;
let IsBed = this.addMsg.IsBed; let IsBed = this.addMsg.IsBed;
let Sex = this.addMsg.Sex; let Sex = this.addMsg.Sex;
if(Sex ==1 || Sex == 2) { if (Sex == 1 || Sex == 2) {
this.apipost( this.apipost(
"sellorder_post_GetHouseDetailsByOrderID", "sellorder_post_GetHouseDetailsByOrderID", {
{TCIDs: TCIDs, OrderId: OrderId, Sex: Sex, IsBed: IsBed}, TCIDs: TCIDs,
OrderId: OrderId,
Sex: Sex,
IsBed: IsBed
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.roomlist = res.data.data; this.roomlist = res.data.data;
if (this.roomlist.length < 1) { if (this.roomlist.length < 1) {
this.UpdateOrderHouseBtn = true this.UpdateOrderHouseBtn = true
} }
...@@ -2059,33 +2038,36 @@ ...@@ -2059,33 +2038,36 @@
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, },
err => { err => {}
}
); );
} }
}, },
SellUpdateOrderHouse(){ SellUpdateOrderHouse() {
let OrderId = this.addMsg.OrderId; let OrderId = this.addMsg.OrderId;
this.apipost( this.apipost(
"sellorder_post_SellUpdateOrderHouse_V2", "sellorder_post_SellUpdateOrderHouse_V2", {
{OrderId: OrderId}, OrderId: OrderId
res => { },
if (res.data.resultCode == 1) { res => {
this.Roominformation() if (res.data.resultCode == 1) {
this.UpdateOrderHouseBtn = false this.Roominformation()
} else { this.UpdateOrderHouseBtn = false
this.$message.error(res.data.message); } else {
} this.$message.error(res.data.message);
},
err => {
} }
); },
err => {}
);
}, },
getHouselist(Sex,TCID,OrderId,IsBed){ getHouselist(Sex, TCID, OrderId, IsBed) {
if(Sex ==1 || Sex == 2){ if (Sex == 1 || Sex == 2) {
this.apipost( this.apipost(
"sellorder_post_GetHouseDetailsByOrderID", "sellorder_post_GetHouseDetailsByOrderID", {
{TCIDs:TCID,OrderId:OrderId,Sex:Sex,IsBed:IsBed}, TCIDs: TCID,
OrderId: OrderId,
Sex: Sex,
IsBed: IsBed
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.roomlist = res.data.data; this.roomlist = res.data.data;
...@@ -2095,17 +2077,19 @@ ...@@ -2095,17 +2077,19 @@
}, },
err => {} err => {}
); );
}else { } else {
this.$message.error('请选择性别'); this.$message.error('请选择性别');
} }
}, },
addhouse(){ addhouse() {
let orderId = this.addMsg.OrderId; let orderId = this.addMsg.OrderId;
let sex = this.addMsg.Sex; let sex = this.addMsg.Sex;
if(sex ==1 || sex == 2) { if (sex == 1 || sex == 2) {
this.apipost( this.apipost(
"sellorder_get_BatchSetOrderHouse_V2", "sellorder_get_BatchSetOrderHouse_V2", {
{orderId: orderId, sex: sex,}, orderId: orderId,
sex: sex,
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Roominformation() this.Roominformation()
...@@ -2113,22 +2097,21 @@ ...@@ -2113,22 +2097,21 @@
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, },
err => { err => {}
}
); );
} }
}, },
authentication() { authentication() {
let IdCard = this.addMsg.IdCard; let IdCard = this.addMsg.IdCard;
if (this.$route.query.guestId == 0) { if (this.$route.query.guestId == 0) {
if(IdCard.length == 18){ if (IdCard.length == 18) {
this.apipost( this.apipost(
"sellorder_post_GetGusetByIDCard", "sellorder_post_GetGusetByIDCard", {
{IdCard: this.addMsg.IdCard,}, IdCard: this.addMsg.IdCard,
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let obj = res.data.data; let obj = res.data.data;
this.addMsg.SurName = obj.SurName; this.addMsg.SurName = obj.SurName;
this.addMsg.Name = obj.Name; this.addMsg.Name = obj.Name;
this.addMsg.ESurName = obj.ESurName; this.addMsg.ESurName = obj.ESurName;
...@@ -2152,24 +2135,18 @@ ...@@ -2152,24 +2135,18 @@
this.addMsg.HistoryRecord = obj.HistoryRecord; this.addMsg.HistoryRecord = obj.HistoryRecord;
this.addMsg.Duty = obj.Duty; this.addMsg.Duty = obj.Duty;
this.addMsg.Remarks = obj.Remarks; this.addMsg.Remarks = obj.Remarks;
this.addMsg.TravelType =Number(obj.TravelType); this.addMsg.TravelType = Number(obj.TravelType);
this.addMsg.UnitType = Number(obj.UnitType); this.addMsg.UnitType = Number(obj.UnitType);
this.addMsg.DutyType = Number(obj.DutyType); this.addMsg.DutyType = Number(obj.DutyType);
this.addMsg.IsHightSchool = obj.IsHightSchool; this.addMsg.IsHightSchool = obj.IsHightSchool;
this.addMsg.IsRecommend = obj.IsRecommend; this.addMsg.IsRecommend = obj.IsRecommend;
this.addMsg.Id = this.$route.query.guestId; this.addMsg.Id = this.$route.query.guestId;
this.addMsg.TCID = this.$route.query.TCID; this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId; this.addMsg.OrderId = this.$route.query.orderId;
this.Roominformation() //调取下房间信息 this.Roominformation() //调取下房间信息
} else {
// this.$message.error(res.data.message);
} }
}, },
err => { err => {}
}
); );
} }
} }
...@@ -2208,4 +2185,4 @@ ...@@ -2208,4 +2185,4 @@
this.getJingDIan(); this.getJingDIan();
} }
}; };
</script> </script>
\ No newline at end of file
src/components/TravelManager/TravelNewQuotation/QuotationPrice_SWT.vue
View file @ 2093a834
...@@ -1770,6 +1770,30 @@ ...@@ -1770,6 +1770,30 @@
}, },
//保存数据 //保存数据
SaveData(type) { SaveData(type) {
if (!this.postData.DayNum) {
this.postData.DayNum = 0;
}
if (!this.postData.GuestNum) {
this.postData.GuestNum = 0;
}
if (!this.postData.FocNum) {
this.postData.FocNum = 0;
}
if (!this.postData.SalePrice) {
this.postData.SalePrice = 0;
}
if (!this.postData.SingleRoomPrice) {
this.postData.SingleRoomPrice = 0;
}
if (!this.postData.HotelDisNum) {
this.postData.HotelDisNum = 0;
}
if (!this.postData.DinnerDisNum) {
this.postData.DinnerDisNum = 0;
}
if (!this.postData.TicketDisNum) {
this.postData.TicketDisNum = 0;
}
//酒店默认值赋值 //酒店默认值赋值
if (this.postData.SWTHotelList && this.postData.SWTHotelList.length > 0) { if (this.postData.SWTHotelList && this.postData.SWTHotelList.length > 0) {
this.postData.SWTHotelList.forEach(item => { this.postData.SWTHotelList.forEach(item => {
...@@ -1835,6 +1859,24 @@ ...@@ -1835,6 +1859,24 @@
}) })
}) })
} }
if (this.postData.SWTBusOtherList && this.postData.SWTBusOtherList.length > 0) {
this.postData.SWTBusOtherList.forEach(rootItem => {
rootItem.SubBusList.forEach(item => {
if (!item.Kilometre) {
item.Kilometre = 0;
}
if (!item.VNDPrice) {
item.VNDPrice = 0;
}
if (!item.Times) {
item.Times = 0;
}
if (!item.Price) {
item.Price = 0;
}
})
})
}
//船票默认值赋值 //船票默认值赋值
if (this.postData.SWTShipList && this.postData.SWTShipList.length > 0) { if (this.postData.SWTShipList && this.postData.SWTShipList.length > 0) {
this.postData.SWTShipList.forEach(item => { this.postData.SWTShipList.forEach(item => {
......
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
View file @ 2093a834
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
.Ht_hotelSelect .el-input { .Ht_hotelSelect .el-input {
height: auto !important; height: auto !important;
} }
</style> </style>
<template> <template>
<div class="Traveltrip-item-box"> <div class="Traveltrip-item-box">
...@@ -40,12 +41,12 @@ ...@@ -40,12 +41,12 @@
</td> </td>
<td width="211" valign="middle"> <td width="211" valign="middle">
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="w160" :placeholder="$t('pub.pleaseSel')" filterable <el-select v-if="!dayObj.isRead&&IsDirect==1" class="w160" :placeholder="$t('pub.pleaseSel')" filterable
v-model="dayObj.DinnerArray[0].BreakfastUseType"> v-model="dayObj.DinnerArray[0].BreakfastUseType">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in breakFirstList" :label="item.name" :value="item.Id" :key="item.Id"></el-option> <el-option v-for="item in breakFirstList" :label="item.name" :value="item.Id" :key="item.Id"></el-option>
</el-select> </el-select>
<el-input type="text" v-model="dayObj.DinnerArray[0].DinnerName" class="w160" <el-input type="text" v-model="dayObj.DinnerArray[0].DinnerName" class="w160"
v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(0)"></el-input> v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(0)"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead "> <span class="TC-hotelName" v-if="dayObj.isRead ">
{{IsDirect==1? getBreakfirst(dayObj.DinnerArray[0].BreakfastUseType):dayObj.DinnerArray[0].DinnerName}} {{IsDirect==1? getBreakfirst(dayObj.DinnerArray[0].BreakfastUseType):dayObj.DinnerArray[0].DinnerName}}
</span> </span>
...@@ -55,8 +56,8 @@ ...@@ -55,8 +56,8 @@
</td> </td>
<td width="211" valign="middle"> <td width="211" valign="middle">
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="w160" :placeholder="$t('pub.pleaseSel')" filterable <el-select v-if="!dayObj.isRead&&IsDirect==1" class="w160" :placeholder="$t('pub.pleaseSel')" filterable
v-model="dayObj.DinnerArray[1].DinnerId" @visible-change="getDinnerList($event)" v-model="dayObj.DinnerArray[1].DinnerId" @visible-change="getDinnerList($event)"
@change="changeDinnerList(dayObj.DinnerArray[1])"> @change="changeDinnerList(dayObj.DinnerArray[1])">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in QDinnerList" :label="item.Name" :value="item.ID" :key="item.ID"> <el-option v-for="item in QDinnerList" :label="item.Name" :value="item.ID" :key="item.ID">
<span>{{ item.Name }}</span> <span>{{ item.Name }}</span>
...@@ -64,7 +65,7 @@ ...@@ -64,7 +65,7 @@
</el-option> </el-option>
</el-select> </el-select>
<el-input type="text" v-model="dayObj.DinnerArray[1].DinnerName" class="w160" <el-input type="text" v-model="dayObj.DinnerArray[1].DinnerName" class="w160"
v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(1)"></el-input> v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(1)"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead"> <span class="TC-hotelName" v-if="dayObj.isRead">
{{IsDirect==1? getQDinnerList(dayObj.DinnerArray[1].DinnerId):dayObj.DinnerArray[1].DinnerName}} {{IsDirect==1? getQDinnerList(dayObj.DinnerArray[1].DinnerId):dayObj.DinnerArray[1].DinnerName}}
</span> </span>
...@@ -74,8 +75,8 @@ ...@@ -74,8 +75,8 @@
</td> </td>
<td valign="middle"> <td valign="middle">
<el-select v-if="!dayObj.isRead&&IsDirect==1" class="w160" :placeholder="$t('pub.pleaseSel')" filterable <el-select v-if="!dayObj.isRead&&IsDirect==1" class="w160" :placeholder="$t('pub.pleaseSel')" filterable
v-model="dayObj.DinnerArray[2].DinnerId" @visible-change="getDinnerList($event)" v-model="dayObj.DinnerArray[2].DinnerId" @visible-change="getDinnerList($event)"
@change="changeDinner2List(dayObj.DinnerArray[2])"> @change="changeDinner2List(dayObj.DinnerArray[2])">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in QDinnerList2" :label="item.Name" :value="item.ID" :key="item.ID"> <el-option v-for="item in QDinnerList2" :label="item.Name" :value="item.ID" :key="item.ID">
<span>{{ item.Name }}</span> <span>{{ item.Name }}</span>
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
</el-select> </el-select>
<el-input type="text" v-model="dayObj.DinnerArray[2].DinnerName" class="w160" <el-input type="text" v-model="dayObj.DinnerArray[2].DinnerName" class="w160"
v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(2)"></el-input> v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(2)"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead"> <span class="TC-hotelName" v-if="dayObj.isRead">
{{IsDirect==1?getQDinnerList2(dayObj.DinnerArray[2].DinnerId):dayObj.DinnerArray[2].DinnerName}} {{IsDirect==1?getQDinnerList2(dayObj.DinnerArray[2].DinnerId):dayObj.DinnerArray[2].DinnerName}}
</span> </span>
...@@ -101,10 +102,9 @@ ...@@ -101,10 +102,9 @@
<td valign="middle" colspan="5"> <td valign="middle" colspan="5">
<!--酒店--> <!--酒店-->
<el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="w478 Ht_hotelSelect" size="mini" <el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="w478 Ht_hotelSelect" size="mini"
v-model="HotelChooseArray" v-model="HotelChooseArray" multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1"
multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1" @visible-change="getHotelList($event)" @visible-change="getHotelList($event)" @change="changeHotelList()" filterable placeholder="请选择"
@change="changeHotelList()" :disabled="IsOpenHotel==1?true:false">
filterable placeholder="请选择" :disabled="IsOpenHotel==1?true:false">
<el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID"> <el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
<span style="float: left">{{ getHotelItemLabel(item) }}</span> <span style="float: left">{{ getHotelItemLabel(item) }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
</span> </span>
<span v-if="hotelArray.length>0">&nbsp;/或同级</span> <span v-if="hotelArray.length>0">&nbsp;/或同级</span>
</span> </span>
<el-input type="text" v-if="!dayObj.isRead&&IsDirect==0&&hotelArray[0]" v-model="hotelArray[0].HotelName" @change="noDirectHotelChange" <el-input type="text" v-if="!dayObj.isRead&&IsDirect==0&&hotelArray[0]" v-model="hotelArray[0].HotelName"
class="w478"></el-input> @change="noDirectHotelChange" class="w478"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead&&IsDirect==0"> <span class="TC-hotelName" v-if="dayObj.isRead&&IsDirect==0">
{{hotelArray[0].HotelName}} &nbsp;/或同级 {{hotelArray[0].HotelName}} &nbsp;/或同级
</span> </span>
...@@ -130,8 +130,8 @@ ...@@ -130,8 +130,8 @@
</template> </template>
<script> <script>
export default { export default {
props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType", props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig", "TeamType",
"IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息 "IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
], ],
data() { data() {
return { return {
...@@ -139,64 +139,13 @@ ...@@ -139,64 +139,13 @@
QDinnerList: [], QDinnerList: [],
QDinnerList2: [], QDinnerList2: [],
DefaultSelectValue: 0, DefaultSelectValue: 0,
breakFirstList: [{ breakFirstList: [ ],
Id: 1,
name: "酒店内享用早餐"
},
{
Id: 2,
name: "酒店外享用早餐"
},
{
Id: 4,
name: "机上简餐或自理"
},
{
Id: 3,
name: "方便游玩敬请自理"
}
],
showDining: false, showDining: false,
HotelChooseArray: this.dayObj.HotelChooseArray, HotelChooseArray: this.dayObj.HotelChooseArray,
dinnerArray: this.dayObj.DinnerArray, dinnerArray: this.dayObj.DinnerArray,
hotelArray: this.dayObj.HotelArray, hotelArray: this.dayObj.HotelArray,
otherDinner: [{ otherDinner: [],
ID: -1, hotelHotSpringDinner: [],
Name: "机上简餐或自理",
City: 0,
About: "",
PicPath: ""
},
{
ID: -2,
Name: "酒店享用",
City: 0,
About: "",
PicPath: ""
},
{
ID: -5,
Name: "方便游玩敬请自理",
City: 0,
About: "",
PicPath: ""
}
],
hotelHotSpringDinner: [{
ID: -3,
Name: "温泉御膳料理",
City: 0,
About: "",
PicPath: ""
},
{
ID: -4,
Name: "酒店自助百汇",
City: 0,
About: "",
PicPath: ""
}
],
isFirstInitDinner: false //初始含有酒店列表，加载完酒店数据在初始化餐厅列表 isFirstInitDinner: false //初始含有酒店列表，加载完酒店数据在初始化餐厅列表
}; };
}, },
...@@ -204,13 +153,14 @@ ...@@ -204,13 +153,14 @@
// 非直采酒店 // 非直采酒店
noDirectHotelChange: function () { noDirectHotelChange: function () {
if (this.hotelArray[0].MD5Sign === '') { if (this.hotelArray[0].MD5Sign === '') {
this.hotelArray[0].MD5Sign= this.md5(`DayNum=${this.hotelArray[0].DayNum}&Type=3${new Date()}`) this.hotelArray[0].MD5Sign = this.md5(`DayNum=${this.hotelArray[0].DayNum}&Type=3${new Date()}`)
} }
}, },
//非直采餐厅 //非直采餐厅
noDirectDinnerChange: function (dIndex) { noDirectDinnerChange: function (dIndex) {
if (this.dinnerArray[dIndex].MD5Sign === '') { if (this.dinnerArray[dIndex].MD5Sign === '') {
this.dinnerArray[dIndex].MD5Sign= this.md5(`DayNum=${this.dinnerArray[dIndex].DayNum}&Type=2${new Date()}`); this.dinnerArray[dIndex].MD5Sign = this.md5(
`DayNum=${this.dinnerArray[dIndex].DayNum}&Type=2${new Date()}`);
} }
}, },
//获取交通城市 //获取交通城市
...@@ -289,7 +239,6 @@ ...@@ -289,7 +239,6 @@
let hotelDescribeObj = this.$tripUtils.tripDescribeObj(); let hotelDescribeObj = this.$tripUtils.tripDescribeObj();
hotelDescribeObj.Id = hotelObj.HotelId; hotelDescribeObj.Id = hotelObj.HotelId;
hotelDescribeObj.Describe = obj.WarmTip; hotelDescribeObj.Describe = obj.WarmTip;
//this.WarmTripDescribe.HotelDescribeArr.push(hotelDescribeObj);
if (hotelDescribeObj.Describe != null && hotelDescribeObj.Describe != "") { if (hotelDescribeObj.Describe != null && hotelDescribeObj.Describe != "") {
this.dayObj.WarmTipObj.Description += "<p>" + hotelDescribeObj.Describe + "</p>"; this.dayObj.WarmTipObj.Description += "<p>" + hotelDescribeObj.Describe + "</p>";
} }
...@@ -373,8 +322,7 @@ ...@@ -373,8 +322,7 @@
this.QDinnerList2 = JSON.parse(JSON.stringify(this.QDinnerList)); this.QDinnerList2 = JSON.parse(JSON.stringify(this.QDinnerList));
} }
}, },
err => { err => {}
}
); );
} }
}, },
...@@ -419,7 +367,6 @@ ...@@ -419,7 +367,6 @@
dinnerDescribeObj.Id = dinnerObj.DinnerId; dinnerDescribeObj.Id = dinnerObj.DinnerId;
dinnerDescribeObj.Describe = obj.About; dinnerDescribeObj.Describe = obj.About;
dinnerDescribeObj.Sort = dinnerObj.UseDinnerType; dinnerDescribeObj.Sort = dinnerObj.UseDinnerType;
//this.WarmTripDescribe.DinnerDescribeArr.push(dinnerDescribeObj);
if (dinnerDescribeObj.Describe != null && dinnerDescribeObj.Describe != "") { if (dinnerDescribeObj.Describe != null && dinnerDescribeObj.Describe != "") {
this.dayObj.WarmTipObj.Description += "<p>" + dinnerDescribeObj.Describe + "</p>"; this.dayObj.WarmTipObj.Description += "<p>" + dinnerDescribeObj.Describe + "</p>";
} }
...@@ -620,7 +567,7 @@ ...@@ -620,7 +567,7 @@
}); });
}); });
this.dayObj.DinnerArray.forEach(x => { this.dayObj.DinnerArray.forEach(x => {
if (x.DinnerId != 0&&x.UseDinnerType!=1) { if (x.DinnerId != 0 && x.UseDinnerType != 1) {
if (!this.checkDinnerExists(this.QDinnerList, x.DinnerId)) { if (!this.checkDinnerExists(this.QDinnerList, x.DinnerId)) {
this.QDinnerList.push({ this.QDinnerList.push({
ID: x.DinnerId, ID: x.DinnerId,
...@@ -650,6 +597,23 @@ ...@@ -650,6 +597,23 @@
}); });
return isExist; return isExist;
}, },
//获取配置餐厅信息
getConfigDinnerList() {
this.apipost(
"travel_get_GetConfigDinnerList", {},
res => {
if (res.data.resultCode == 1) {
this.breakFirstList= res.data.data.breakFirstList;
this.otherDinner=res.data.data.otherDinner;
this.hotelHotSpringDinner=res.data.data.hotelHotSpringDinner;
}
},
err => {}
);
}
},
created() {
this.getConfigDinnerList();
}, },
mounted() { mounted() {
this.initializationData(); this.initializationData();
......
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