Commit 17dca041 authored by youjie's avatar youjie

no message

parent 9ad09c8e
...@@ -154,7 +154,12 @@ ...@@ -154,7 +154,12 @@
padding: 5px 10px; padding: 5px 10px;
} }
.GroupRateQuery-scope-box{ .GroupRateQuery-scope-box{
line-height: 30px; height: 60px;
display: flex;
flex-wrap: wrap;
align-items: center;
/* line-height: 30px; */
overflow: auto;
} }
/* /deep/.el-table td{ /* /deep/.el-table td{
padding: 0; padding: 0;
...@@ -164,7 +169,8 @@ ...@@ -164,7 +169,8 @@
} */ } */
/deep/.el-table td:nth-child(6) .cell, /deep/.el-table td:nth-child(6) .cell,
/deep/.el-table td:nth-child(7) .cell, /deep/.el-table td:nth-child(7) .cell,
/deep/.el-table td:nth-child(8) .cell{ /deep/.el-table td:nth-child(8) .cell,
/deep/.el-table td:nth-child(9) .cell{
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
text-indent: 15px; text-indent: 15px;
...@@ -235,18 +241,18 @@ ...@@ -235,18 +241,18 @@
<el-form class="_info_box clearfix" label-width="110px"> <el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;"> <el-row style="padding:15px 20px 0 0;">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="团单号:"> <el-form-item label="团ID:">
<el-input placeholder="" class="" v-model="msg.TCNUM"></el-input> <el-input placeholder="" class="" v-model="msg.TCID"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="团编号:"> <el-form-item label="团编号:">
<el-input v-model="msg.TCID" class=""></el-input> <el-input v-model="msg.TCNUM" class=""></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="所属公司:"> <el-form-item label="出团公司:">
<el-select filterable v-model='msg.RB_Branch_Id' class=""> <el-select filterable v-model='msg.RB_Branch_Id' class="">
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
...@@ -299,12 +305,16 @@ ...@@ -299,12 +305,16 @@
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="TCID"
label="团ID"
width="170"/>
<el-table-column
prop="TCNUM" prop="TCNUM"
label="团号" label="团号"
width="170"/> width="170"/>
<el-table-column <el-table-column
prop="OutBranchName" prop="OutBranchName"
label="团号公司" label="出团公司"
width="150"/> width="150"/>
<el-table-column <el-table-column
prop="StartDate" prop="StartDate"
...@@ -312,7 +322,7 @@ ...@@ -312,7 +322,7 @@
width="150"/> width="150"/>
<el-table-column <el-table-column
prop="CreateDate" prop="CreateDate"
label="制单日期" label="最早制单日期"
width="150"/> width="150"/>
<el-table-column <el-table-column
label="汇率类型" label="汇率类型"
...@@ -349,8 +359,7 @@ ...@@ -349,8 +359,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="汇率" label="汇率">
width="800">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.TCRate&&scope.row.TCRate.length>0"> <template v-if="scope.row.TCRate&&scope.row.TCRate.length>0">
<div class="GroupRateQuery-scope-box" <div class="GroupRateQuery-scope-box"
...@@ -369,7 +378,9 @@ ...@@ -369,7 +378,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <el-pagination background @current-change="handleCurrentChange"
:page-sizes="[5,20,30,50,100]"
:current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<!-- <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <!-- <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
...@@ -597,8 +608,8 @@ export default { ...@@ -597,8 +608,8 @@ export default {
getPageList(){ // 获取列表数据 getPageList(){ // 获取列表数据
// this.financeinfo_post_GetList() // this.financeinfo_post_GetList()
if(this.transactionDate){ if(this.transactionDate){
this.msg.QStartDate = this.transactionDate[0]? '2019-01-01':'' this.msg.QStartDate = this.transactionDate[0]
this.msg.QEndDate = this.transactionDate[1]? '2019-02-01':'' this.msg.QEndDate = this.transactionDate[1]
} }
this.loading= true; this.loading= true;
this.apipost('Financial_post_GetTravelFinanceRateSetPageList',this.msg,res=>{ this.apipost('Financial_post_GetTravelFinanceRateSetPageList',this.msg,res=>{
......
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