Commit b7ec035c authored by Mac's avatar Mac

1

parent 7bf3ad9d
...@@ -565,6 +565,8 @@ ...@@ -565,6 +565,8 @@
this.msg.eTradeDate = this.$route.query.eTradeDate ? this.$route.query.eTradeDate : ""; this.msg.eTradeDate = this.$route.query.eTradeDate ? this.$route.query.eTradeDate : "";
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate]; this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate]; this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
this.getList(); this.getList();
this.bankaccount_post_GetListS("query"); this.bankaccount_post_GetListS("query");
} }
......
...@@ -460,6 +460,8 @@ ...@@ -460,6 +460,8 @@
this.msg.eTradeDate = this.$route.query.eTradeDate; this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate]; this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate]; this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
this.getList(); this.getList();
this.BankAccount_post_GetPlatformList("query"); this.BankAccount_post_GetPlatformList("query");
} }
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="校区"> <el-form-item label="校区">
<el-select filterable v-model='msg.RB_Branch_Id'> <el-select filterable v-model='msg.RB_Branch_Id' @change="getList()">
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'> <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
</el-option> </el-option>
...@@ -229,19 +229,29 @@ ...@@ -229,19 +229,29 @@
} else if (obj.TradeWay === 3) { //资金池 } else if (obj.TradeWay === 3) { //资金池
name = 'PoolAccDetail' name = 'PoolAccDetail'
} }
this.$router.push({ this.OpenNewUrl('/financial/accDetail/'+name, {
path: name, "Is_Cashier":1,
query:{
"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":type, "DayReport":type,
"blank": 'y', 'RB_Branch_Id':this.msg.RB_Branch_Id
"tab": '现金账户明细'
} });
}) // this.$router.push({
// path: name,
// query:{
// "Is_Cashier":1,
// "TypeId": obj.TypeId,
// "BankID": obj.BankID,
// "sTradeDate": this.msg.sTradeDate,
// "eTradeDate": this.msg.eTradeDate,
// "DayReport":type,
// "blank": 'y',
// "tab": '现金账户明细'
// }
// })
}, },
getList: function () { getList: function () {
this.loading=true; this.loading=true;
...@@ -272,6 +282,7 @@ ...@@ -272,6 +282,7 @@
} }
this.msg.sTradeDate = this.transactionDate[0]; this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1]; this.msg.eTradeDate = this.transactionDate[1];
this.getList()
}, },
resetPageIndex() { // 重置页码 resetPageIndex() { // 重置页码
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
......
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