Skip to content

S
SuperMan
Commit d09c9c91 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 7d94fdb2 9b4f3aed
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 38 deletions
src/components/FinancialModule/HelpBranch/index.vue
View file @ d09c9c91
......@@ -227,21 +227,33 @@
</li>
</ul>
</div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap;color:red;" v-if="allotDataList.length>0">
<span>调拨单总额：</span>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;" v-if="financeDataList.length>0">
<div style="display: flex;flex-wrap: wrap;color:red;" >
<span>财务单据信息：</span>
<template >
<span size="mini" closable
<p size="mini" closable
style="margin-right: 5px;margin-bottom: 5px;"
v-for="(x,index) in allotDataList"
v-for="(x,index) in financeDataList"
:key="x.FrID"
:type="x.Type==2?'danger':'success'">
{{x.Money}}（{{x.CurrencyName}}），已冲抵金额：{{x.UseMoney}}，剩余金额：{{x.SurplusMoney}}
</span>
:type="danger">
（{{x.CurrencyName}}） 总收入： {{x.totalMoneyI}} 总支出：{{x.totalMoneyO}} ，关联调拨单总金额：{{x.totalMoneyA}} 已冲抵金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}
</p>
</template>
</div>
</div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;" v-if="allotDataList.length>0"><div style="display: flex;flex-wrap: wrap;color:red;" >
<span>资金调拨信息：</span>
<template >
<p size="mini" closable
style="margin-right: 5px;margin-bottom: 5px;"
v-for="(x,index) in allotDataList"
:key="x.FrID"
:type="success">
（{{x.CurrencyName}}） 总收款：{{x.totalMoneyA}} 总支出金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}
</p>
</template>
</div></div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="float:left;width:85%;display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap; ">
......@@ -293,13 +305,15 @@
width="80">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.FrID,1)">{{ scope.row.FrID }}</span>
@click="openDetails(scope.row.FrID,1)" v-if="scope.row.Type!=4">{{ scope.row.FrID }}</span>
<span style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.FrID,2)" v-else>{{ scope.row.FrID }}</span>
</template>
</el-table-column>
<el-table-column
prop="name"
label="单据类型"
width="80">
width="100">
<template slot-scope="scope">
<span v-if="scope.row.Type==2" style="display: inline-block;
padding: 2px 8px;
......@@ -316,6 +330,14 @@
line-height: 16px;
border-radius: 4px;">
收入
</span>
<span v-if="scope.row.Type==4" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
调拨资金
</span>
<span v-if="scope.row.Type==5" style="display: inline-block;
padding: 2px 8px;
......@@ -538,6 +560,7 @@ export default {
showDialog: false,
multipleSelection: [],
allotDataList:[],
financeDataList:[],
SelectAduitingList:[
{Name:'不限',Id:'0'},
{Name:'已结算',Id:'1'},
......@@ -687,6 +710,7 @@ export default {
this.financeinfo_post_GetClientTypeList();
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList();
this.getAllotBrandList();
this.AccountType_post_GetList();
var that = this;
......@@ -759,11 +783,16 @@ export default {
}
},
selectable(row, index){
if (!this.DataList[index].ReFinanceIds) {
return true;
} else {
if(this.DataList[index].Type==4){
return false;
}
else{
if (!this.DataList[index].ReFinanceIds) {
return true;
} else {
return false;
}
}
},
handleSelectionChange(val) {
this.multipleSelection = val;
......@@ -810,29 +839,6 @@ export default {
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true;
this.allotDataList=[];
if(this.msg.NewFinanceId&&this.msg.NewFinanceId>0){
this.apipost(
"Financial_post_SelectAllotFinan",
{FrID:this.msg.NewFinanceId},
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
let obj= {
FrID:data.FrID,
Money:data.Money,
CurrencyName:data.CurrencyName,
SurplusMoney:data.SurplusMoney,
NowMoney:0,
UseMoney:data.UseMoney
}
this.allotDataList.push(obj);
}
},
err => {}
);
}
this.apipost('Financial_post_GetHelpBranchALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
......@@ -867,6 +873,46 @@ export default {
this.currentPage = parseInt(this.msg.pageIndex);
},err=>{})
},
getAllotBrandList(){ // 获取列表数据
if(!this.msg.ClientID)this.msg.ClientID="";
if(!this.msg.ClientType)this.msg.ClientType=0;
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(this.msg.TemplateIds=='0')this.msg.TemplateIds='';
if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
if(this.msg.HelpBranchId === '')this.msg.HelpBranchId=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.NewFinanceId)this.msg.NewFinanceId=0;
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true;
this.allotDataList=[];
this.financeDataList=[];
// if(this.msg.HelpBranchId>=0&&this.msg.RB_Branch_Id>=0){
this.apipost(
"Financial_post_GetAllotBrandList",
this.msg,
res => {
if (res.data.resultCode == 1) {
let data = res.data;
this.allotDataList=data.data.resultAllot;
this.financeDataList=data.data.result;
}
},
err => {}
);
//}
},
method5: function() {
if(!this.msg.ClientID)this.msg.ClientID="";
if(!this.msg.ClientType)this.msg.ClientType=0;
......@@ -1154,7 +1200,8 @@ export default {
this.msg.pageIndex=1;
this.currentPage = 1;
this.getPageList()
this.getPageList()
this.getAllotBrandList()
},
getMoney(){
let Money = 0
......
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