Skip to content

S
SuperMan
Commit 07147bc8 authored by 王悦's avatar 王悦
Browse files
Options

账户明细合并都可以选择银行，国内票务调整

parent 724cf79b
Show whitespace changes
Inline Side-by-side
Showing with 228 additions and 208 deletions
src/components/DomesticModule/OrderDetails.vue
View file @ 07147bc8
......@@ -58,7 +58,7 @@
</div>
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th>订单号</th>
<th>编号</th>
<th>人数</th>
<th>应收金额</th>
<th>成本</th>
......@@ -72,7 +72,7 @@
<!-- <th>操作</th> -->
</tr>
<tr v-for="(item,index) in DataList.list" :key="index">
<td>{{item.OrderID}}</td>
<td>{{item.ID}}</td>
<td class="_hover">
<el-popover
placement="bottom"
......
src/components/DomesticModule/OrderToday.vue
View file @ 07147bc8
......@@ -5,7 +5,7 @@
<div class='flexOne page_OrderToday'>
<div class='query-box'>
<ul>
<li>
<!-- <li>
<span>
<em>期数</em>
<el-date-picker
......@@ -16,6 +16,18 @@
placeholder="选择日期">
</el-date-picker>
</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>
<span>
......@@ -68,21 +80,21 @@
</div>
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<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>
</tr>
<tr v-for="(item,index) in DataList.list">
<td>{{item.Term}}</td>
<td>{{item.ID}}</td>
<td class="_hover">
<el-popover
placement="bottom"
......@@ -222,7 +234,7 @@
</el-row>
<el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">
<el-row>
<el-col :span="6" :gutter="35" >
<!-- <el-col :span="6" :gutter="35" >
<el-form-item label="期数" prop="TermDate">
<el-date-picker
v-model="addMsg.TermDate"
......@@ -233,7 +245,7 @@
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="6" :gutter="35" >
<el-form-item label="出票日期" prop="OutTicketDate">
<el-date-picker
......@@ -386,10 +398,12 @@ export default {
FlightNo:'',
ClientName:'',
ParentId:0,
Term:new Date().Format("yyyy-MM-dd"),
Term:'',
sDate:'',
eDate:''
},
addMsg:{
TermDate:new Date().Format("yyyy-MM-dd"),
TermDate:'',
ID:0,
OutTicketDate:new Date().Format("yyyy-MM-dd"),
TravelTime:'',
......@@ -449,6 +463,7 @@ export default {
airlineList:[],
AirportNameList:[],
},
transactionDate:[],
airlineList:[],
AirportNameList:[],
DataList:[],
......@@ -470,7 +485,7 @@ export default {
dialogFormVisible:false,
formLabelWidth: '120px',
goPath:'',
TermDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'),
TermDate:'',
rules: {//表单必填验证
ClientName: [
{ required: true, message: '请填写客户名称', trigger: 'blur' }
......@@ -489,14 +504,9 @@ export default {
],
OutTicketDate: [
{ required: true, message: '请输选出票日期', trigger: 'change' }
],
TermDate: [
{ required: true, message: '请输选择期数', trigger: 'change' }
]
}
}
},created(){
},mounted(){
this.getList();
this.getAirlineList();
......@@ -515,6 +525,15 @@ export default {
if(pi) return
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){
return function(a,b){
......@@ -542,7 +561,10 @@ export default {
}
},
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){
this.$router.push({name:this.goPath,query:{'Term':this.TermDate,'blank':'y'}});
this.getList();
......@@ -663,7 +685,7 @@ export default {
},
initAddMsg(){ // 取消修改、新增
this.addMsg ={
TermDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'),
TermDate:'',
ID:this.addMsg.ID,
OutTicketDate:new Date().toLocaleDateString().replace('/','-').replace('/','-'),
TravelTime:'',
......@@ -704,7 +726,7 @@ export default {
}
],
Num:0,
Term:new Date().Format("yyyy-MM-dd"),
Term:'',
FlightList:[
{
ID:0,
......@@ -731,9 +753,6 @@ export default {
if(this.msg.AirlineId==''){
this.msg.AirlineId=0;
}
if(this.msg.Term){
this.msg.Term = this.msg.Term.replace(/-/g,'');
}
this.loading = true
this.apipost('Domestic_Ticket_post_GetPageList',this.msg,res=>{
if(res.data.resultCode==1){
......@@ -745,6 +764,7 @@ export default {
this.noData =true;
}
this.DataList = data;
console.log(this.DataList,'dataList');
this.loading = false;
if(!t){
this.msg.OrderID='';
......@@ -776,7 +796,7 @@ export default {
},
initAddMsg(){//初始化添加、修改数据
let newMsg = {
TermDate:new Date().Format("yyyy-MM-dd"),
TermDate:'',
OrderID:0,
OutTicketDate:new Date().Format("yyyy-MM-dd"),
TravelTime:'',
......@@ -816,7 +836,7 @@ export default {
profit:''
}
],
Term:new Date().Format("yyyy-MM-dd"),
Term:'',
FlightList:[
{
ID:0,
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 07147bc8
......@@ -201,31 +201,31 @@
<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>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<!--template v-if="BillType===2">
<template>
<tr >
<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" width="70">币种</th>
<th height="34px" width="50px">汇率</th>
&lt;!&ndash; <th>手续费</th> &ndash;&gt;
<!-- <th>手续费</th> -->
<th height="34px" width="100px">总金额</th>
&lt;!&ndash; <th>操作</th> &ndash;&gt;
<!-- <th>操作</th> -->
</tr>
<template v-for="(item,index) in payMsgList">
<tr v-if="!item.show" @click="payMsgList[index].show=true">
<td height="34px">{{item.AccName}}</td>
<td height="34px">{{item.Name}}</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">{{item.CurrenName}}</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>
&lt;!&ndash; <td></td> &ndash;&gt;
<!-- <td></td> -->
</tr>
<tr v-else class="_show_class">
<td>
......@@ -306,7 +306,7 @@
</td>
<td>{{moneyFormat(payMsg.allMoney)}}</td>
</tr>
</template>-->
</template>
<tr>
<td height="34px">总金额</td>
<td height="34px" colspan="7">
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 07147bc8
......@@ -158,7 +158,7 @@
<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>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template v-if="BillType===2">
<template>
<tr >
<th height="34px">账户分类</th>
<th height="34px">付款方式</th>
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 07147bc8
......@@ -156,7 +156,7 @@
<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>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;">
<template v-if="BillType == 1">
<template>
<tr >
<th height="34px">账户分类</th>
<th height="34px">付款方式</th>
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 07147bc8
......@@ -180,112 +180,112 @@
<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>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<!--<template v-if="BillType===1">-->
<!--<tr >-->
<!--<th height="34px">账户分类</th>-->
<!--<th height="34px">付款方式</th>-->
<!--<th height="34px">账户</th>-->
<!--&lt;!&ndash; <th width="100px">账户余额</th> &ndash;&gt;-->
<!--<th height="34px">金额</th>-->
<!--<th height="34px" width="70">币种</th>-->
<!--<th height="34px" width="50px">汇率</th>-->
<!--&lt;!&ndash; <th>手续费</th> &ndash;&gt;-->
<!--<th height="34px" width="100px">总金额</th>-->
<!--&lt;!&ndash; <th>操作</th> &ndash;&gt;-->
<!--</tr>-->
<!--<template v-for="(item,index) in payMsgList">-->
<!--<tr v-if="!item.show" @click="payMsgList[index].show=true">-->
<!--<td height="34px">{{item.AccName}}</td>-->
<!--<td height="34px">{{item.Name}}</td>-->
<!--<td height="34px">{{item.Account}}</td>-->
<!--&lt;!&ndash; <td>{{item.balance}}</td> &ndash;&gt;-->
<!--<td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>-->
<!--<td height="34px">{{item.CurrenName}}</td>-->
<!--<td height="34px">{{item.Rate}}</td>-->
<!--&lt;!&ndash; <td>{{item.Fee}}</td> &ndash;&gt;-->
<!--<td height="34px">{{moneyFormat(item.allMoney)}}</td>-->
<!--&lt;!&ndash; <td></td> &ndash;&gt;-->
<!--</tr>-->
<!--<tr v-else class="_show_class">-->
<!--<td>-->
<!--<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">-->
<!--<el-option v-for='i in AccListT'-->
<!--:label='i.Name'-->
<!--:value='i.Name'-->
<!--:key='i.ID'>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</td>-->
<!--<td>-->
<!--<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">-->
<!--<el-option v-for='i in GetAccountType'-->
<!--:label='i.Name'-->
<!--:value='i.ID'-->
<!--:key='i.ID'>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</td>-->
<!--<td>-->
<!--<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'-->
<!--:label='i.allName'-->
<!--:value='i.ID'-->
<!--:key='i.ID'>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</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>-->
<!--</td>-->
<!--<td>-->
<!--<p>{{item.CurrenName}}</p>-->
<!--</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>-->
<!--</td>-->
<!--<td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney" class="_delete_row iconfont icon-img_delete_small"></i></td>-->
<!--</tr>-->
<!--</template>-->
<!--<tr>-->
<!--<td>-->
<!--<el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1">-->
<!--<el-option v-for='i in AccListT'-->
<!--:label='i.Name'-->
<!--:value='i.Name'-->
<!--:key='i.ID'>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</td>-->
<!--<td>-->
<!--<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type)" class=" _border_b_1">-->
<!--<el-option v-for='i in GetAccountType'-->
<!--:label='i.Name'-->
<!--:value='i.ID'-->
<!--:key='i.ID'>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</td>-->
<!--<td>-->
<!--<el-select filterable v-model='payMsg.AccountId' placeholder="请选择账户" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">-->
<!--<el-option v-for='i in accountList'-->
<!--:label='i.allName'-->
<!--:value='i.ID'-->
<!--:key='i.ID'>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</td>-->
<!--<td>-->
<!--<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>-->
<!--</td>-->
<!--<td>-->
<!--<p>{{payMsg.CurrenName}}</p>-->
<!--</td>-->
<!--<td>-->
<!--<el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number" class=" _border_b_1"></el-input>-->
<!--</td>-->
<!--<td>{{moneyFormat(payMsg.allMoney)}}</td>-->
<!--</tr>-->
<!--</template>-->
<template>
<tr >
<th height="34px">账户分类</th>
<th height="34px">付款方式</th>
<th height="34px">账户</th>
<!-- <th width="100px">账户余额</th> -->
<th height="34px">金额</th>
<th height="34px" width="70">币种</th>
<th height="34px" width="50px">汇率</th>
<!-- <th>手续费</th> -->
<th height="34px" width="100px">总金额</th>
<!-- <th>操作</th> -->
</tr>
<template v-for="(item,index) in payMsgList">
<tr v-if="!item.show" @click="payMsgList[index].show=true">
<td height="34px">{{item.AccName}}</td>
<td height="34px">{{item.Name}}</td>
<td height="34px">{{item.Account}}</td>
<!-- <td>{{item.balance}}</td> -->
<td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>
<td height="34px">{{item.CurrenName}}</td>
<td height="34px">{{item.Rate}}</td>
<!-- <td>{{item.Fee}}</td> -->
<td height="34px">{{moneyFormat(item.allMoney)}}</td>
<!-- <td></td> -->
</tr>
<tr v-else class="_show_class">
<td>
<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<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'
:label='i.allName'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</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>
</td>
<td>
<p>{{item.CurrenName}}</p>
</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>
</td>
<td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney" class="_delete_row iconfont icon-img_delete_small"></i></td>
</tr>
</template>
<tr>
<td>
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type)" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' placeholder="请选择账户" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
</td>
<td>
<el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{moneyFormat(payMsg.allMoney)}}</td>
</tr>
</template>
<tr>
<td height="34px">总金额</td>
<td height="34px" colspan="7">
......
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