Commit e83196bf authored by zhengke's avatar zhengke

修改

parent 2b66608c
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.suoshugs')"> <el-form-item label="校区">
<el-select filterable v-model='msg.RB_Branch_Id' > <el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option> <el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
...@@ -124,18 +124,18 @@ ...@@ -124,18 +124,18 @@
<span class="_max_wd">{{item.CurrencyName}}</span> <span class="_max_wd">{{item.CurrencyName}}</span>
</el-tooltip> </el-tooltip>
(<span class="_bold" :class="item.IsStandardCurrency==1?'fc_green':'fc_red'">{{item.IsStandardCurrency==1? $t('fnc.bweibi') : $t('fnc.waibi')}}</span>) <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span> </span></p> (<span class="_bold" :class="item.IsStandardCurrency==1?'fc_green':'fc_red'">{{item.IsStandardCurrency==1? $t('fnc.bweibi') : $t('fnc.waibi')}}</span>) <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span> </span></p>
<p><span class="_name">{{$t('fnc.ssuogongsi')}}</span> <p><span class="_name">校区</span>
<el-tooltip class="item" effect="dark" :content="item.allName==''? $t('active.cl_zanwu'):item.allName" placement="top-end"> <el-tooltip class="item" effect="dark" :content="item.allName==''? $t('active.cl_zanwu'):item.allName" placement="top-end">
<span v-if="!item.BranchName.length" class="_cp_name"><span class="_bold" >{{$t('active.cl_zanwu')}} </span></span> <span v-if="!item.BranchName.length" class="_cp_name"><span class="_bold" >{{$t('active.cl_zanwu')}} </span></span>
<span v-else class="_cp_name"><span class="_bold" v-for="(b,bi) in item.BranchName">{{b}} </span></span> <span v-else class="_cp_name"><span class="_bold" v-for="(b,bi) in item.BranchName">{{b}} </span></span>
</el-tooltip> </el-tooltip>
</p> </p>
<p v-if="item.IsStandardCurrency!=1"> <!-- <p v-if="item.IsStandardCurrency!=1">
<span class="_name">{{$t('fnc.ssuogongsi')}}</span> <span class="_name">{{$t('fnc.ssuogongsi')}}</span>
<span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0" :class="item.ProfitLossMoney>0?'fc_green':'fc_red'">{{item.ProfitLossMoney}}</span> <span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0" :class="item.ProfitLossMoney>0?'fc_green':'fc_red'">{{item.ProfitLossMoney}}</span>
<span class="fr" v-else>-</span> <span class="fr" v-else>-</span>
</p> </p>
<p v-else>&nbsp;</p> <p v-else>&nbsp;</p> -->
</div> </div>
<p class="_btn"> <p class="_btn">
<el-button-group> <el-button-group>
...@@ -333,6 +333,7 @@ ...@@ -333,6 +333,7 @@
AccountStartWBMoney:'', AccountStartWBMoney:'',
AccountStartMoney:'', AccountStartMoney:'',
BeginTimeStr:'', BeginTimeStr:'',
BranchIdSName:'',
}, },
getCompanyMsg:{ getCompanyMsg:{
RB_Group_Id:'0', RB_Group_Id:'0',
...@@ -546,8 +547,8 @@ ...@@ -546,8 +547,8 @@
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data let data = res.data.data
data.BranchIdS = data.BranchList[0].RB_Branch_Id; data.BranchIdS = data.BranchList[0].RB_Branch_Id;
this.remoteMethod(data.InemName) // this.remoteMethod(data.InemName)
this.remoteMethod2(data.OutemName) // this.remoteMethod2(data.OutemName)
this.addMsg = data; this.addMsg = data;
// this.disabledOption(); // this.disabledOption();
} else { } else {
...@@ -631,10 +632,15 @@ ...@@ -631,10 +632,15 @@
if(!this.addMsg.RiskLimitMoney) { if(!this.addMsg.RiskLimitMoney) {
this.addMsg.RiskLimitMoney = 0; this.addMsg.RiskLimitMoney = 0;
} }
let obj = {};
obj = this.CompanyList.find(item => {
return item.SId === this.addMsg.BranchIdS; //筛选出匹配数据
});
let msg = { let msg = {
ID:0, ID:0,
Type:2, Type:2,
RB_Branch_Id:this.addMsg.BranchIdS RB_Branch_Id:this.addMsg.BranchIdS,
RB_BranchName:obj.SName
} }
this.addMsg.BranchList.push(msg); this.addMsg.BranchList.push(msg);
this.apipost('BankAccount_post_SetCashAccount',this.addMsg,res=>{ this.apipost('BankAccount_post_SetCashAccount',this.addMsg,res=>{
...@@ -746,7 +752,7 @@ ...@@ -746,7 +752,7 @@
this.getList() this.getList()
this.getAccountTypeList() this.getAccountTypeList()
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id=userInfo.Group_Id; //集团ID
this.getCompanyList() this.getCompanyList()
this.getFinancialList() this.getFinancialList()
this.getfinanceinfoList() this.getfinanceinfoList()
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<span class="_max_wd">{{item.CurrencyName}}</span> <span class="_max_wd">{{item.CurrencyName}}</span>
</el-tooltip> </el-tooltip>
(<span class="_bold" :class="item.IsStandardCurrency==1?'fc_green':'fc_red'">{{item.IsStandardCurrency==1?'本位币':'外币'}}</span>) <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span> </span></p> (<span class="_bold" :class="item.IsStandardCurrency==1?'fc_green':'fc_red'">{{item.IsStandardCurrency==1?'本位币':'外币'}}</span>) <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span> </span></p>
<p><span class="_name">{{$t('fnc.ssuogongsi')}}</span> <p><span class="_name">校区</span>
<el-tooltip class="item" effect="dark" :content="item.allName" placement="top-end"> <el-tooltip class="item" effect="dark" :content="item.allName" placement="top-end">
<span class="_cp_name"><span class="_bold" v-for="(b,bi) in item.BranchName">{{b.BranchName}} </span></span> <span class="_cp_name"><span class="_bold" v-for="(b,bi) in item.BranchName">{{b.BranchName}} </span></span>
</el-tooltip> </el-tooltip>
...@@ -619,8 +619,6 @@ export default { ...@@ -619,8 +619,6 @@ export default {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.BranchIdS = data.BranchList[0].RB_Branch_Id; data.BranchIdS = data.BranchList[0].RB_Branch_Id;
this.remoteMethod(data.InemName)
this.remoteMethod2(data.OutemName)
this.addMsg = data; this.addMsg = data;
// this.disabledOption(); // this.disabledOption();
} else { } else {
...@@ -708,10 +706,15 @@ export default { ...@@ -708,10 +706,15 @@ export default {
if(!this.addMsg.RiskLimitMoney) { if(!this.addMsg.RiskLimitMoney) {
this.addMsg.RiskLimitMoney = 0; this.addMsg.RiskLimitMoney = 0;
} }
let obj = {};
obj = this.CompanyList.find(item => {
return item.SId === this.addMsg.BranchIdS; //筛选出匹配数据
});
let msg = { let msg = {
ID:0, ID:0,
Type:2, Type:2,
RB_Branch_Id:this.addMsg.BranchIdS RB_Branch_Id:this.addMsg.BranchIdS,
RB_BranchName:obj.SName
} }
this.addMsg.BranchList.push(msg); this.addMsg.BranchList.push(msg);
this.apipost('bankaccount_post_Set',this.addMsg,res=>{ this.apipost('bankaccount_post_Set',this.addMsg,res=>{
......
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