Commit 02bc1efd authored by zhengke's avatar zhengke

修改

parent 8b32e2e6
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
} }
.order-info-block .buy-title { .order-info-block .buy-title {
margin-bottom: 5px; margin-bottom: 35px;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
} }
...@@ -290,100 +290,111 @@ ...@@ -290,100 +290,111 @@
<!-- 旅客资料开始 --> <!-- 旅客资料开始 -->
<div class="order-info-block" v-if="shape==1"> <div class="order-info-block" v-if="shape==1">
<div class="buy-title">旅客資料 <div class="buy-title">旅客資料
<q-btn color="amber" @click="SavePassenger()" style="height:50px;font-size:17px;font-weight:bold;" <q-btn color="amber" @click="SavePassenger()" style="float:right;font-size:17px;font-weight:bold;"
label="儲存" /> label="儲存" />
</div> </div>
<div class="member-data" v-for="(item,index) in GuestObj.list" :key="index"> <div class="member-data" v-for="(item,index) in GuestObj.list" :key="index">
<div class="data-header"> <div class="data-header">
<div class="gustNum">旅客 {{index+1}}</div> <div class="gustNum">旅客 {{index+1}}</div>
<i class="iconfont iconarrow-top"></i> <i class="iconfont iconarrow-top" v-if="item.isShow" @click="getShow(item)"></i>
<i class="iconfont iconarrowdown" v-else @click="getShow(item)"></i>
</div> </div>
<div class="data-content"> <div class="data-content" v-if="item.isShow">
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg"> <q-form class="q-gutter-md">
<div class="account-group col-6"> <div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account_labelName">中文姓</div> <div class="account-group col-6">
<q-input outlined v-model="item.SurName" class="bg-grey-1" /> <div class="account_labelName">中文姓</div>
<q-input outlined v-model="item.SurName" :rules="[ val => val && val.length > 0 || '请输入中文姓']" class="bg-grey-1" />
</div>
<div class="account-group col-6">
<div class="account_labelName">中文名</div>
<q-input outlined v-model="item.Name" class="bg-grey-1" />
</div>
</div> </div>
<div class="account-group col-6"> <div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account_labelName">中文名</div> <div class="account-group col-6">
<q-input outlined v-model="item.Name" class="bg-grey-1" /> <div class="account_labelName">護照姓 ( 英文 )</div>
<q-input outlined v-model="item.ESurName" class="bg-grey-1" />
</div>
<div class="account-group col-6">
<div class="account_labelName">護照名 ( 英文 )</div>
<q-input outlined v-model="item.EName" class="bg-grey-1" />
</div>
</div> </div>
</div> <div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg"> <div class="account-group col-6">
<div class="account-group col-6"> <div class="account_labelName">身分證字號</div>
<div class="account_labelName">護照姓 ( 英文 )</div> <q-input outlined v-model="item.IdCard" class="bg-grey-1" />
<q-input outlined v-model="item.ESurName" class="bg-grey-1" /> </div>
</div> </div>
<div class="account-group col-6"> <div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account_labelName">護照名 ( 英文 )</div> <div class="account-group col-6">
<q-input outlined v-model="item.EName" class="bg-grey-1" /> <div class="account_labelName">出生日期</div>
<q-input filled v-model="item.Birthday" mask="date">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy :ref="'qDateProxy'+index" transition-show="scale" transition-hide="scale">
<q-date v-model="item.Birthday" @input="()=> $refs['qDateProxy'+index][0].hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="account-group col-6">
<div class="account_labelName">性別</div>
<q-select filled v-model="item.Sex" :options="sexArray" emit-value map-options>
</q-select>
</div>
</div> </div>
</div> <div class="remind-question">
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg"> 是否服役中、為役男身份或接近役齡?
<div class="account-group col-6">
<div class="account_labelName">身分證字號</div>
<q-input outlined v-model="item.IdCard" class="bg-grey-1" />
</div> </div>
</div> <div class="tip-text">
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg"> *服役中包含替代役,役男身份指年滿18歲至服兵役前,接近役齡指年滿16歲至18歲,若為免役者請勾選否。
<div class="account-group col-6">
<div class="account_labelName">出生日期</div>
<q-input outlined v-model="item.Birthday" class="bg-grey-1" />
</div> </div>
<div class="account-group col-6"> <div>
<div class="account_labelName">性別</div> <div class="q-gutter-sm" style="margin-bottom:15px;">
<q-select filled v-model="item.Sex" :options="sexArray" emit-value map-options> <q-radio v-model="item.MilitaryServiceType" :val="1" label="否" />
</q-select> <q-radio v-model="item.MilitaryServiceType" :val="2" label="服役中" />
<q-radio v-model="item.MilitaryServiceType" :val="3" label="役男身份" />
<q-radio v-model="item.MilitaryServiceType" :val="4" label="接近役齡" />
</div>
</div> </div>
</div> <div class="warning-bar2" v-if="item.MilitaryServiceType>1">
<div class="remind-question"> <div>請於出團前七天內上傳符合以下規定之護照畫面:</div>
是否服役中、為役男身份或接近役齡? <ol class="dot_list" style="font-size:14px;">
</div> <li v-if="item.MilitaryServiceType==2">若您正在服役,出國必須蓋兩種章: 【持照人出國應經核准】【 年 月 日之前同意出國 字第 號核准】。</li>
<div class="tip-text"> <li v-if="item.MilitaryServiceType==3">
*服役中包含替代役,役男身份指年滿18歲至服兵役前,接近役齡指年滿16歲至18歲,若為免役者請勾選否。 若您是役男者,出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)蓋兩種章:【持照人出國應經核准尚未履行兵役義務】【役男出國核准 年 月
</div> 日前一次有效 縣 市公所】</li>
<div> <li v-if="item.MilitaryServiceType==4">若您是役齡男子,出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)一種章:【尚未履行兵役義務】。</li>
<div class="q-gutter-sm"> </ol>
<q-radio v-model="item.MilitaryServiceType" :val="1" label="否" />
<q-radio v-model="item.MilitaryServiceType" :val="2" label="服役中" />
<q-radio v-model="item.MilitaryServiceType" :val="3" label="役男身份" />
<q-radio v-model="item.MilitaryServiceType" :val="4" label="接近役齡" />
</div> </div>
</div> <div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="warning-bar2" v-if="item.MilitaryServiceType>1"> <div class="account-group col-6">
<div>請於出團前七天內上傳符合以下規定之護照畫面:</div> <div class="account_labelName">護照號碼</div>
<ol class="dot_list" style="font-size:14px;"> <q-input outlined v-model="item.PassportNo" class="bg-grey-1" />
<li v-if="item.MilitaryServiceType==2">若您正在服役,出國必須蓋兩種章: 【持照人出國應經核准】【 年 月 日之前同意出國 字第 號核准】。</li> </div>
<li v-if="item.MilitaryServiceType==3"> <div class="account-group col-6">
若您是役男者,出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)蓋兩種章:【持照人出國應經核准尚未履行兵役義務】【役男出國核准 年 月 <div class="account_labelName">護照效期截止日期</div>
日前一次有效 縣 市公所】</li> <q-input filled v-model="item.PassportExpiry" mask="date">
<li v-if="item.MilitaryServiceType==4">若您是役齡男子,出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)一種章:【尚未履行兵役義務】。</li> <template v-slot:append>
</ol> <q-icon name="event" class="cursor-pointer">
</div> <q-popup-proxy :ref="'huzhao'+index" transition-show="scale" transition-hide="scale">
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg"> <q-date v-model="item.PassportExpiry" @input="()=>$refs['huzhao'+index][0].hide()" />
<div class="account-group col-6"> </q-popup-proxy>
<div class="account_labelName">護照號碼</div> </q-icon>
<q-input outlined v-model="item.PassportNo" class="bg-grey-1" /> </template>
</q-input>
</div>
</div> </div>
<div class="account-group col-6"> <div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account_labelName">護照效期截止日期</div> <div class="account-group col-12">
<q-input filled v-model="item.PassportExpiry" mask="date"> <div class="account_labelName">其他備註</div>
<template v-slot:append> <q-input filled type="textarea" v-model="item.Remarks" />
<q-icon name="event" class="cursor-pointer"> </div>
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<q-date v-model="item.PassportExpiry" @input="() => $refs.qDateProxy.hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
</div>
<div class="row q-col-gutter-x-xs q-col-gutter-y-lg">
<div class="account-group col-12">
<div class="account_labelName">其他備註</div>
<q-input filled type="textarea" v-model="item.Remarks" />
</div> </div>
</div> </q-form>
</div> </div>
</div> </div>
</div> </div>
...@@ -493,14 +504,14 @@ ...@@ -493,14 +504,14 @@
<div class="passRadio"> <div class="passRadio">
<q-radio v-model="shape" :val="1" label="旅客資料" /> <q-radio v-model="shape" :val="1" label="旅客資料" />
</div> </div>
<div class="passRadio"> <div class="passRadio" style="display:none;">
<q-radio v-model="shape" :val="2" label="收件資料" /> <q-radio v-model="shape" :val="2" label="收件資料" />
</div> </div>
<div class="passRadio"> <div class="passRadio" style="display:none;">
<q-radio v-model="shape" :val="3" label="收據開立" /> <q-radio v-model="shape" :val="3" label="收據開立" />
</div> </div>
</div> </div>
<q-btn color="white" text-color="black" style="width:100%;height:40px;margin-top:10px;" label="回訂單明細" /> <q-btn color="white" text-color="black" style="width:100%;height:40px;margin-top:10px;display:none;" label="回訂單明細" />
<q-btn color="primary" style="width:100%;height:40px;margin-top:15px;" label="前往付款" /> <q-btn color="primary" style="width:100%;height:40px;margin-top:15px;" label="前往付款" />
</div> </div>
</div> </div>
...@@ -578,6 +589,10 @@ ...@@ -578,6 +589,10 @@
this.getTravelGuest(); this.getTravelGuest();
}, },
methods: { methods: {
getShow(item){
item.isShow=!item.isShow;
this.$forceUpdate();
},
GetGuestObj() { GetGuestObj() {
var obj = { var obj = {
Id: 0, //旅客编号 Id: 0, //旅客编号
...@@ -640,9 +655,15 @@ ...@@ -640,9 +655,15 @@
} }
tempObj.list = []; tempObj.list = [];
tempObj.list = newArray; tempObj.list = newArray;
tempObj.list.forEach(x=>{
x.isShow=true;
})
} }
} }
this.GuestObj = tempObj; this.GuestObj = tempObj;
this.GuestObj.list.forEach(x=>{
x.isShow=true;
})
} }
}); });
}, },
...@@ -660,6 +681,13 @@ ...@@ -660,6 +681,13 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getTravelGuest(); this.getTravelGuest();
}else{
this.$q.notify({
type: 'negative',
message: res.data.message,
position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
})
} }
}, },
err => {} err => {}
......
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