Skip to content

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

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

parents f3fe88a6 4d9aec7b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 539 additions and 375 deletions
src/assets/css/tripIndexNewHV.css
View file @ 1e29ab08
......@@ -222,9 +222,12 @@ top: 7px;
font-family: "Microsoft JhengHei UI";
font-weight: bold;
color: #242424;
white-space: nowrap;
/* white-space: nowrap; */
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.travelDaysHVTitlle-right{
margin-left: 54px;
......
src/components/DomesticTravelcontract.vue
View file @ 1e29ab08
This diff is collapsed.
src/components/SalesModule/groupTourOrder.vue
View file @ 1e29ab08
......@@ -2311,26 +2311,27 @@
</div>
</td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div >
<div>{{ $t("fnc.skdanju") }}：</div>
<div>
<span v-for="(item2, index2) in item.financeList" :key="index2">
<span v-for="(item2, index2) in item.financeList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 3" class="groupTourOrder_tickets_red">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
<!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
</span>
<span v-if="item.financeList.length === 0"
style="cursor: default">{{ $t("system.content_noData") }}</span>
</div>
</div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div >
<div>{{ $t("fnc.fkdanju") }}：</div>
<div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2">
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 1e29ab08
......@@ -853,7 +853,8 @@
<el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-input v-model='addMsg.ContactName'></el-input>
</el-form-item>
<el-form-item :label="$t('scen.sc_tel')" prop="ContactMobile" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-form-item :label="$t('scen.sc_tel')" prop="ContactMobile"
v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-input v-model='addMsg.ContactMobile'></el-input>
</el-form-item>
<el-form-item label="客户门店" prop="CustomerId"
......@@ -953,7 +954,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
</el-col>
......@@ -1021,7 +1022,8 @@
<el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-input v-model='addMsg.ContactName'></el-input>
</el-form-item>
<el-form-item :label="$t('scen.sc_tel')" prop="ContactMobile" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-form-item :label="$t('scen.sc_tel')" prop="ContactMobile"
v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
<el-input v-model='addMsg.ContactMobile'></el-input>
</el-form-item>
<el-form-item label="客户门店" prop="CustomerId"
......@@ -1222,11 +1224,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item label="行李数量" prop="LuggageNum">
<el-input v-model="addMsg.LuggageNum"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="行李数量" prop="LuggageNum">
<el-input v-model="addMsg.LuggageNum"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属平台" prop="BrandId" v-show="addMsg.ClientSource==1">
<el-select v-model='addMsg.BrandId' :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
......@@ -1822,28 +1824,32 @@
</div>
</td>
<td colspan="6" class="groupTourOrder_tickets" style="height: 40px;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div>收款单据：</div>
<div>
<span v-for="(item2,index2) in item.financeList" :key="index2">
<span v-for="(item2,index2) in item.financeList" :key="index2"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-if="item.financeList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div>付款单据：</div>
<div>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span>
<span v-if="item.refundFinanceList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-if="item.refundFinanceList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div>
......@@ -1860,7 +1866,8 @@
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
</span>
<span v-if="item.invoiceApplyList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-if="item.invoiceApplyList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
</td>
......@@ -2120,7 +2127,8 @@
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-if="item.financeList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div>
......@@ -2132,7 +2140,8 @@
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span>
<span v-if="item.refundFinanceList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-if="item.refundFinanceList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div>发票单据：</div>
......@@ -2148,7 +2157,8 @@
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
</span>
<span v-if="item.invoiceApplyList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-if="item.invoiceApplyList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</td>
</tr>
......@@ -2437,7 +2447,7 @@
CommissionShareMoney: "0",
GuestList: [],
GatherAddress: "",
LuggageNum:'',
LuggageNum: '',
},
GuestList: [{
SurName: '',
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 1e29ab08
......@@ -1763,24 +1763,23 @@
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div >
<div>{{$t('fnc.skdanju')}}：</div>
<div>
<span v-for="(item2,index2) in item.financeList" :key="index2">
<div >
<span v-for="(item2,index2) in item.financeList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
<!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
</span>
<span v-if="item.financeList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div >
<div>{{$t('fnc.fkdanju')}}：</div>
<div>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
......
src/components/TravelContractConfirm.vue
View file @ 1e29ab08
......@@ -596,7 +596,6 @@
font-size: 1rem;
color: gray;
}
</style>
<template>
......@@ -1356,7 +1355,7 @@
</template><span>
<font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
</span></p>
<template v-if="CtObj.SignType==0">
<template v-if="CtObj.SignType==0">
<p>出境社的指定收款账号信息</p>
<p>
名称：四川和平国际旅行社有限公司
......@@ -1586,8 +1585,17 @@
<div style="padding:0 14px;box-sizing: border-box;line-height:4rem;" v-if="ActiveTab==2"
class="item_content">
<p>
旅游者：<font>{{CtObj.Tourists_Name}}</font> 等<font v-if="CtObj.ContractGuestList">
{{CtObj.ContractGuestList.length}}</font>
旅游者：<font>{{CtObj.Tourists_Name}}</font> 等<font>
<template v-if="CtObj.GuestNum>0">
{{CtObj.GuestNum}}
</template>
<template v-else-if="CtObj.ContractGuestList&&CtObj.ContractGuestList.length>0">
{{CtObj.ContractGuestList.length}}
</template>
<template v-else>
0
</template>
</font>
人（名单可附页，需旅行社和旅游者代表签字盖章确认）；
</p>
<p>旅行社：<font>{{dataList.company}}</font>
......@@ -2478,7 +2486,7 @@
<font>现金（） 转账（√）银行账号：{{CtObj.C_PayTypeRemark}}</font>
</template>
</p>
<template v-if="CtObj.SignType==0">
<template v-if="CtObj.SignType==0">
<p>出境社的指定收款账号信息</p>
<p>
名称：四川和平国际旅行社有限公司
......@@ -2578,7 +2586,7 @@
<p>协商或投诉调解不成的，按下列第 <font>{{CtObj.C_SolveType}}</font>种方式解决：</p>
<p>1.将争议提交<font>{{CtObj.C_SolveRemark}}</font>仲裁委员会仲裁；</p>
<p>2.依法向人民法院提起民事诉讼。</p>
<p>人身意外伤害保险</p>
<p>人身意外伤害保险</p>
<p>
<p>
<span class="Travel_ConfirmQuan">
......@@ -3946,6 +3954,7 @@
CreateTimeStr: "",
IsTravelAgencySignature: 0, //判断是否盖章
SignType: 0, //
GuestNum: 0,
},
};
},
......@@ -4101,6 +4110,7 @@
this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.TravelAgency_LicenseNum = tempObj.TravelAgency_LicenseNum;
this.CtObj.SignType = tempObj.SignType;
this.CtObj.GuestNum = tempObj.GuestNum;
this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice;
if (
......@@ -4466,5 +4476,4 @@
this.getCanvas();
}
};
</script>
</script>
\ No newline at end of file
src/components/TravelContractDetail.vue
View file @ 1e29ab08
......@@ -381,7 +381,6 @@
font-size: 12px;
color: gray;
}
</style>
<template>
......@@ -429,8 +428,17 @@
</div>
<!-- 合同信息 -->
<div class="TD-basic" :class="{'checkedNav':cked==2}">
<p>旅游者：<span>{{dataList.clientName}}</span>等<span
v-if="dataList.guestList">{{dataList.guestList.length}}</span>人（名单可附页，需出境社和旅游者代表签字盖章确认）；</p>
<p>旅游者：<span>{{dataList.clientName}}</span>等<span>
<template v-if="dataList.guestNum&&dataList.guestNum>0">
{{dataList.guestNum}}
</template>
<template v-else-if="dataList.guestList&&dataList.guestList.length>0">
{{dataList.guestList.length}}
</template>
<template v-else>
0
</template>
</span>人（名单可附页，需出境社和旅游者代表签字盖章确认）；</p>
<p>出境社：<span>{{dataList.company}}</span></p>
<p>旅行社业务经营许可证编号：<span>{{dataList.businessCertificate}}</span></p>
<br>
......@@ -1242,5 +1250,4 @@
this.getShow(TID);
}
};
</script>
</script>
\ No newline at end of file
src/components/TravelContractNew.vue
View file @ 1e29ab08
......@@ -275,7 +275,6 @@
.TC_LASTTD div {
margin-bottom: 10px;
}
</style>
<template>
<div class="TC-MainContent">
......@@ -331,6 +330,13 @@
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="旅客人数">
<el-input type="text" v-model="CtObj.guestNum" maxlength="100" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="证件号码">
......@@ -639,7 +645,8 @@
<tr>
<td>
<el-form-item label="旅游者">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w300' v-model="CtObj.insuranceOpinion">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w300'
v-model="CtObj.insuranceOpinion">
<el-option label="委托出境社购买" :value='1'></el-option>
<el-option label="自行购买" :value='2'></el-option>
<el-option label="放弃购买" :value='3'></el-option>
......@@ -649,8 +656,9 @@
</tr>
<tr>
<td>
<el-form-item label="保险公司名称" v-if="CtObj.insuranceOpinion==1">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w300' v-model="CtObj.insuranceCompany">
<el-form-item label="保险公司名称" v-if="CtObj.insuranceOpinion==1">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w300'
v-model="CtObj.insuranceCompany">
<el-option label="中国平安财产保险股份有限公司成都市锦城支公司" value='中国平安财产保险股份有限公司成都市锦城支公司'></el-option>
<el-option label="あいおいニッセイ同和損害保険株式会社" value='あいおいニッセイ同和損害保険株式会社'></el-option>
<el-option label="中国大地财产保险股份有限公司" value='中国大地财产保险股份有限公司'></el-option>
......@@ -660,7 +668,7 @@
</tr>
<tr style="display:none;">
<td>
<el-form-item label="保险产品名称" v-if="CtObj.insuranceOpinion==1">
<el-form-item label="保险产品名称" v-if="CtObj.insuranceOpinion==1">
<el-input type="text" class="w300" v-model="CtObj.insuranceProduct"></el-input>
</el-form-item>
</td>
......@@ -683,7 +691,8 @@
<tr>
<td>
<el-form-item label="1、">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w150' v-model="CtObj.insteadOpinion">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w150'
v-model="CtObj.insteadOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
</el-select>
......@@ -717,7 +726,8 @@
<tr>
<td>
<el-form-item label="4、">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w150' v-model="CtObj.terminateOpinion">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w150'
v-model="CtObj.terminateOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
</el-select>
......@@ -733,7 +743,8 @@
<tr>
<td>
<el-form-item label="旅游者">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w150' v-model="CtObj.carpoolOpinion">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w150'
v-model="CtObj.carpoolOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
</el-select>
......@@ -752,7 +763,8 @@
<div style="margin:20px 0 10px 20px">本合同履行过程中发生争议，由双方协商解决；亦可向合同签订地的旅游质监执法机构、消费者协会等有关部门或者机构申请调解解决。
</div>
<el-form-item label="协商或调解不成，按照第" prop="settleDisputeMode">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w210' v-model="CtObj.settleDisputeMode">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w210'
v-model="CtObj.settleDisputeMode">
<el-option label="1" :value='1'></el-option>
<el-option label="2" :value='2'></el-option>
</el-select>
......@@ -934,7 +946,7 @@
<td colspan="5">
<div style="display:flex">
<span>地接社名称：</span>
<div contenteditable="true" style="width:250px;"></div>
<div contenteditable="true" style="width:250px;">株式会社 ピースインターナショナル</div>
</div>
</td>
</tr>
......@@ -1097,13 +1109,15 @@
<el-input type="text" v-model="item.travelSign" v-else></el-input>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" v-if="item.IsShow==0">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
v-if="item.IsShow==0">
<el-button type="primary" icon="el-icon-edit" circle @click="item.IsShow=1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start" v-if="item.IsShow==1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="item.IsShow=0"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="item.IsShow==0">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="item.IsShow==0">
<el-button type="danger" icon="el-icon-delete" @click="delVoluntray(index)" circle></el-button>
</el-tooltip>
</td>
......@@ -1177,13 +1191,15 @@
<el-input type="text" v-model="item.travelSign" v-else></el-input>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" v-if="item.IsShow==0">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
v-if="item.IsShow==0">
<el-button type="primary" icon="el-icon-edit" circle @click="item.IsShow=1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start" v-if="item.IsShow==1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="item.IsShow=0"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="item.IsShow==0">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="item.IsShow==0">
<el-button type="danger" icon="el-icon-delete" @click="delWilling(index)" circle></el-button>
</el-tooltip>
</td>
......@@ -2445,5 +2461,4 @@
}
},
};
</script>
</script>
\ No newline at end of file
src/components/TravelContractView.vue
View file @ 1e29ab08
......@@ -392,7 +392,6 @@
font-size: 12px;
color: gray;
}
</style>
<template>
......@@ -1025,8 +1024,18 @@
<!-- 合同信息 -->
<div class="TD-basic" :class="{'checkedNav':ActiveTab==2}">
<p>
旅游者：<font>{{CtObj.Tourists_Name}}</font> 等<font v-if="CtObj.ContractGuestList">
{{CtObj.ContractGuestList.length}}</font>
旅游者：<font>{{CtObj.Tourists_Name}}</font> 等
<font>
<template v-if="CtObj.GuestNum>0">
{{CtObj.GuestNum}}
</template>
<template v-else-if="CtObj.ContractGuestList&&CtObj.ContractGuestList.length>0">
{{CtObj.ContractGuestList.length}}
</template>
<template v-else>
0
</template>
</font>
人（名单可附页，需旅行社和旅游者代表签字盖章确认）；
</p>
<p>旅行社：<font>{{CtObj.TravelAgency_Name}}</font>
......@@ -2326,6 +2335,7 @@
ZhangImg: "", //合同章
CreateByName: "", //合同创建人
SignType: 0,
GuestNum: 0,
},
};
},
......@@ -2482,6 +2492,7 @@
this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.CreateByName = tempObj.CreateByName;
this.CtObj.GuestNum = tempObj.GuestNum;
this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice;
if (
......@@ -2773,5 +2784,4 @@
this.getList();
}
};
</script>
</script>
\ No newline at end of file
src/components/busManagement/CharteringManagement/CharteringInfoManage.vue
View file @ 1e29ab08
......@@ -769,19 +769,19 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('objFill.baocheshichang')" prop="TravelHours" v-if="addMsg.CarType == 3">
<el-input type="Number" :placeholder="$t('objFill.qingshurubcsc')" class="w300 addAddress" :min="0"
v-model="addMsg.TravelHours">
<span slot="append"> {{$t('salesModule.Hour')}} </span>
</el-input>
</el-form-item>
<el-form-item :label="$t('objFill.tiqianquxiaosj')" prop="">
<el-input type="Number" :placeholder="$t('objFill.tiqianjtmfqx')" class="w300 addAddress" :min="0"
v-model="addMsg.FreeCancelDay">
<span slot="append"> {{$t('hotel.hotel_day')}} </span>
</el-input>
</el-form-item>
</template>
<el-form-item :label="$t('objFill.baocheshichang')" prop="TravelHours" v-if="addMsg.CarType == 3">
<el-input type="Number" :placeholder="$t('objFill.qingshurubcsc')" class="w300 addAddress" :min="0"
v-model="addMsg.TravelHours">
<span slot="append"> {{$t('salesModule.Hour')}} </span>
</el-input>
</el-form-item>
<el-form-item :label="$t('objFill.tiqianquxiaosj')" prop="">
<el-input type="Number" :placeholder="$t('objFill.tiqianjtmfqx')" class="w300 addAddress" :min="0"
v-model="addMsg.FreeCancelDay">
<span slot="append"> {{$t('hotel.hotel_day')}} </span>
</el-input>
</el-form-item>
<span v-if="addMsg.CarType != 3" class="resource-lititle sheshi" style="width: 100%;">
<template v-if="addMsg.CarType == 1">{{$t('objFill.pickup')}}</template>
<template v-if="addMsg.CarType == 2">{{$t('objFill.send')}}</template>
......
src/components/clientConfirm.vue
View file @ 1e29ab08
......@@ -495,7 +495,6 @@
font-size: 1rem;
color: gray;
}
</style>
<template>
......@@ -560,7 +559,17 @@
<!-- 合同信息 -->
<div style="padding:0 14px;box-sizing: border-box;" v-show="ActiveTab==2" class="item_content">
<p>
旅游者：<font>{{dataList.clientName}}</font> 等<font v-if="dataList.guestList">{{dataList.guestList.length}}
旅游者：<font>{{dataList.clientName}}</font> 等
<font>
<template v-if="dataList.guestNum&&dataList.guestNum>0">
{{dataList.guestNum}}
</template>
<template v-else-if="dataList.guestList&&dataList.guestList.length>0">
{{dataList.guestList.length}}
</template>
<template v-else>
0
</template>
</font>
人（名单可附页，需出境社和旅游者代表签字盖章确认）；
</p>
......@@ -895,7 +904,7 @@
<p>旅游费用支付时间：<font>{{getDate(dataList.payDate)}}</font>
</p>
<template v-if="dataList.signType==0">
<template v-if="dataList.signType==0">
<p>出境社的指定收款账号信息</p>
<p>
名称：四川和平国际旅行社有限公司
......@@ -943,7 +952,7 @@
<i v-if="dataList.insuranceOpinion==1" class="iconfont icon-duigou"></i>
<i v-else class="iconfont icon-cha"></i>
</span>
委托旅行社购买（旅行社不具有保险兼业代理资格的，委托向 {{dataList.insuranceCompany}} 采购）：保险产品名称
委托旅行社购买（旅行社不具有保险兼业代理资格的，委托向 {{dataList.insuranceCompany}} 采购）：保险产品名称
<font>旅游安全人身意外伤害保险</font>（投保的相关信息以实际保单为准）；
<p>
旅游者承诺在签订人身意外伤害保险合同前，已充分了解保险合同的相关条款，如有不清楚的，将自行向保险公司咨询。
......@@ -1399,5 +1408,4 @@
this.getList();
}
};
</script>
</script>
\ No newline at end of file
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ 1e29ab08
......@@ -72,7 +72,7 @@
<div class="travelDaysContent">
<template v-if="item.ScenicArray.length>0">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray" :key="j">
<div class="textBold" :style="{'color':dataAll.TripColor}">
<div class="textBold" :style="{'color':'black'}">
<!-- 【 -->
<vEditSpan :canEdit='canEdit' v-model="jindian.CouponsName"></vEditSpan>
<!-- 】 -->
......@@ -84,7 +84,7 @@
</template>
<div v-if="item.ScenicArray.length==0&&item.TrafficObj.trafficIntroduce.IntroduceTitle"
class="travelDaysContent-text">
<span class="textBold" :style="{'color':dataAll.TripColor}">
<span class="textBold" :style="{'color':'black'}">
<!-- <vEditDiv class="dayCouponsName" :canEdit='canEdit'
v-model="'【'+item.TrafficObj.trafficIntroduce.IntroduceTitle+'】'"></vEditDiv> -->
<vEditDiv class="dayCouponsName" :canEdit='canEdit'
......@@ -146,7 +146,7 @@
</div>
<div class="MT21" v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54"
:style="{'color':dataAll.TripColor}">
:style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].CouponsName"></vEditSpan>
</div>
<div class="fz23 MT5 lineHeight42 color444 fontFamilyUI">
......@@ -192,7 +192,7 @@
</div>
<div class="ML30 flexG">
<template v-if="item.ScenicArray.length>1">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].CouponsName"></vEditSpan>
</div>
<div class="fz23 MT5 lineHeight42 color444 fontFamilyUI">
......@@ -243,7 +243,7 @@
</div>
<div class="ML30 flexG">
<template v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].CouponsName"></vEditSpan>
</div>
<div class="fz23 lineHeight42 color444 fontFamilyUI">
......@@ -255,7 +255,7 @@
<div class="row MB35">
<div class="flexG">
<template v-if="item.ScenicArray.length>1">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].CouponsName"></vEditSpan>
</div>
<div class="fz23 lineHeight42 color444 fontFamilyUI">
......@@ -337,7 +337,7 @@
</div>
<div class="ML30 flexG">
<template v-if="item.ScenicArray.length>2">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].CouponsName"></vEditSpan>
</div>
<div class="fz23 lineHeight42 color444 fontFamilyUI">
......@@ -389,7 +389,7 @@
</div>
<div class="ML41 flexG">
<template v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].CouponsName"></vEditSpan>
</div>
<div class="fz23 MT5 lineHeight42 color444 fontFamilyUI">
......@@ -438,7 +438,7 @@
</div>
<div class="MT20 width331">
<template v-if="item.ScenicArray.length>1">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].CouponsName"></vEditSpan>
</div>
<div class="fz23 MT5 lineHeight42 color444 fontFamilyUI">
......@@ -486,7 +486,7 @@
</div>
<div class="MT20">
<template v-if="item.ScenicArray.length>2">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].CouponsName"></vEditSpan>
</div>
<div class="fz23 MT5 lineHeight42 color444 fontFamilyUI">
......@@ -535,7 +535,7 @@
<div class="MT20">
<template v-if="item.ScenicArray.length>3">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[3].CouponsName"></vEditSpan>
</div>
<div class="fz23 MT5 lineHeight42 color444 fontFamilyUI">
......@@ -586,7 +586,7 @@
</div>
</div>
<div class="MT18" v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].CouponsName"></vEditSpan>
</div>
<div class="fz23 lineHeight42 color444 fontFamilyUI">
......@@ -629,7 +629,7 @@
</div>
</div>
<div class="MT18" v-if="item.ScenicArray.length>1">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].CouponsName"></vEditSpan>
</div>
<div class="fz23 lineHeight42 color444 fontFamilyUI">
......@@ -678,7 +678,7 @@
</div>
<div class="MT19">
<template v-if="item.ScenicArray.length>2">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].CouponsName"></vEditSpan>
</div>
<div class="fz23 lineHeight42 color444 fontFamilyUI">
......@@ -726,7 +726,7 @@
</div>
<div class="MT19">
<template v-if="item.ScenicArray.length>3">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[3].CouponsName"></vEditSpan>
</div>
<div class="fz23 lineHeight42 color444 fontFamilyUI">
......@@ -774,7 +774,7 @@
</div>
<div class="MT19">
<template v-if="item.ScenicArray.length>4">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':dataAll.TripColor}">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A lineHeight54" :style="{'color':'black'}">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[4].CouponsName"></vEditSpan>
</div>
<div class="fz23 lineHeight42 color444 fontFamilyUI">
......
src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
View file @ 1e29ab08
......@@ -147,7 +147,7 @@
</div>
<div style="margin-top: 18px;" v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold travelDaysHV-CouponsName"
:style="{'color':dataAll.TripColor}">
:style="{'color':'black'}">
<span class="CouponsNameM">【</span>
<span class="CouponsNameT">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].CouponsName"></vEditSpan>
......@@ -198,7 +198,7 @@
</div>
<div style="margin-top: 18px;" v-if="item.ScenicArray.length>1">
<div class="fz21 fontBold travelDaysHV-CouponsName"
:style="{'color':dataAll.TripColor}">
:style="{'color':'black'}">
<span class="CouponsNameM">【</span>
<span class="CouponsNameT">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].CouponsName"></vEditSpan>
......@@ -253,7 +253,7 @@
</div>
<div style="margin-top: 18px;" v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold travelDaysHV-CouponsName travelDaysHV-CouponsName3"
:style="{'color':dataAll.TripColor}">
:style="{'color':'black'}">
<span class="CouponsNameM">【</span>
<span class="CouponsNameT">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].CouponsName"></vEditSpan>
......@@ -304,7 +304,7 @@
</div>
<div style="margin-top: 18px;" v-if="item.ScenicArray.length>1">
<div class="fz21 fontBold travelDaysHV-CouponsName travelDaysHV-CouponsName3"
:style="{'color':dataAll.TripColor}">
:style="{'color':'black'}">
<span class="CouponsNameM">【</span>
<span class="CouponsNameT">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].CouponsName"></vEditSpan>
......@@ -355,7 +355,7 @@
</div>
<div style="margin-top: 18px;">
<div class="fz21 fontBold travelDaysHV-CouponsName travelDaysHV-CouponsName3"
:style="{'color':dataAll.TripColor}">
:style="{'color':'black'}">
<span class="CouponsNameM">【</span>
<span class="CouponsNameT">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].CouponsName"></vEditSpan>
......
src/components/onedayTripContract.vue
View file @ 1e29ab08
......@@ -346,7 +346,6 @@
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
<div class="TC-MainContent">
......@@ -521,7 +520,8 @@
<tr>
<td>
<el-form-item label="旅游者">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class="w300" v-model="CtObj.C_InsuranceType">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class="w300"
v-model="CtObj.C_InsuranceType">
<el-option label="委托旅行社购买" :value="1"></el-option>
<el-option label="自行购买" :value="2"></el-option>
<el-option label="放弃购买" :value="3"></el-option>
......@@ -532,10 +532,11 @@
<tr>
<td>
<el-form-item label="保险公司名称" v-if="CtObj.C_InsuranceType==1">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w300' v-model="CtObj.C_InsuranceName">
<el-select :placeholder="$t('pub.pleaseSel')" filterable class='w300'
v-model="CtObj.C_InsuranceName">
<el-option label="中国平安财产保险股份有限公司成都市锦城支公司" value='中国平安财产保险股份有限公司成都市锦城支公司'></el-option>
<el-option label="あいおいニッセイ同和損害保険株式会社" value='あいおいニッセイ同和損害保険株式会社'></el-option>
<el-option label="中国大地财产保险股份有限公司" value='中国大地财产保险股份有限公司'></el-option>
<el-option label="中国大地财产保险股份有限公司" value='中国大地财产保险股份有限公司'></el-option>
</el-select>
</el-form-item>
</td>
......@@ -983,7 +984,8 @@
<el-input type="text" placeholder="健康" v-model="item.CGuestHealth" v-else></el-input>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" v-if="item.IsShow == 0" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" v-if="item.IsShow == 0"
placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="保存" v-if="item.IsShow == 1" placement="top-start">
......@@ -1062,7 +1064,8 @@
<el-input type="text" v-model="item.TouristsSignAgree" v-else></el-input>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" v-if="item.IsShow == 0">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
v-if="item.IsShow == 0">
<el-button type="primary" icon="el-icon-edit" circle @click="commonUpdate(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start" v-if="item.IsShow == 1">
......@@ -1286,7 +1289,9 @@
//跳转锚点
goAnchor(selector) {
var anchor = this.$el.querySelector(selector);
document.documentElement.scrollTop = anchor.offsetTop - 70;
if (anchor) {
document.documentElement.scrollTop = anchor.offsetTop - 70;
}
},
//提交数据
SaveMsg() {
......@@ -1370,12 +1375,30 @@
_self.scroll =
(document.documentElement.scrollTop || document.body.scrollTop) + 70;
//滑动到指定位置相应菜单高亮
var a_0 = this.$refs.anchor0.offsetTop;
var a_1 = this.$refs.anchor1.offsetTop;
var a_2 = this.$refs.anchor2.offsetTop;
var a_3 = this.$refs.anchor3.offsetTop;
var a_4 = this.$refs.anchor4.offsetTop;
var a_5 = this.$refs.anchor5.offsetTop;
var a_0 = 0;
if (this.$refs.anchor0 && this.$refs.anchor0.offsetTop) {
a_0 = this.$refs.anchor0.offsetTop;
}
var a_1 = 0;
if (this.$refs.anchor1 && this.$refs.anchor1.offsetTop) {
a_1 = this.$refs.anchor1.offsetTop;
}
var a_2 = 0;
if (this.$refs.anchor2 && this.$refs.anchor2.offsetTop) {
a_2 = this.$refs.anchor2.offsetTop;
}
var a_3 = 0;
if (this.$refs.anchor3 && this.$refs.anchor3.offsetTop) {
a_3 = this.$refs.anchor3.offsetTop;
}
var a_4 = 0;
if (this.$refs.anchor4 && this.$refs.anchor4.offsetTop) {
a_4 = this.$refs.anchor4.offsetTop;
}
var a_5 = 0;
if (this.$refs.anchor5 && this.$refs.anchor5.offsetTop) {
a_5 = this.$refs.anchor5.offsetTop;
}
if (_self.scroll < a_0) {
this.ckedIndex = 0;
} else if (_self.scroll > a_0 && _self.scroll < a_1) {
......@@ -1602,5 +1625,4 @@
});
}
};
</script>
</script>
\ No newline at end of file
src/components/orderCommon/order-form2.vue
View file @ 1e29ab08
This diff is collapsed.
src/components/orderCommon/productOrderList.vue
View file @ 1e29ab08
......@@ -373,7 +373,7 @@
font-size: 12px;
}
.product_union1 {
.product_nei {
position: absolute;
top: 0px;
left: 0px;
......@@ -385,7 +385,7 @@
border-right: 15px solid transparent;
}
.product_union1::after {
.product_nei::after {
content: "内";
position: absolute;
top: -14px;
......@@ -467,7 +467,7 @@
<li v-for="(item, index) in list" :key="index">
<div class="dline">
<div class="d1">
<div v-if="item.IsB2B === 0" class="product_union1"></div>
<div v-if="item.IsB2B === 0" class="product_nei"></div>
<div v-if="item.IsUnionTravel === 1" class="product_union"></div>
<div v-if="item.IsWarning === 1" class="product_warning"></div>
<div class="d12" style="float: none; margin: auto" :style="{'width': pagesTitle=='跟团游产品'?'200px':'auto'}">
......
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