Skip to content

S
SuperMan
Commit 0d60e2bc authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 84588366
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 85 deletions
src/components/Ticketing/flightPerformance.vue
View file @ 0d60e2bc
<style>
.fpTable th{
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
}
.fpTable th {
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
}
</style>
<template>
<div class="flexOne">
<div class="query-box">
<ul>
<li>
<span>
<em>航空公司</em>
<el-select v-model="msg.AirLineID" filterable :placeholder="$t('system.ph_in')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></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>
......@@ -29,90 +20,63 @@
</el-select>
</span>
</li>
<li>
<span>
<em>航班日期</em>
<el-date-picker 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 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>
<span>
<em>发团日期</em>
<el-date-picker class="w135" v-model="msg.StartDate" type="date"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
<el-date-picker class="w135" v-model="msg.StartDate" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
<span class="_ln">-</span>
<el-date-picker class="w135" v-model="msg.endDate" type="date"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
<el-date-picker class="w135" v-model="msg.endDate" type="date" value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()" :value="$t('pub.searchBtn')" />
<input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()"
:value="$t('pub.searchBtn')" />
</li>
</ul>
</div>
<table class="singeRowTable fpTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="150" rowspan="2">序号</th>
<th width="300" rowspan="2">团期</th>
<th colspan="3">操作提交数据</th>
<th colspan="3">公司核实数据</th>
</tr>
<tr>
<th>人数</th>
<th>金额</th>
<th>备注</th>
<th>人数</th>
<th>金额</th>
<th>备注</th>
<th>团期</th>
<th>出团公司</th>
<th>线路</th>
<th>人数</th>
<th>操作人员</th>
</tr>
<tr>
<td>1</td>
<td>123</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<td>1</td>
<tr v-for="item in dataList">
<td>{{item.TCNUM}}</td>
<td>{{item.OutBranchName}}</td>
<td>{{item.LineName}}</td>
<td>{{item.TicketNum}}</td>
<td>{{item.CreateByName}}</td>
</tr>
</table>
<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>
</template>
<script>
export default {
data() {
return {
msg: {
pageIndex: 1,
pageSize: 15,
AirLineID: 0,
LineId: 0, //线路编号
OutBranchId: -1, //出团公司
AirLineID: 0, //航空公司编号
CreateBy: 0, //操作人
QFlightDateStart:'',
QFlightDateEnd:'',
StartDate:'',
endDate:''
QMonth: '', //月份
},
dataList:[],
//航空公司下拉
airlineList:[],
airlineList: [],
//操作人下拉
EmployeeList: [],
beforeCheck: {
disabledDate: time => {
if (this.msg.QFlightDateEnd) {
let endTime = new Date(this.msg.QFlightDateEnd);
return time&&endTime.getTime() < time.getTime();
}else
{
return time && endTime.getTime() < time.getTime();
} else {
return false;
}
}
......@@ -122,10 +86,8 @@
if (this.msg.QFlightDateStart) {
let startTime = new Date(this.msg.QFlightDateStart);
//可以选择当天
return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000;
}
else
{
return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000;
} else {
return false;
}
}
......@@ -139,21 +101,14 @@
},
methods: {
getList() { //获取列表数据
this.apipost("admin_get_RoleGetPageList", this.msg, res => {
this.apipost("AirTicket_get_GetTicketPerformance", this.msg, res => {
console.log(res.data);
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {}
}, err => {})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1
this.dataList = res.data.data;
}
});
},
//初始化航空公司下拉
initAirlines() {
this.apipost(
......@@ -180,4 +135,5 @@
},
}
}
</script>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 0d60e2bc
......@@ -626,12 +626,12 @@
<span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span>
</p>
<p>
<span>{{$t('leader.leader_Leader')}}/导游</span>
<span>{{$t('leader.leader_Leader')}}</span>
<span v-if="item.LeaderName" class="TCL-greenType">{{item.LeaderName}}</span>
<span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
</p>
<p>
<span></span>
<span>导游</span>
<span v-if="item.GuideName" class="TCL-greenType" >{{item.GuideName}}</span>
<span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
</p>
......
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