Skip to content

S
SuperMan
Commit 9435dc00 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 2d633876 d87c97a5
Show whitespace changes
Inline Side-by-side
Showing with 891 additions and 217 deletions
src/components/Details.vue
View file @ 9435dc00
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<analogIFrame :key="i" :type='item.type' v-model="item.history" :curIndex='i' :refer='item.refer' v-show="tabs.indexOf(currentTag)==i" :componentTemp='item.comp' v-for="(item,i) in tabs" v-if='item.comp' :path='item.path' :name='item.name'></analogIFrame> <analogIFrame :key="i" :type='item.type' v-model="item.history" :curIndex='i' :refer='item.refer' v-show="tabs.indexOf(currentTag)==i" :componentTemp='item.comp' v-for="(item,i) in tabs" v-if='item.comp' :path='item.path' :name='item.name'></analogIFrame>
</div> </div>
<div class="flexParent" v-if="openMode==0"> <div class="flexParent" v-if="openMode==0">
<a :href='blankUrl' ref='blankLink' target="_blank" style="display:none">1</a> <a :href='blankUrl' id='blankLink' target="_blank" style="display:none">1</a>
<div class="resource-ttop" style="font-family:PingFangSC-Semibold" v-if="rootName!=''"> <div class="resource-ttop" style="font-family:PingFangSC-Semibold" v-if="rootName!=''">
{{rootName}}<i class="iconfont icon-weibiaoti102"></i>{{parentName}}<i class="iconfont icon-weibiaoti102"></i><span class="active">{{currentName}}</span> {{rootName}}<i class="iconfont icon-weibiaoti102"></i>{{parentName}}<i class="iconfont icon-weibiaoti102"></i><span class="active">{{currentName}}</span>
</div> </div>
...@@ -882,10 +882,10 @@ export default { ...@@ -882,10 +882,10 @@ export default {
next() next()
}else if(that.openMode==0 && to.query.blank && to.query.blank=='y'){ }else if(that.openMode==0 && to.query.blank && to.query.blank=='y'){
let dom = document.querySelector("#blankLink")
that.$refs.blankLink.href=`http://${window.location.host}/#${to.fullPath}` dom.href=`http://${window.location.host}/#${to.fullPath}`
//console.log(that.$refs.blankLink.click()) //console.log(that.$refs.blankLink.click())
that.$refs.blankLink.click() dom.click()
}else{ }else{
next() next()
} }
......
src/components/DomesticModule/OrderDetails.vue
View file @ 9435dc00
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</div> </div>
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>订单号</th> <th>编号</th>
<th>人数</th> <th>人数</th>
<th>应收金额</th> <th>应收金额</th>
<th>成本</th> <th>成本</th>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<!-- <th>操作</th> --> <!-- <th>操作</th> -->
</tr> </tr>
<tr v-for="(item,index) in DataList.list" :key="index"> <tr v-for="(item,index) in DataList.list" :key="index">
<td>{{item.OrderID}}</td> <td>{{item.ID}}</td>
<td class="_hover"> <td class="_hover">
<el-popover <el-popover
placement="bottom" placement="bottom"
......
src/components/DomesticModule/OrderToday.vue
View file @ 9435dc00
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class='flexOne page_OrderToday'> <div class='flexOne page_OrderToday'>
<div class='query-box'> <div class='query-box'>
<ul> <ul>
<li> <!-- <li>
<span> <span>
<em>期数</em> <em>期数</em>
<el-date-picker <el-date-picker
...@@ -16,6 +16,18 @@ ...@@ -16,6 +16,18 @@
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</span> </span>
</li> -->
<li>
<span>
<em>制单日期</em>
<el-date-picker
class="h34"
v-model="transactionDate"
@change="timeAdd()"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</span>
</li> </li>
<li> <li>
<span> <span>
...@@ -68,21 +80,21 @@ ...@@ -68,21 +80,21 @@
</div> </div>
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>期数</th> <th>编号</th>
<th>人数</th> <th>人数</th>
<th>金额</th> <th>金额</th>
<th>成本</th> <th>成本</th>
<th>利润</th> <th>利润</th>
<th>客户名称</th> <th>客户名称</th>
<th>行程时间</th> <th>行程时间</th>
<th>航空公司</th> <th>航空公司 — 航班 — 航段</th>
<th>航班</th> <th></th>
<th>航段</th> <th></th>
<th>操作人</th> <th>操作人</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="(item,index) in DataList.list"> <tr v-for="(item,index) in DataList.list">
<td>{{item.Term}}</td> <td>{{item.ID}}</td>
<td class="_hover"> <td class="_hover">
<el-popover <el-popover
placement="bottom" placement="bottom"
...@@ -222,7 +234,7 @@ ...@@ -222,7 +234,7 @@
</el-row> </el-row>
<el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px"> <el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">
<el-row> <el-row>
<el-col :span="6" :gutter="35" > <!-- <el-col :span="6" :gutter="35" >
<el-form-item label="期数" prop="TermDate"> <el-form-item label="期数" prop="TermDate">
<el-date-picker <el-date-picker
v-model="addMsg.TermDate" v-model="addMsg.TermDate"
...@@ -233,7 +245,7 @@ ...@@ -233,7 +245,7 @@
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="6" :gutter="35" > <el-col :span="6" :gutter="35" >
<el-form-item label="出票日期" prop="OutTicketDate"> <el-form-item label="出票日期" prop="OutTicketDate">
<el-date-picker <el-date-picker
...@@ -386,10 +398,12 @@ export default { ...@@ -386,10 +398,12 @@ export default {
FlightNo:'', FlightNo:'',
ClientName:'', ClientName:'',
ParentId:0, ParentId:0,
Term:new Date().Format("yyyy-MM-dd"), Term:'',
sDate:'',
eDate:''
}, },
addMsg:{ addMsg:{
TermDate:new Date().Format("yyyy-MM-dd"), TermDate:'',
ID:0, ID:0,
OutTicketDate:new Date().Format("yyyy-MM-dd"), OutTicketDate:new Date().Format("yyyy-MM-dd"),
TravelTime:'', TravelTime:'',
...@@ -449,6 +463,7 @@ export default { ...@@ -449,6 +463,7 @@ export default {
airlineList:[], airlineList:[],
AirportNameList:[], AirportNameList:[],
}, },
transactionDate:[],
airlineList:[], airlineList:[],
AirportNameList:[], AirportNameList:[],
DataList:[], DataList:[],
...@@ -470,7 +485,7 @@ export default { ...@@ -470,7 +485,7 @@ export default {
dialogFormVisible:false, dialogFormVisible:false,
formLabelWidth: '120px', formLabelWidth: '120px',
goPath:'', goPath:'',
TermDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'), TermDate:'',
rules: {//表单必填验证 rules: {//表单必填验证
ClientName: [ ClientName: [
{ required: true, message: '请填写客户名称', trigger: 'blur' } { required: true, message: '请填写客户名称', trigger: 'blur' }
...@@ -489,14 +504,9 @@ export default { ...@@ -489,14 +504,9 @@ export default {
], ],
OutTicketDate: [ OutTicketDate: [
{ required: true, message: '请输选出票日期', trigger: 'change' } { required: true, message: '请输选出票日期', trigger: 'change' }
],
TermDate: [
{ required: true, message: '请输选择期数', trigger: 'change' }
] ]
} }
} }
},created(){
},mounted(){ },mounted(){
this.getList(); this.getList();
this.getAirlineList(); this.getAirlineList();
...@@ -515,6 +525,15 @@ export default { ...@@ -515,6 +525,15 @@ export default {
if(pi) return if(pi) return
this.addMsg.FlightList.splice(i,1); this.addMsg.FlightList.splice(i,1);
} }
},
timeAdd(){ // 日期格式
if(!this.transactionDate){
this.msg.sDate = '';
this.msg.eDate = '';
return
}
this.msg.sDate = this.transactionDate[0];
this.msg.eDate = this.transactionDate[1];
}, },
compare(property){ compare(property){
return function(a,b){ return function(a,b){
...@@ -542,7 +561,10 @@ export default { ...@@ -542,7 +561,10 @@ export default {
} }
}, },
jiesuan(){ jiesuan(){
this.apipost('Domestic_Ticket_post_CheckBiLL',{TermDate:this.TermDate},r=>{ if(!this.TermDate){
return this.$message.error('请选择结算日期');
}
this.apipost('Domestic_Ticket_post_CheckBiLL',{TermDate:this.TermDate,sDate:this.msg.sDate,eDate:this.msg.eDate},r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
this.$router.push({name:this.goPath,query:{'Term':this.TermDate,'blank':'y'}}); this.$router.push({name:this.goPath,query:{'Term':this.TermDate,'blank':'y'}});
this.getList(); this.getList();
...@@ -663,7 +685,7 @@ export default { ...@@ -663,7 +685,7 @@ export default {
}, },
initAddMsg(){ // 取消修改、新增 initAddMsg(){ // 取消修改、新增
this.addMsg ={ this.addMsg ={
TermDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'), TermDate:'',
ID:this.addMsg.ID, ID:this.addMsg.ID,
OutTicketDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'), OutTicketDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'),
TravelTime:'', TravelTime:'',
...@@ -704,7 +726,7 @@ export default { ...@@ -704,7 +726,7 @@ export default {
} }
], ],
Num:0, Num:0,
Term:new Date().Format("yyyy-MM-dd"), Term:'',
FlightList:[ FlightList:[
{ {
ID:0, ID:0,
...@@ -731,9 +753,6 @@ export default { ...@@ -731,9 +753,6 @@ export default {
if(this.msg.AirlineId==''){ if(this.msg.AirlineId==''){
this.msg.AirlineId=0; this.msg.AirlineId=0;
} }
if(this.msg.Term){
this.msg.Term = this.msg.Term.replace(/-/g,'');
}
this.loading = true this.loading = true
this.apipost('Domestic_Ticket_post_GetPageList',this.msg,res=>{ this.apipost('Domestic_Ticket_post_GetPageList',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
...@@ -745,6 +764,7 @@ export default { ...@@ -745,6 +764,7 @@ export default {
this.noData =true; this.noData =true;
} }
this.DataList = data; this.DataList = data;
console.log(this.DataList,'dataList');
this.loading = false; this.loading = false;
if(!t){ if(!t){
this.msg.OrderID=''; this.msg.OrderID='';
...@@ -776,7 +796,7 @@ export default { ...@@ -776,7 +796,7 @@ export default {
}, },
initAddMsg(){//初始化添加、修改数据 initAddMsg(){//初始化添加、修改数据
let newMsg = { let newMsg = {
TermDate:new Date().Format("yyyy-MM-dd"), TermDate:'',
OrderID:0, OrderID:0,
OutTicketDate:new Date().Format("yyyy-MM-dd"), OutTicketDate:new Date().Format("yyyy-MM-dd"),
TravelTime:'', TravelTime:'',
...@@ -816,7 +836,7 @@ export default { ...@@ -816,7 +836,7 @@ export default {
profit:'' profit:''
} }
], ],
Term:new Date().Format("yyyy-MM-dd"), Term:'',
FlightList:[ FlightList:[
{ {
ID:0, ID:0,
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 9435dc00
...@@ -201,31 +201,31 @@ ...@@ -201,31 +201,31 @@
<el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading"> <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p> <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<!--template v-if="BillType===2"> <template>
<tr > <tr >
<th height="34px">账户分类</th> <th height="34px">账户分类</th>
<th height="34px">付款方式</th> <th height="34px">付款方式</th>
<th height="34px">账户</th> <th height="34px">账户</th>
&lt;!&ndash; <th width="100px">账户余额</th> &ndash;&gt; <!-- <th width="100px">账户余额</th> -->
<th height="34px">金额</th> <th height="34px">金额</th>
<th height="34px" width="70">币种</th> <th height="34px" width="70">币种</th>
<th height="34px" width="50px">汇率</th> <th height="34px" width="50px">汇率</th>
&lt;!&ndash; <th>手续费</th> &ndash;&gt; <!-- <th>手续费</th> -->
<th height="34px" width="100px">总金额</th> <th height="34px" width="100px">总金额</th>
&lt;!&ndash; <th>操作</th> &ndash;&gt; <!-- <th>操作</th> -->
</tr> </tr>
<template v-for="(item,index) in payMsgList"> <template v-for="(item,index) in payMsgList">
<tr v-if="!item.show" @click="payMsgList[index].show=true"> <tr v-if="!item.show" @click="payMsgList[index].show=true">
<td height="34px">{{item.AccName}}</td> <td height="34px">{{item.AccName}}</td>
<td height="34px">{{item.Name}}</td> <td height="34px">{{item.Name}}</td>
<td height="34px">{{item.Account}}</td> <td height="34px">{{item.Account}}</td>
&lt;!&ndash; <td>{{item.balance}}</td> &ndash;&gt; <!-- <td>{{item.balance}}</td> -->
<td height="34px">{{moneyFormat(item.OriginalMoney)}}</td> <td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>
<td height="34px">{{item.CurrenName}}</td> <td height="34px">{{item.CurrenName}}</td>
<td height="34px">{{item.Rate}}</td> <td height="34px">{{item.Rate}}</td>
&lt;!&ndash; <td>{{item.Fee}}</td> &ndash;&gt; <!-- <td>{{item.Fee}}</td> -->
<td height="34px">{{moneyFormat(item.allMoney)}}</td> <td height="34px">{{moneyFormat(item.allMoney)}}</td>
&lt;!&ndash; <td></td> &ndash;&gt; <!-- <td></td> -->
</tr> </tr>
<tr v-else class="_show_class"> <tr v-else class="_show_class">
<td> <td>
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
</td> </td>
<td>{{moneyFormat(payMsg.allMoney)}}</td> <td>{{moneyFormat(payMsg.allMoney)}}</td>
</tr> </tr>
</template>--> </template>
<tr> <tr>
<td height="34px">总金额</td> <td height="34px">总金额</td>
<td height="34px" colspan="7"> <td height="34px" colspan="7">
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 9435dc00
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<el-dialog custom-class='w750 height="34px"' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading"> <el-dialog custom-class='w750 height="34px"' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p> <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template v-if="BillType===2"> <template>
<tr > <tr >
<th height="34px">账户分类</th> <th height="34px">账户分类</th>
<th height="34px">付款方式</th> <th height="34px">付款方式</th>
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 9435dc00
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading"> <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p> <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;">
<template v-if="BillType == 1"> <template>
<tr > <tr >
<th height="34px">账户分类</th> <th height="34px">账户分类</th>
<th height="34px">付款方式</th> <th height="34px">付款方式</th>
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 9435dc00
...@@ -180,112 +180,112 @@ ...@@ -180,112 +180,112 @@
<el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading"> <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p> <p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<!--<template v-if="BillType===1">--> <template>
<!--<tr >--> <tr >
<!--<th height="34px">账户分类</th>--> <th height="34px">账户分类</th>
<!--<th height="34px">付款方式</th>--> <th height="34px">付款方式</th>
<!--<th height="34px">账户</th>--> <th height="34px">账户</th>
<!--&lt;!&ndash; <th width="100px">账户余额</th> &ndash;&gt;--> <!-- <th width="100px">账户余额</th> -->
<!--<th height="34px">金额</th>--> <th height="34px">金额</th>
<!--<th height="34px" width="70">币种</th>--> <th height="34px" width="70">币种</th>
<!--<th height="34px" width="50px">汇率</th>--> <th height="34px" width="50px">汇率</th>
<!--&lt;!&ndash; <th>手续费</th> &ndash;&gt;--> <!-- <th>手续费</th> -->
<!--<th height="34px" width="100px">总金额</th>--> <th height="34px" width="100px">总金额</th>
<!--&lt;!&ndash; <th>操作</th> &ndash;&gt;--> <!-- <th>操作</th> -->
<!--</tr>--> </tr>
<!--<template v-for="(item,index) in payMsgList">--> <template v-for="(item,index) in payMsgList">
<!--<tr v-if="!item.show" @click="payMsgList[index].show=true">--> <tr v-if="!item.show" @click="payMsgList[index].show=true">
<!--<td height="34px">{{item.AccName}}</td>--> <td height="34px">{{item.AccName}}</td>
<!--<td height="34px">{{item.Name}}</td>--> <td height="34px">{{item.Name}}</td>
<!--<td height="34px">{{item.Account}}</td>--> <td height="34px">{{item.Account}}</td>
<!--&lt;!&ndash; <td>{{item.balance}}</td> &ndash;&gt;--> <!-- <td>{{item.balance}}</td> -->
<!--<td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>--> <td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>
<!--<td height="34px">{{item.CurrenName}}</td>--> <td height="34px">{{item.CurrenName}}</td>
<!--<td height="34px">{{item.Rate}}</td>--> <td height="34px">{{item.Rate}}</td>
<!--&lt;!&ndash; <td>{{item.Fee}}</td> &ndash;&gt;--> <!-- <td>{{item.Fee}}</td> -->
<!--<td height="34px">{{moneyFormat(item.allMoney)}}</td>--> <td height="34px">{{moneyFormat(item.allMoney)}}</td>
<!--&lt;!&ndash; <td></td> &ndash;&gt;--> <!-- <td></td> -->
<!--</tr>--> </tr>
<!--<tr v-else class="_show_class">--> <tr v-else class="_show_class">
<!--<td>--> <td>
<!--<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">--> <el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">
<!--<el-option v-for='i in AccListT'--> <el-option v-for='i in AccListT'
<!--:label='i.Name'--> :label='i.Name'
<!--:value='i.Name'--> :value='i.Name'
<!--:key='i.ID'>--> :key='i.ID'>
<!--</el-option>--> </el-option>
<!--</el-select>--> </el-select>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">--> <el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">
<!--<el-option v-for='i in GetAccountType'--> <el-option v-for='i in GetAccountType'
<!--:label='i.Name'--> :label='i.Name'
<!--:value='i.ID'--> :value='i.ID'
<!--:key='i.ID'>--> :key='i.ID'>
<!--</el-option>--> </el-option>
<!--</el-select>--> </el-select>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<el-select filterable v-model='item.AccountId' placeholder="请选择账户" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">--> <el-select filterable v-model='item.AccountId' placeholder="请选择账户" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<!--<el-option v-for='i in accountList'--> <el-option v-for='i in accountList'
<!--:label='i.allName'--> :label='i.allName'
<!--:value='i.ID'--> :value='i.ID'
<!--:key='i.ID'>--> :key='i.ID'>
<!--</el-option>--> </el-option>
<!--</el-select>--> </el-select>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>--> <el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<p>{{item.CurrenName}}</p>--> <p>{{item.CurrenName}}</p>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<el-input v-model="item.Rate" @blur="item.show=false,CalculationMoney" @change="Calculation(1,index)" type="number" class=" _border_b_1"></el-input>--> <el-input v-model="item.Rate" @blur="item.show=false,CalculationMoney" @change="Calculation(1,index)" type="number" class=" _border_b_1"></el-input>
<!--</td>--> </td>
<!--<td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney" class="_delete_row iconfont icon-img_delete_small"></i></td>--> <td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney" class="_delete_row iconfont icon-img_delete_small"></i></td>
<!--</tr>--> </tr>
<!--</template>--> </template>
<!--<tr>--> <tr>
<!--<td>--> <td>
<!--<el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1">--> <el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1">
<!--<el-option v-for='i in AccListT'--> <el-option v-for='i in AccListT'
<!--:label='i.Name'--> :label='i.Name'
<!--:value='i.Name'--> :value='i.Name'
<!--:key='i.ID'>--> :key='i.ID'>
<!--</el-option>--> </el-option>
<!--</el-select>--> </el-select>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type)" class=" _border_b_1">--> <el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type)" class=" _border_b_1">
<!--<el-option v-for='i in GetAccountType'--> <el-option v-for='i in GetAccountType'
<!--:label='i.Name'--> :label='i.Name'
<!--:value='i.ID'--> :value='i.ID'
<!--:key='i.ID'>--> :key='i.ID'>
<!--</el-option>--> </el-option>
<!--</el-select>--> </el-select>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<el-select filterable v-model='payMsg.AccountId' placeholder="请选择账户" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">--> <el-select filterable v-model='payMsg.AccountId' placeholder="请选择账户" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<!--<el-option v-for='i in accountList'--> <el-option v-for='i in accountList'
<!--:label='i.allName'--> :label='i.allName'
<!--:value='i.ID'--> :value='i.ID'
<!--:key='i.ID'>--> :key='i.ID'>
<!--</el-option>--> </el-option>
<!--</el-select>--> </el-select>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>--> <el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<p>{{payMsg.CurrenName}}</p>--> <p>{{payMsg.CurrenName}}</p>
<!--</td>--> </td>
<!--<td>--> <td>
<!--<el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number" class=" _border_b_1"></el-input>--> <el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number" class=" _border_b_1"></el-input>
<!--</td>--> </td>
<!--<td>{{moneyFormat(payMsg.allMoney)}}</td>--> <td>{{moneyFormat(payMsg.allMoney)}}</td>
<!--</tr>--> </tr>
<!--</template>--> </template>
<tr> <tr>
<td height="34px">总金额</td> <td height="34px">总金额</td>
<td height="34px" colspan="7"> <td height="34px" colspan="7">
......
src/components/Ticketing/individualTicket.vue 0 → 100644
View file @ 9435dc00
<style>
.individualTicket .el-input--prefix .el-input__inner {
padding-left: 30px;
}
.individualTicket_list {
padding: 20px 0 0 0;
}
.individualTicket ._ol_info {
font-size: 12px;
height: 100%;
}
.individualTicket ._ol_info._edHeight {
height: 200px;
}
.individualTicket ._ol_color {
font-size: 12px;
width: 100%;
margin-bottom: 20px;
}
.individualTicket ._ol_color li {
float: left;
padding: 0 15px;
display: flex;
align-items: center;
}
.individualTicket ._ol_color li ._cl {
border-radius: 3px;
display: inline-block;
width: 5px;
height: 12px;
margin-right: 5px;
}
.individualTicket ._red_text {
color: #e95252;
}
.individualTicket ._green {
background-color: #47bf8c;
}
.individualTicket ._green_text {
color: #47bf8c;
}
.individualTicket ._blu {
background-color: #2aaef2;
}
.individualTicket ._blu_text {
color: #2aaef2;
}
.individualTicket ._ol_list {
margin-top: 20px;
min-height: 500px;
}
.individualTicket ._ol_list > li {
margin: 20px 0 0px 0px;
transition: linear all 0.5s;
background-color: #fff;
border: 1px solid #dddddd;
border-left: 0;
position: relative;
}
.individualTicket ._ol_list > li:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
.individualTicket ._oll_tit {
color: #333333;
font-size: 14px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.individualTicket ._oll_tit span {
display: inline-block;
padding: 1px 10px;
font-size: 12px;
border: solid 1px #ff9000;
color: #ff9000;
border-radius: 4px;
}
.individualTicket ._oll_line {
max-width: 5px;
min-width: 5px;
height: 105px;
position: absolute;
left: 0;
top: 0;
z-index: 50;
background: rgba(233, 82, 82, 1);
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
display: inline-block;
}
.individualTicket ._oll_line._o_green {
background: #47bf8c;
}
.individualTicket ._oll_line._o_blu {
background: #2aaef2;
}
.individualTicket ._oll_img {
height: 45px;
width: 45px;
border-radius: 50%;
margin: 5px 0 0 15px;
margin-left: 20px;
display: inline-block;
}
.individualTicket ._oll_adrr {
color: white;
font-size: 12px;
margin-top: 8px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
padding: 4px 9px;
background-color: #2aaef2;
border-radius: 2px;
}
.TMN_Seat {
height: 100%;
display: flex;
}
.TK_SeatList {
height: 60px;
background-color: #f9f9f9;
margin-top: 9px;
padding-right: 10px;
}
.TK_SeatList > ul > li:nth-child(1) {
margin-left: 5px;
}
.TK_SeatList > ul > li {
float: left;
text-align: center;
margin: 5px 10px 0 0;
}
.TK_SeatList > ul > li:last-child {
margin-right: 0;
}
.TK_SeatList .iconfont {
color: #d1d1d1;
display: inline-block;
margin-top: 5px;
}
.TK_SeatList ._wz {
color: #666666;
}
.TMA_raduis > ul > li._head {
display: flex;
align-items: center;
}
.TMA_raduis > ul > li._head img {
height: 26px;
width: 26px;
border-radius: 50%;
margin-left: 15px;
}
.TMA_raduis > ul > li._head span {
padding-left: 7px;
display: inline-block;
margin-right: 25px;
}
._jztime {
color: #666666;
margin: 0 12px;
}
._jztime .PingFangSC {
font-size: 12px;
}
._jztime ._text {
font-size: 12px;
}
.individualTicket .el-pagination {
border: none !important;
}
.individualTicket .el-form-item__label {
font-size: 12px;
color: #606266;
}
.individualTicket .multiple_input .el-input {
height: auto !important;
}
.individualTicket .el-button--primary {
padding: 5px;
margin-right: 1px;
}
.individualTicket ._lian_style {
position: absolute;
top: 0px;
left: 5px;
z-index: 99;
display: inline-block;
background-color: #e83140;
color: white;
padding: 2px 4px;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
._oll_img_box {
height: 78px;
display: inline-block;
vertical-align: top;
padding-top: 14px;
}
.vmiddle {
display: flex;
align-items: Center;
height: 78px;
}
.individualTicket .TICK_Code {
position: absolute;
left: 27px;
top: 5px;
}
.TCID_cont {
min-height: 28px;
border-top: 1px dashed #ccc;
}
/*航班详情*/
.individualTicket .FlightDivDetails {
width: 100%;
height: 65px;
overflow: auto;
}
.individualTicket ._flightList {
text-align: left;
font-size: 12px;
margin-bottom: 5px;
padding-right: 5px;
}
/*航班号*/
.individualTicket .FlightNumber {
color: #ff0066;
font-weight: bold;
}
.TK_SeatList ._num3 {
font-size: 17px;
color: #e95252;
height: 28px;
font-family: PingFangSC-Semibold, sans-serif;
}
</style>
<template>
<div class="flexOne individualTicket">
<div class="query-box Plan_Query">
<ul>
<li>
<span>
<em>状态</em>
<el-select v-model="msg.FlyState" :placeholder="$t('system.ph_in')">
<el-option label="未起飞" :value='0'></el-option>
<el-option label="已起飞" :value='1'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>线路</em>
<el-select v-model="msg.LineId" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName"
:value="item.LineID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>航空公司</em>
<el-select v-model="msg.AirLineID" filterable :placeholder="$t('system.ph_in')">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>航班号</em>
<el-input v-model="msg.Flight_number" placeholder="机票编号"></el-input>
</span>
</li>
<li>
<span>
<em>操作人</em>
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('system.ph_in')">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>编号</em>
<el-input v-model="msg.ID" placeholder="机票编号"></el-input>
</span>
</li>
<li>
<span>
<em>可报名</em>
<el-select v-model="msg.IsPayOrder" :placeholder="$t('system.ph_in')">
<el-option label="否" :value='0'></el-option>
<el-option label="是" :value='1'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>航班日期</em>
<el-date-picker clearable class="w135" v-model="msg.QFlightDateStart" type="date"
:picker-options="beforeCheck"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
<span class="_ln">-</span>
<el-date-picker clearable class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</span>
</li>
<li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
</li>
</ul>
</div>
<div class="individualTicket_list">
<ul class="_ol_color clearfix">
<li>
<span class="_red _cl"></span>
<span class="_red_text">{{$t('Airticket.Air_redType')}}：</span>
{{$t('Airticket.Air_firstClass')}}
</li>
<li>
<span class="_green _cl"></span>
<span class="_green_text">{{$t('Airticket.Air_greenType')}}：</span>
{{$t('Airticket.Air_businessClass')}}
</li>
<li>
<span class="_blu _cl"></span>
<span class="_blu_text">{{$t('Airticket.Air_blueType')}}：</span>
{{$t('Airticket.Air_EconomyClass')}}
</li>
</ul>
<div class="_ol_info">
<ul class="_ol_list" v-loading="loading">
<li v-for="(item,index) in dataList" :data-id="item.ID">
<span class="_oll_line" v-if="item.FreightSpace==1"></span>
<span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
<span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
<el-row :gutter="10">
<el-col :span="2">
<span class="_lian_style" v-if="item.IsSetUnion==1">联</span>
<div class="_oll_img_box">
<span class="TICK_Code PingFangSC">编号：{{item.ID}}</span>
<img v-if="!item.AirlineUrl" class="_oll_img" :src="defaultImg">
<img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
</div>
</el-col>
<el-col :span="2" class="vmiddle">
<div class="_oll_info">
<el-tooltip class="item" effect="dark" :content="item.AirlineName" placement="top-start"
popper-class="max-w250">
<p class="_oll_tit">{{item.AirlineName}}</p>
</el-tooltip>
<span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
</div>
</el-col>
<el-col :span="5" class="vmiddle">
<div class="FlightDivDetails">
<div class="_flightList" v-for="subItem in item.flightList">
<span class="FlightNumber">{{subItem.Flight_number}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
<span>({{subItem.DIATA}}){{subItem.DepartureName}}</span>
<span v-if="subItem.StopoverName">-</span>
<span v-if="subItem.StopoverName">({{subItem.StopoverIATA}}){{subItem.StopoverName}}</span>
<span v-if="subItem.ArrivalCityName">-</span>
<span v-if="subItem.ArrivalCityName">({{subItem.AIATA}}){{subItem.ArrivalCityName}}</span>
</div>
</div>
</el-col>
<el-col :span="10" class="vmiddle">
<div class="TMN_Seat">
<div class="TK_SeatList">
<ul class="clearfix">
<li>
<span class="iconfont icon-img_yizi"></span>
</li>
<li>
<p class="_num3">{{item.CostPrice}}</p>
<p class="_wz">成本价格</p>
</li>
<li>
<p class="_num3">{{item.B2BPrice}}</p>
<p slot="reference" class="_wz">b2b价格</p>
</li>
<li>
<p class="_num3">{{item.B2CPrice}}</p>
<p class="_wz">b2c价格</p>
</li>
<li>
<p class="_num3">{{item.SalePrice}}</p>
<p class="_wz">销售价格</p>
</li>
<li>
<p class="_num3">{{item.AirTickNum}}</p>
<p class="_wz">总机位数</p>
</li>
<li>
<p class="_num3">{{item.SurplusNum}}</p>
<p class="_wz">剩余机位数</p>
</li>
<li>
<p class="_num3">{{item.UseNum}}</p>
<p class="_wz">使用机位数</p>
</li>
</ul>
</div>
</div>
</el-col>
<el-col :span="1" class="vmiddle">
<div class="TMA_raduis">
<ul style="padding:0;">
<li class="_head" style="display:block">
<img style="margin-left:0px" v-if="item.CreateUrl" :src="item.CreateUrl" :onerror="defaultImg">
<img style="margin-left:0px" v-else src="../../assets/img/bg_z1@2x.png">
<span style="padding:0;margin:0;display:block;">{{item.CreateName}}</span>
</li>
</ul>
</div>
</el-col>
<el-col :span="2" class="vmiddle">
<div class="_jztime">
<p class="PingFangSC">{{item.TicketDeadlineStr}}</p>
<p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
</div>
</el-col>
</el-row>
<el-row :gutter="0">
<el-col :span="24">
<div class="TCID_cont" style="padding:5px 0 0 20px;">PNR：{{item.PNR}}</div>
</el-col>
</el-row>
</li>
</ul>
<div class="noData" v-show="noData">{{$t('system.content_noData')}}</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total="total"></el-pagination>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
msg: {
pageIndex: 1,
pageSize: 6,
ID: 0,
QFlightDateStart:'',
QFlightDateEnd: "",
Flight_number:'',
AirLineID: 0,
TicketType: 2, //定金类型(1定，2定等)
LineId: 0, //线路编号
IsPayOrder:0,
FlyState: 1,
CreateBy: 0, //操作人
},
//员工列表
EmployeeList: [],
defaultSelectValue: 0,
//航空公司下拉框
airlineList: [],
//默认图片
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
//线路列表
LineList: [],
total: 0,
currentPage: 1,
loading: true,
noData: false,
dataList: [],
pickerOptions1: {
disabledDate(time) {
return time.getTime() < Date.now() - 100000000;
}
},
beforeCheck: {
disabledDate: time => {
let endTime = new Date(this.msg.QFlightDateEnd);
return endTime.getTime() < time.getTime();
}
},
afterCheck: {
disabledDate: time => {
let startTime = new Date(this.msg.QFlightDateStart);
return startTime.getTime() >= time.getTime();
}
},
};
},
methods: {
getList() {
this.loading = true;
if(this.msg.ID==''){
this.msg.ID=0;
}
this.apipost(
"ticket_get_GetAirTicketScatteringPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
this.noData = !this.total > 0;
}else{
this.Error(res.data.message);
}
},
err => {
}
);
},
//初始化航空公司下拉
initAirlines() {
this.apipost(
"airline_post_GetList", {},
res => {
if (res.data.resultCode == 1) {
this.airlineList = res.data.data;
}
},
err => {
}
);
},
//翻页功能按钮
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
//查询初始化页码
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
this.apipost(
"admin_get_GetEmployeeByUserDepartmentId", {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
},
err => {
}
);
},
//获取线路列表
GetLineList() {
this.apipost(
"line_post_GetAllList", {},
res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
},
err => {
}
);
},
},
mounted() {
this.GetLineList();
this.getList();
this.initAirlines();
this.getEmployeeList();
}
};
</script>
src/components/confirmationOrderDownLoad.vue
View file @ 9435dc00
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div> <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;display:none" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') --> <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息--> <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" /> <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
...@@ -942,6 +942,8 @@ ...@@ -942,6 +942,8 @@
isShowVisa:this.vshowH?1:0, isShowVisa:this.vshowH?1:0,
//isPc是否PC下载 //isPc是否PC下载
isPc: isPc, isPc: isPc,
//模板参数
templateId:5,
}; };
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{ this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
this.pdfLoading = false this.pdfLoading = false
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 9435dc00
...@@ -145,9 +145,6 @@ ...@@ -145,9 +145,6 @@
</td> </td>
<td> <td>
<div class="fz16 fbold"> <div class="fz16 fbold">
<!--{{item.ResultReport.MakeInvoice=='0'?"x":"O"}}
<span style="color: #4BCA81;">√</span>-->
<!--√：X :o 含义定义-->
<span style="color: #4BCA81;" v-if="item.ResultReport.MakeInvoice==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.MakeInvoice==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.MakeInvoice=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.MakeInvoice=='-1'?"x":"O"}}</span>
</div> </div>
...@@ -233,7 +230,7 @@ ...@@ -233,7 +230,7 @@
<div class="link"> <div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div> <div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div> <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
</div> </div>
</td> </td>
</tr> </tr>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 9435dc00
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
<div>{{item.ckTitle}}</div> <div>{{item.ckTitle}}</div>
</div> </div>
</div> </div>
<div>
<el-radio-group v-model="FeatureData.TemplateId">
<el-radio-button v-for="item in templateColorArray" :label="item.text" :key="item.id" :value="item.id"></el-radio-button>
</el-radio-group>
</div>
<div>注：幻灯片（图片至少为两张，图片尺寸应该控制在960*500，如果超出系统将自动裁剪显示）</div> <div>注：幻灯片（图片至少为两张，图片尺寸应该控制在960*500，如果超出系统将自动裁剪显示）</div>
<div class="ScraList">九宫格（请尽量保持图片高清，系统将根据你的图片数量自动缩放图片大小，最多9张图片）</div> <div class="ScraList">九宫格（请尽量保持图片高清，系统将根据你的图片数量自动缩放图片大小，最多9张图片）</div>
<div class="TFContent"> <div class="TFContent">
...@@ -248,6 +253,23 @@ ...@@ -248,6 +253,23 @@
TypeState: 5 TypeState: 5
} }
], //tab数组 ], //tab数组
templateColorArray:[
{
id: 1,
color: 'yellow',
text: '黄色'
},
{
id: 2,
color: 'pink',
text: '粉色'
},
{
id: 3,
color: 'blue',
text: '蓝色'
},
],
travelsList: [], travelsList: [],
del_show: true, del_show: true,
//折叠展开 //折叠展开
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 9435dc00
...@@ -139,6 +139,7 @@ ...@@ -139,6 +139,7 @@
Subtitle: "", Subtitle: "",
LineName: "", LineName: "",
DayList: [], DayList: [],
TemplateId: 1,
IsSave: false //是否保存 IsSave: false //是否保存
}, },
//线路行程 //线路行程
...@@ -584,6 +585,7 @@ ...@@ -584,6 +585,7 @@
this.FeatureData.ConfigId = tempData.Feature.ConfigId; this.FeatureData.ConfigId = tempData.Feature.ConfigId;
this.FeatureData.FeatureType = tempData.Feature.FeatureType; this.FeatureData.FeatureType = tempData.Feature.FeatureType;
this.FeatureData.FeatureImg = tempData.Feature.FeatureImg; this.FeatureData.FeatureImg = tempData.Feature.FeatureImg;
this.FeatureData.TemplateId = tempData.Feature.TemplateId;
this.FeatureData.FeatureContent = tempData.Feature.FeatureContent; this.FeatureData.FeatureContent = tempData.Feature.FeatureContent;
//图片列表 //图片列表
this.FeatureData.fileList = tempData.Feature.FeatureImgList; this.FeatureData.fileList = tempData.Feature.FeatureImgList;
......
src/router/config.js
View file @ 9435dc00
...@@ -1011,6 +1011,13 @@ export default { ...@@ -1011,6 +1011,13 @@ export default {
title: '机票列表' title: '机票列表'
}, },
}, { }, {
path: '/individualTicket', //散客机票
name: 'individualTicket',
component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
meta: {
title: '散客机票'
},
},{
path: '/PassengerList', //旅客名单 path: '/PassengerList', //旅客名单
name: 'PassengerList', name: 'PassengerList',
component: resolve => require(['@/components/Ticketing/PassengerList'], resolve), component: resolve => require(['@/components/Ticketing/PassengerList'], resolve),
......
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