Commit 8cc1a0e8 authored by zhengke's avatar zhengke

修改

parent 768fbdec
This diff is collapsed.
<style scoped> <style scoped>
@import "../css/cssReset.css"; @import "../css/cssReset.css";
.page_fnDm{background-color: white} .page_fnDm {
.query-box{overflow: inherit} background-color: white
.query-box{border: none} }
.query-box ul {overflow: initial;}
.query-box li:last-child{float: left} .query-box {
.query-box>ul>li:last-child{float: right;} overflow: inherit
.query-box .hight_query ul .el-input{width: inherit } }
.page_CashReport .query-box li:last-child{
.query-box {
border: none
}
.query-box ul {
overflow: initial;
}
.query-box li:last-child {
float: left
}
.query-box>ul>li:last-child {
float: right;
}
.query-box .hight_query ul .el-input {
width: inherit
}
.page_CashReport .query-box li:last-child {
top: 35px; top: 35px;
} }
.page_CashReport ._fnDm_content{
.page_CashReport ._fnDm_content {
width: 100%; width: 100%;
} }
.page_CashReport .singeRowTable tr th{
.page_CashReport .singeRowTable tr th {
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
</style> </style>
<template > <template>
<div class="page_fnDm page_CashReport" @keyup.enter="getList()"> <div class="page_fnDm page_CashReport" @keyup.enter="getList()">
<div class="query-box"> <div class="query-box">
<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-form-item label="交易方式:">
<el-select filterable v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''" >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in BranchAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="银行账户:">
<el-select filterable v-model='msg.BankID'>
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in accountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="交易日期:"> <el-form-item label="交易日期:">
<el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange" value-format="yyyy-MM-dd"> <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -57,8 +58,8 @@ ...@@ -57,8 +58,8 @@
</el-form> </el-form>
<ul class="clearfix" style="position: absolute;right: 20px;top: 20px;"> <ul class="clearfix" style="position: absolute;right: 20px;top: 20px;">
<div> <div>
<span> <span>
</span> </span>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button> <button class="normalBtn" @click="method5()">导出</button>
</div> </div>
...@@ -68,7 +69,6 @@ ...@@ -68,7 +69,6 @@
<table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);"> <table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
<tr> <tr>
<th colspan="16">{{branchName}}资金日报表</th> <th colspan="16">{{branchName}}资金日报表</th>
</tr> </tr>
<tr> <tr>
<th>校区</th> <th>校区</th>
...@@ -106,8 +106,10 @@ ...@@ -106,8 +106,10 @@
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoOutCome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoOutCome}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
<td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptWBMoney}}</td> <td>{{subItem.ReceiptWBMoney}}</td>
<td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td> <td>{{subItem.ReceiptMoney}}</td>
<!-- <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptWBMoney}}</td>
<td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td> -->
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoIncom}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoIncom}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
<!-- <a style="cursor:pointer;" @click="goUrl('CashAccDetail',subItem.BankID,subItem.TradeWay)"> --> <!-- <a style="cursor:pointer;" @click="goUrl('CashAccDetail',subItem.BankID,subItem.TradeWay)"> -->
...@@ -167,47 +169,49 @@ ...@@ -167,47 +169,49 @@
<script> <script>
// 自定义列组件 // 自定义列组件
export default { export default {
data(){ data() {
return{ return {
showID:false, showID: false,
active:1, active: 1,
userId:0, userId: 0,
msg:{ msg: {
BankID:-1, BankID: -1,
TradeWay:-1, TradeWay: -1,
sTradeDate:new Date().Format('yyyy-MM-dd'), sTradeDate: new Date().Format('yyyy-MM-dd'),
eTradeDate:new Date().Format('yyyy-MM-dd'), eTradeDate: new Date().Format('yyyy-MM-dd'),
EmployeeId:0, EmployeeId: 0,
//1-银行,2-现金 //1-银行,2-现金
IsBank: 2, IsBank: 2,
}, },
accountList:[], accountList: [],
BranchAccountList:[], BranchAccountList: [],
transactionDate:[new Date().Format('yyyy-MM-dd'),new Date().Format('yyyy-MM-dd')], transactionDate: [new Date().Format('yyyy-MM-dd'), new Date().Format('yyyy-MM-dd')],
AccList:[], AccList: [],
loading:false, loading: false,
currentPage:1, currentPage: 1,
total:0, total: 0,
dataList:[], dataList: [],
dataObj: {}, dataObj: {},
branchName: '' branchName: ''
} }
},created(){ },
created() {
},components: { },
},mounted(){ components: {},
let userInfo=this.getLocalStorage(); mounted() {
let userInfo = this.getLocalStorage();
this.getList(); this.getList();
this.branchName = userInfo.GroupName this.branchName = userInfo.GroupName
this.msg.EmployeeId= userInfo.EmployeeId; this.msg.EmployeeId = userInfo.EmployeeId;
}, },
methods:{ methods: {
goUrlNew(obj){ goUrlNew(obj) {
this.$router.push({ this.$router.push({
name: "DocumentStatistics", path: "DocumentStatistics",
query:{ query: {
"AccountId": obj.BankID, "AccountId": obj.BankID,
"StartTime": this.msg.sTradeDate, "StartTime": this.msg.sTradeDate,
"EndTime": this.msg.eTradeDate, "EndTime": this.msg.eTradeDate,
...@@ -218,42 +222,42 @@ ...@@ -218,42 +222,42 @@
}, },
goUrl(obj) { goUrl(obj) {
this.$router.push({ this.$router.push({
name: "CashAccDetail", path: "CashAccDetail",
query:{ query: {
"Is_Cashier":1, "Is_Cashier": 1,
"TypeId": obj.TypeId, "TypeId": obj.TypeId,
"BankID": obj.BankID, "BankID": obj.BankID,
"sTradeDate": this.msg.sTradeDate, "sTradeDate": this.msg.sTradeDate,
"eTradeDate": this.msg.eTradeDate, "eTradeDate": this.msg.eTradeDate,
"DayReport":1, "DayReport": 1,
"blank": 'y', "blank": 'y',
"tab": '现金账户明细' "tab": '现金账户明细'
} }
}) })
}, },
getList: function () { getList: function () {
this.loading=true; this.loading = true;
this.dataObj={}; this.dataObj = {};
this.apipost('Financial_post_GetReportList',this.msg,res=>{ this.apipost('Financial_post_GetReportList', this.msg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.dataObj = res.data.data; this.dataObj = res.data.data;
}else{ } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
this.loading = false; this.loading = false;
},err=>{}) }, err => {})
}, },
AccountType_post_GetList(){ //获取账户类型下拉 AccountType_post_GetList() { //获取账户类型下拉
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{ this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.AccList = res.data.data; this.AccList = res.data.data;
}else{ } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
},err=>{}) }, err => {})
}, },
timeAdd(t){ // 日期格式 timeAdd(t) { // 日期格式
if(!this.transactionDate){ if (!this.transactionDate) {
this.msg.sTradeDate = ''; this.msg.sTradeDate = '';
this.msg.eTradeDate = ''; this.msg.eTradeDate = '';
return return
...@@ -261,15 +265,15 @@ ...@@ -261,15 +265,15 @@
this.msg.sTradeDate = this.transactionDate[0]; this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1]; this.msg.eTradeDate = this.transactionDate[1];
}, },
queryInfoInit(){ // 初始化msg queryInfoInit() { // 初始化msg
}, },
resetPageIndex(){ // 重置页码 resetPageIndex() { // 重置页码
this.msg.pageIndex=1; this.msg.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
}, },
method5: function() { method5: function () {
this.GetLocalFile("Financial_post_CashOutToGetReportList", this.msg,"现金日报表.xls"); this.GetLocalFile("Financial_post_CashOutToGetReportList", this.msg, "现金日报表.xls");
}, },
// goUrl(path,id,type,typeid){ // goUrl(path,id,type,typeid){
// this.$router.push({ // this.$router.push({
...@@ -279,4 +283,5 @@ ...@@ -279,4 +283,5 @@
// }, // },
} }
} }
</script> </script>
...@@ -90,8 +90,10 @@ ...@@ -90,8 +90,10 @@
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoMoney}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoMoney}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
<td @click="goUrlNew('Manfunds',subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td> <td>{{subItem.ReceiptMoney}}</td>
<td @click="goUrlNew('OutstandingAccounts',subItem)" style="cursor: pointer">{{subItem.NONPaymentMoney}}</td> <td>{{subItem.NONPaymentMoney}}</td>
<!-- <td @click="goUrlNew('Manfunds',subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
<td @click="goUrlNew('OutstandingAccounts',subItem)" style="cursor: pointer">{{subItem.NONPaymentMoney}}</td> -->
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.IncomeCount}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.IncomeCount}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutComeCount}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutComeCount}}</td>
...@@ -186,7 +188,7 @@ ...@@ -186,7 +188,7 @@
goUrlNew(path,obj){ goUrlNew(path,obj){
let name = path; let name = path;
this.$router.push({ this.$router.push({
name: name, path: name,
query:{ query:{
"BankType": obj.TradeWay, "BankType": obj.TradeWay,
"BankID": obj.BankID, "BankID": obj.BankID,
...@@ -210,7 +212,7 @@ ...@@ -210,7 +212,7 @@
name = 'PoolAccDetail' name = 'PoolAccDetail'
} }
this.$router.push({ this.$router.push({
name: name, path: name,
query:{ query:{
"Is_Cashier":1, "Is_Cashier":1,
"TypeId": obj.TypeId, "TypeId": obj.TypeId,
......
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