Skip to content

S
SuperMan
Commit 85968fdd authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

111

parent e1db0733
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 28 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 85968fdd
......@@ -126,6 +126,7 @@
}
// 财务收据
else if(this.$route.query.czmsg){
console.log("ffff")
let Handmsg=this.$route.query.czmsg;
this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
......
src/components/FinancialModule/DocumentStatistics.vue
View file @ 85968fdd
......@@ -78,7 +78,7 @@
<th>账户名称</th>
<th>收据金额</th>
<th>汇率</th>
<th>原币</th>
<th>本位币</th>
<th>收据日期</th>
<th>财务单据</th>
<th>单据状态</th>
......@@ -98,9 +98,9 @@
<span v-if="item.Type==4">资金池</span>
</td>
<td>{{item.AccountName}}</td>
<td>{{item.Money}}</td>
<td>{{item.Rate}}</td>
<td>{{item.WBMoney}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
<td>{{item.Time}}</td>
<td>{{item.FinanceId}}</td>
......
src/components/FinancialModule/TransferReport.vue
View file @ 85968fdd
......@@ -56,7 +56,7 @@
<div class="_fnDm_content" v-loading='loading'>
<table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
<tr>
<th colspan="8">{{branchName}}{{$t('fnc.a_xjrbaobiao')}}</th>
<th colspan="10">{{branchName}}{{$t('fnc.a_xjrbaobiao')}}</th>
</tr>
<tr>
<th>{{$t('system.table_company')}}</th>
......@@ -86,7 +86,7 @@
<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.OutCome}}</td>
<td style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
<td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</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.OutComeCount}}</td>
......@@ -96,7 +96,7 @@
<td>{{item.TotalList.AgoMoney}}</td>
<td>{{item.TotalList.Income}}</td>
<td>{{item.TotalList.OutCome}}</td>
<td style="cursor: pointer">{{item.TotalList.ReceiptMoney}}</td>
<td >{{item.TotalList.ReceiptMoney}}</td>
<td>{{item.TotalList.NowIncome}}</td>
<td>{{item.TotalList.IncomeCount}}</td>
<td>{{item.TotalList.OutComeCount}}</td>
......@@ -173,6 +173,19 @@
this.msg.EmployeeId= userInfo.EmployeeId;
},
methods: {
goUrlNew(obj){
let name = 'Manfunds';
this.$router.push({
name: name,
query:{
"BankType": obj.TradeWay,
"StartTime": this.msg.sTradeDate,
"EndTime": this.msg.eTradeDate,
"blank": 'y',
"tab": '未认款'
}
})
},
goUrl: function(obj) {
let name = '';
if (obj.TradeWay === 2) { // 平台
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 85968fdd
......@@ -1427,7 +1427,7 @@
<th>账户名称</th>
<th>收据金额</th>
<th>汇率</th>
<th>原币</th>
<th>本位币</th>
<th>收据日期</th>
<th>财务单据</th>
<th>单据状态</th>
......@@ -1447,9 +1447,9 @@
<span v-if="item.Type==4">资金池</span>
</td>
<td>{{item.AccountName}}</td>
<td>{{item.Money}}</td>
<td>{{item.Rate}}</td>
<td>{{item.WBMoney}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
<td>{{item.Time}}</td>
<td>{{item.FinanceId}}</td>
......
src/components/leaderPay2.vue
View file @ 85968fdd
......@@ -866,7 +866,7 @@
<th>账户名称</th>
<th>收据金额</th>
<th>汇率</th>
<th>原币</th>
<th>本位币</th>
<th>收据日期</th>
<th>财务单据</th>
<th>操作</th>
......@@ -881,9 +881,9 @@
<span v-if="item.Type==4">资金池</span>
</td>
<td>{{item.AccountName}}</td>
<td>{{item.Money}}</td>
<td>{{item.Rate}}</td>
<td>{{item.WBMoney}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
<td>{{item.Time}}</td>
<td>{{item.FinanceId}}</td>
<td>
......
src/components/systemManagement/Manfunds.vue
View file @ 85968fdd
......@@ -123,6 +123,16 @@
<el-input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" v-model="msg.ID"></el-input>
</span>
</li>
<li>
<span>
<em>类型</em>
<el-select filterable v-model='msg.BankType' @change="getBank">
<el-option :value="0" label="不限"></el-option>
<el-option :value="1" label="银行"></el-option>
<el-option :value="2" label="平台"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>银行账户</em>
......@@ -184,16 +194,7 @@
</el-select>
</span>
</li>
<li>
<span>
<em>类型</em>
<el-select filterable v-model='msg.BankType' >
<el-option :value="0" label="不限"></el-option>
<el-option :value="1" label="银行"></el-option>
<el-option :value="2" label="平台"></el-option>
</el-select>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="outerVisible=true">导入</button>
......@@ -324,12 +325,19 @@
currencyTypeList:[],
importFileUrl2: "",
downList:"",
TypeList1:[],
TypeList2:[],
}
},created(){
},
created(){
let userInfo = this.getLocalStorage();
this.importFileUrl2=this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=5&EmployeeId="+userInfo.EmployeeId;
this.downList =this.domainManager().LocalTemplateFileDownLoadUrl +"/Upload/Template/未认款导入模板.xls";
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=5&EmployeeId="+userInfo.EmployeeId;
this.downList =this.domainManager().LocalTemplateFileDownLoadUrl +"/Upload/Template/未认款导入模板.xls";
this.GetAccount();
this.GetAccount2();
this.getList();
},
filters:{
......@@ -341,10 +349,24 @@
},
},
mounted(){
this.GetAccount();
this.getList();
if(this.$route.query.BankType){
this.msg.BankType=Number(this.$route.query.BankType)
this.getBank(this.msg.BankType)
}
if(this.$route.query.StartTime){
this.productionDate[0]=this.$route.query.StartTime;
this.productionDate[1]=this.$route.query.EndTime;
}
},
methods: {
getBank(val){
if(val==1){
this.currencyTypeList=this.TypeList1;
}if(val==2){
this.currencyTypeList=this.TypeList2;
}
},
checkInt(obj){
// obj.value = obj.value.replace(/[^/d.]/g,"");
......@@ -468,12 +490,27 @@
GetAccount(){
this.apipost('bankaccount_post_GetList',{TypeId:'0'},res=>{
if(res.data.resultCode==1){
this.currencyTypeList = res.data.data;
this.TypeList1 = res.data.data;
}else{
}
},err=>{})
},
GetAccount2(){
let msg = {
BackId:0,
TypeId:12,
BranchId:-1,
Alias:'',
// RB_Branch_Id:this.RB_Branch_Id,
}
this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
this.TypeList2 = data;
}
}, err => {})
},
},
}
......
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