Commit 23cb1f5b authored by zhengke's avatar zhengke

修改

parent ba37be7a
...@@ -159,7 +159,10 @@ ...@@ -159,7 +159,10 @@
padding-left: 20px; padding-left: 20px;
list-style-type: disc; list-style-type: disc;
} }
.order-buy .q-field--with-bottom{
padding-bottom:0!important;
margin-bottom:20px;
}
.account_labelName { .account_labelName {
margin: 20px 0 10px 0; margin: 20px 0 10px 0;
font-size: 15px; font-size: 15px;
...@@ -170,9 +173,12 @@ ...@@ -170,9 +173,12 @@
} }
.order-buy .q-field__control { .order-buy .q-field__control {
min-height: 46px !important; min-height: 46px;
}
.otherBeizhu .q-field__control{
min-height:auto;
height:auto;
} }
.order-buy .q-field__native { .order-buy .q-field__native {
min-height: 46px; min-height: 46px;
} }
...@@ -245,7 +251,11 @@ ...@@ -245,7 +251,11 @@
background-color: #fffde7; background-color: #fffde7;
color: #ff9800; color: #ff9800;
} }
.isShowDiv{
visibility:hidden;
height:0;
padding:0;
}
</style> </style>
<template> <template>
<q-page> <q-page>
...@@ -290,113 +300,113 @@ ...@@ -290,113 +300,113 @@
<!-- 旅客资料开始 --> <!-- 旅客资料开始 -->
<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()" type="submit" style="float:right;font-size:17px;font-weight:bold;" <q-btn color="amber" @click="getConnect()" type="submit" 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"> <q-form ref="myForm" class="q-gutter-md">
<div class="data-header"> <div class="member-data" v-for="(item,index) in GuestObj.list" :key="index">
<div class="gustNum">旅客 {{index+1}}</div> <div class="data-header">
<i class="iconfont iconarrow-top" v-if="item.isShow" @click="getShow(item)"></i> <div class="gustNum">旅客 {{index+1}}</div>
<i class="iconfont iconarrowdown" v-else @click="getShow(item)"></i> <i class="iconfont iconarrow-top" v-if="item.isShow" @click="getShow(item)"></i>
</div> <i class="iconfont iconarrowdown" v-else @click="getShow(item)"></i>
<div class="data-content" v-if="item.isShow"> </div>
<q-form class="q-gutter-md"> <div class="data-content" :class="{'isShowDiv':!item.isShow}">
<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.SurName" :rules="[ val => val && val.length > 0 || '请输入中文姓']" class="bg-grey-1" /> <q-input outlined v-model="item.SurName" :rules="[ val => val && val.length > 0 || '请输入中文姓']" class="bg-grey-1" />
</div> </div>
<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.Name" class="bg-grey-1" /> <q-input outlined v-model="item.Name" :rules="[ val => val && val.length > 0 || '请输入中文名']" 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.ESurName" :rules="[ val => val && val.length > 0 || '请输入護照姓']" class="bg-grey-1" />
<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" :rules="[ val => val && val.length > 0 || '请输入護照名']" 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 outlined v-model="item.IdCard" :rules="[ val => val && val.length > 0 || '请输入身分證字號']" 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 filled v-model="item.Birthday" mask="date" :rules="[ val => val && val.length > 0 || '请选择出生日期']">
<q-input outlined v-model="item.IdCard" class="bg-grey-1" /> <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 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>
<div class="account-group col-6"> <div class="tip-text">
<div class="account_labelName">性別</div> *服役中包含替代役,役男身份指年滿18歲至服兵役前,接近役齡指年滿16歲至18歲,若為免役者請勾選否。
<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="q-gutter-sm" style="margin-bottom:15px;">
是否服役中、為役男身份或接近役齡? <q-radio v-model="item.MilitaryServiceType" :val="1" label="否" />
</div> <q-radio v-model="item.MilitaryServiceType" :val="2" label="服役中" />
<div class="tip-text"> <q-radio v-model="item.MilitaryServiceType" :val="3" label="役男身份" />
*服役中包含替代役,役男身份指年滿18歲至服兵役前,接近役齡指年滿16歲至18歲,若為免役者請勾選否。 <q-radio v-model="item.MilitaryServiceType" :val="4" label="接近役齡" />
</div> </div>
<div>
<div class="q-gutter-sm" style="margin-bottom:15px;">
<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="warning-bar2" v-if="item.MilitaryServiceType>1">
<div class="warning-bar2" v-if="item.MilitaryServiceType>1"> <div>請於出團前七天內上傳符合以下規定之護照畫面:</div>
<div>請於出團前七天內上傳符合以下規定之護照畫面:</div> <ol class="dot_list" style="font-size:14px;">
<ol class="dot_list" style="font-size:14px;"> <li v-if="item.MilitaryServiceType==2">若您正在服役,出國必須蓋兩種章: 【持照人出國應經核准】【 年 月 日之前同意出國 字第 號核准】。</li>
<li v-if="item.MilitaryServiceType==2">若您正在服役,出國必須蓋兩種章: 【持照人出國應經核准】【 年 月 日之前同意出國 字第 號核准】。</li> <li v-if="item.MilitaryServiceType==3">
<li v-if="item.MilitaryServiceType==3"> 若您是役男者,出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)蓋兩種章:【持照人出國應經核准尚未履行兵役義務】【役男出國核准 年 月
若您是役男者,出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)蓋兩種章:【持照人出國應經核准尚未履行兵役義務】【役男出國核准 年 月 日前一次有效 縣 市公所】</li>
日前一次有效 縣 市公所】</li> <li v-if="item.MilitaryServiceType==4">若您是役齡男子,出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)一種章:【尚未履行兵役義務】。</li>
<li v-if="item.MilitaryServiceType==4">若您是役齡男子,出國前必須前往戶籍所在地之鄉鎮市區公所兵役科(課)一種章:【尚未履行兵役義務】。</li> </ol>
</ol>
</div>
<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.PassportNo" class="bg-grey-1" />
</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 filled v-model="item.PassportExpiry" mask="date"> <div class="account_labelName">護照號碼</div>
<template v-slot:append> <q-input outlined v-model="item.PassportNo" :rules="[ val => val && val.length > 0 || '请填写護照號碼']" class="bg-grey-1" />
<q-icon name="event" class="cursor-pointer"> </div>
<q-popup-proxy :ref="'huzhao'+index" transition-show="scale" transition-hide="scale"> <div class="account-group col-6">
<q-date v-model="item.PassportExpiry" @input="()=>$refs['huzhao'+index][0].hide()" /> <div class="account_labelName">護照效期截止日期</div>
</q-popup-proxy> <q-input filled v-model="item.PassportExpiry" mask="date" :rules="[ val => val && val.length > 0 || '请选择護照效期截止日期']">
</q-icon> <template v-slot:append>
</template> <q-icon name="event" class="cursor-pointer">
</q-input> <q-popup-proxy :ref="'huzhao'+index" transition-show="scale" transition-hide="scale">
<q-date v-model="item.PassportExpiry" @input="()=>$refs['huzhao'+index][0].hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</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-12 otherBeizhu">
<div class="account-group col-12"> <div class="account_labelName">其他備註</div>
<div class="account_labelName">其他備註</div> <q-input filled type="textarea" class="col" v-model="item.Remarks" />
<q-input filled type="textarea" v-model="item.Remarks" /> </div>
</div> </div>
</div> </div>
</q-form>
</div> </div>
</div> </q-form>
</div> </div>
<!-- 旅客资料结束 --> <!-- 旅客资料结束 -->
<!-- 收件资料开始 --> <!-- 收件资料开始 -->
...@@ -669,7 +679,7 @@ ...@@ -669,7 +679,7 @@
getConnect(){ getConnect(){
this.$refs.myForm.validate().then(success => { this.$refs.myForm.validate().then(success => {
if (success) { if (success) {
// yay, models are correct this.SavePassenger();
} }
else { else {
// oh no, user has filled in // oh no, user has filled in
......
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