Skip to content

S
SuperMan
Commit 5f03fde2 authored by youjie's avatar youjie
Browse files
Options

no message

parent 04f37bfe
Hide whitespace changes
Inline Side-by-side
Showing with 321 additions and 36 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 5f03fde2
......@@ -1383,6 +1383,7 @@ import czBillModule from "./FinancialSubmodule/czBillModule.vue";
export default {
data(){
return{
StandCurrBranchId:'',
TeamShouZhi:false,
F_Disbursement_Schedule:false,
userInfo:{},
......@@ -2177,7 +2178,9 @@ export default {
BackId:0,
TypeId:0,
BranchId:-1,
Alias:''
Alias:'',
StandCurrBranchId: '',
StandCurrBranchId: this.StandCurrBranchId
}
this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) {
......@@ -2193,7 +2196,8 @@ export default {
let msg = {
TypeId:0,
BranchId:-1,
Alias:''
Alias:'',
StandCurrBranchId: this.StandCurrBranchId
}
this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
if(res.data.resultCode == 1) {
......@@ -2206,7 +2210,9 @@ export default {
}, err => {})
},
bankaccount_post_GetList(i){ // 获取银行账户
this.apipost('bankaccount_post_GetList',{}, res => {
this.apipost('bankaccount_post_GetList',{
StandCurrBranchId: this.StandCurrBranchId
}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
......@@ -2223,7 +2229,7 @@ export default {
id = x.ID;
}
})
this.apipost('BankAccount_post_GetCashPoolList',{TypeId:id,BranchId:-1,Alias:''}, res => {
this.apipost('BankAccount_post_GetCashPoolList',{TypeId:id,BranchId:-1,Alias:'',StandCurrBranchId: this.StandCurrBranchId}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
......@@ -2521,6 +2527,7 @@ export default {
}
this.chongJudge(data)
this.GetDetail = data;
this.StandCurrBranchId = this.GetDetail.RB_Branch_Id
if(this.GetDetail.DetailList){
this.GetDetail.DetailList.forEach(item=>{
if(item.CostTypeName=="领队导游资金池领款"){
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ 5f03fde2
......@@ -148,7 +148,9 @@
<th rowspan="2">{{$t('restaurant.res_Number')}}</th>
<th rowspan="2">{{$t('fnc.danjia')}}</th>
<th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th colspan="3">{{$t('fnc.jine')}}
<template v-if="GetDetail.StandardCurrencyId>0">({{GetDetail.StandardCurrencyName}})</template>
</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
</tr>
<tr>
......
src/components/FinancialModule/JumpReport.vue
View file @ 5f03fde2
......@@ -132,6 +132,19 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="本位币：">
<el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId" class @change="getChange">
<el-option :value="-1" label="不限"></el-option>
<el-option
v-for="item in coinGetList"
: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.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
......@@ -722,8 +735,9 @@ export default {
QStartDate:'',
UpdateBy:'',
IsFormEasyReport:1,
Sort:'2',
EmployeeId:'',
Sort:'2',
EmployeeId:'',
StandardCurrencyId: -1,
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
......@@ -814,7 +828,9 @@ export default {
],
pageSize:5,
pageIndex:1,
heightQueryBox:false
heightQueryBox:false,
coinGetList: [],
coinGetShow: false,
}
},created(){
if(this.$route.query.returnCode){
......@@ -880,6 +896,7 @@ export default {
this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId;
this.msg.EmployeeId= userInfo.EmployeeId;
this.financeinfo_GetList()
this.financeinfo_post_GetList();
this.financeinfo_post_GetCostTypeList();
this.FinancialFlowTemplate_post_GetList();
......@@ -893,6 +910,29 @@ export default {
this.getPageList();
this.AccountType_post_GetList();
},methods:{
getChange(val){
if(this.msg.RB_Branch_Id == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
},
financeinfo_GetList(){ // 获取币种
this.apipost('financeinfo_post_GetAllStandardCurrencyList',{}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
if(this.msg.RB_Branch_Id == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = this.coinGetList[0].ID
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
}
})
},
customCompFunc(params){
},
sortChange(param){
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 5f03fde2
......@@ -49,12 +49,20 @@
</el-col>
<el-col :span="6">
<el-form-item label="出团公司：">
<el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getData(2)">
<el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getChange">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="本位币：">
<el-select class="w150" :disabled="coinGetShow" v-model="msg.StandardCurrencyId" filterable :placeholder="$t('pub.pleaseSel')" @change="getChange">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in coinGetList" :label="item.Name" :key="item.ID" :value="item.ID">{{item.Name}}</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<button class="normalBtn page_EasyReport_search" style="left: 900px;" @click="getData(2)">查询</button>
</el-col>
......@@ -506,6 +514,7 @@ export default {
Money: '',
sharelist: [],
BranchId: -1,
StandardCurrencyId: -1
},
data: [],
DataList: [],
......@@ -816,6 +825,8 @@ export default {
},
],
BranchStatus:true,
coinGetList: [],
coinGetShow: false,
}
},
created(){
......@@ -836,10 +847,29 @@ export default {
this.userId = userInfo.EmployeeId;
},
mounted(){
this.financeinfo_post_GetList()
this.getData(2);
this.getCompanyList()
},
methods:{
getChange(val){
if(this.msg.BranchId == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
this.getData(2)
},
financeinfo_post_GetList(){ // 获取币种
this.apipost('financeinfo_post_GetAllStandardCurrencyList',{}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
this.msg.StandardCurrencyId = this.coinGetList[0].ID
}
})
},
goUrl (path,startDate,endDate,BranchId,tab) {
this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} })
......@@ -864,6 +894,7 @@ export default {
let startDate=that.year+"-"+column.start;
let endDate="";
let BranchId=that.msg.BranchId;
let StandardCurrencyId=that.msg.StandardCurrencyId;
let month=column.month;
if(column.field=="ErYue"){
......@@ -874,7 +905,7 @@ export default {
if(rowIndex<15){
if(BranchId == 1245){
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} })
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
}else if(rowData.ZhaiYao=="联运收入"){
that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
}
......@@ -886,7 +917,7 @@ export default {
that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询")
}
else{
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} })
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
}
}else{
if(rowData.ZhaiYao=="员工提成"){
......@@ -908,11 +939,13 @@ export default {
let CostIds="";
CostIds=rowData.CostIds.replace('112,', '');
CostIds=CostIds.replace('16,', '');
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds,
StandardCurrencyId,)
}
else{
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,
StandardCurrencyId,)
}
......@@ -929,6 +962,7 @@ export default {
month:month,
BranchId:rowData.BranchId,
CostIds:rowData.CostIds,
StandardCurrencyId,
"IsJapanNonbusinessIncome":1,
blank: "y"
}
......@@ -1185,16 +1219,14 @@ export default {
}
this.msg.Year = parseInt(this.year)
this.apipost('financestatistics_post_GetEasyReportList', this.msg, res=>{
if (res.data.resultCode == 1) {
let BranchStatus=res.data.data.IsBranchButton;
if(BranchStatus==-1){
this.BranchStatus=false;
}else{
this.BranchStatus=true;
this.msg.BranchId=BranchStatus;
}
this.BranchStatus=true;
this.msg.BranchId=BranchStatus;
}
let data = res.data.data
data.sharelist.forEach((x, i) => {
this.monthList[i].value = x.Money
......
src/components/FinancialModule/ReportForm/EasyReportAcrossYears.vue
View file @ 5f03fde2
......@@ -48,12 +48,25 @@
</el-col>
<el-col :span="6">
<el-form-item label="出团公司：">
<el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getData(2)">
<el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getChange">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="本位币：">
<el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId" class @change="getChange">
<el-option :value="-1" label="不限"></el-option>
<el-option
v-for="item in coinGetList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row >
<el-col :span="6" v-for="(month, index) in monthList" :key="index">
......@@ -502,6 +515,7 @@ export default {
msg: {
StartMonth: moment().format('YYYY-MM'),
BranchId: -1,
StandardCurrencyId: -1,
},
data: [],
DataList: [],
......@@ -812,6 +826,8 @@ export default {
},
],
BranchStatus:true,
coinGetList: [],
coinGetShow: false,
}
},
created(){
......@@ -832,10 +848,35 @@ export default {
this.userId = userInfo.EmployeeId;
},
mounted(){
this.financeinfo_post_GetList()
this.getData(2);
this.getCompanyList()
},
methods:{
getChange(val){
if(this.msg.BranchId == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
this.getData(2)
},
financeinfo_post_GetList(){ // 获取币种
this.apipost('financeinfo_post_GetAllStandardCurrencyList',{}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
if(this.msg.BranchId == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = this.coinGetList[0].ID
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
}
})
},
goUrl (path,startDate,endDate,BranchId,tab) {
this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} })
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 5f03fde2
......@@ -414,7 +414,7 @@ tr._item_list td:last-child {
<el-row style="padding:15px 20px 0 0;">
<el-col :span="4">
<el-form-item label="出团公司：">
<el-select :disabled="BranchStatus" filterable v-model="msg.OutBranchId" class>
<el-select :disabled="BranchStatus" filterable v-model="msg.OutBranchId" class @change="getChange">
<el-option :value="-1" label="不限"></el-option>
<el-option
v-for="item in CompanyList"
......@@ -425,6 +425,19 @@ tr._item_list td:last-child {
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="本位币">
<el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId" class @change="getChange">
<el-option :value="-1" label="不限"></el-option>
<el-option
v-for="item in coinGetList"
: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.StartCityId" class>
......@@ -1010,6 +1023,7 @@ export default {
LeaderType:0,
OutTCStatus:'0',
IsSelectReceipt:0,
StandardCurrencyId: -1
},
getCompanyMsg: {
// 公司
......@@ -1830,6 +1844,8 @@ export default {
shujuType:false,
PlaceList:[],
F_GeneralManager:false,
coinGetList: [],
coinGetShow: false,
};
},
created() {
......@@ -1837,6 +1853,7 @@ export default {
this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
this.msg.OutBranchId=this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):this.msg.OutBranchId;
this.msg.StandardCurrencyId=this.$route.query.StandardCurrencyId?Number(this.$route.query.StandardCurrencyId):this.msg.StandardCurrencyId;
if(this.$route.query.LtIdStr){
this.msg.LtIdStr=this.$route.query.LtIdStr
}
......@@ -1921,6 +1938,7 @@ export default {
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.userId = userInfo.EmployeeId;
this.financeinfo_post_GetList()
this.getCompanyList();
this.getLineList();
this.getStartList1();
......@@ -1928,6 +1946,29 @@ export default {
this.GetSupperOrderEditAuth();
},
methods: {
getChange(val){
if(this.msg.OutBranchId == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
},
financeinfo_post_GetList(){ // 获取币种
this.apipost('financeinfo_post_GetAllStandardCurrencyList',{}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
if(this.msg.OutBranchId == -1){
this.coinGetShow = false
this.msg.StandardCurrencyId = this.coinGetList[0].ID
}else{
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}
}
})
},
GetSupperOrderEditAuth() {
// F_GeneralManager_Special 财务总经理副总经理权限
var actionCode = this.$AuthCode.F_GeneralManager_Special;
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 5f03fde2
......@@ -294,7 +294,9 @@
<th rowspan="2">{{$t('restaurant.res_Number')}}</th>
<th rowspan="2">{{$t('fnc.danjia')}}</th>
<th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th colspan="3">{{$t('fnc.jine')}}
<template v-if="StandardCurrencyId>0">({{StandardCurrencyName}})</template>
</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
</tr>
<tr>
......@@ -700,6 +702,9 @@ export default {
crmOrderObj:null,
commissionObj:null,
tradeObj:null,
StandardCurrencyId: 0,
StandardCurrencyName: '',
TCID:'',
}
},
methods:{
......@@ -1061,6 +1066,7 @@ export default {
this.$set(this.msg.detailList,i,this.msg.detailList[i]);
},
addList(t,i){ // 添加
let list ={};
if(t==2&&i){
list = JSON.parse(JSON.stringify(this.msg.detailList[i-1]));
......@@ -1094,7 +1100,6 @@ export default {
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
this.allPriceTocalc =Math.round(this.allPrice* 100) / 100
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
this.detailList = {
ID:0,
......@@ -1316,12 +1321,64 @@ export default {
}, err => {})
},
financeinfo_post_GetList(TCID){ // 获取币种
this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID}, res => {
this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID, StandCurrBranchId: this.msg.RB_Branch_Id}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
let numberC = 0;
let price = 0;
let rate = 0;
this.coinGetList.forEach(x=>{
if(x.ID==this.detailList.CurrencyId){
this.detailList.currenName = x.Name
this.detailList.Rate = x.Rate
}
this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
if(item.CurrencyId==x.ID){
item.currenName = x.Name
item.Rate = x.Rate
}
numberC = parseFloat(item.Number);
price = parseFloat(item.UnitPrice);
rate = parseFloat(item.Rate);
if(price==0){
price='';
item.UnitPrice='';
}
if(numberC&&price){
item.UnitPriceTo = this.$commonUtils.addCommas(Math.round(price * 100) / 100)
item.yTotalPrice = numberC*price;
item.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(item.yTotalPrice* 100) / 100);
if(!isNaN(rate)){
let num = (numberC*price)*rate;
num = Math.round(num* 100) / 100;
item.bTotalPrice = num;
item.bTotalPriceTo = this.$commonUtils.addCommas(num)
}
}
})
})
this.jisuanTO()
}
}, err => {})
},
// 计算实付金额
jisuanTO(){
let allPrice = 0
this.msg.detailList.forEach(x=>{
this.coinGetList.forEach(y=>{
if(y.ID==x.CurrencyId){
x.currenName = y.Name;
}
})
allPrice = allPrice+parseFloat(x.bTotalPrice);
})
this.$forceUpdate()
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
this.allPriceTocalc =Math.round(this.allPrice* 100) / 100
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
},
Financial_post_Get(id,tempId){ //获取单据详情
this.loading = true;
this.apipost('Financial_post_Get', {ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
......@@ -1449,6 +1506,7 @@ export default {
this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
if (id > 0) {
let TCID = data.TCIDList.length>0 ? data.TCIDList[0] : 0
this.TCID = TCID
this.financeinfo_post_GetList(TCID);
}
this.$forceUpdate();
......@@ -1467,6 +1525,16 @@ export default {
}, err => {})
},
admin_get_DepartmentGetList(Bid, T){
if(Bid){
this.companyList.forEach(item=>{
// &&item.StandardCurrencyId>0
if(Bid==item.Id){
this.StandardCurrencyId = item.StandardCurrencyId
this.StandardCurrencyName = item.StandardCurrencyName
}
})
}
this.financeinfo_post_GetList(this.TCID)
if(Bid==0){
this.chosenPeople=[];
}
......@@ -1507,7 +1575,7 @@ export default {
})
});
}
this.companyList = data;
this.companyList = data;
if(!Status){
let id=0;
if(this.$route.query.id){
......@@ -1664,6 +1732,7 @@ export default {
}
this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
this.TCID = TCID
if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
that.Description="旅客名单：";
that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
......@@ -1677,7 +1746,7 @@ export default {
if (this.orderObj && this.orderObj.OtherType) {
this.ZhuiJiaTK = true
}
this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID}, res => {
this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID, StandCurrBranchId: this.msg.RB_Branch_Id}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
}
......@@ -1733,7 +1802,7 @@ export default {
this.returnCode = this.$route.query.Conditon;
}
this.getCompany();
// this.admin_get_DepartmentGetList();
},components: {
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 5f03fde2
......@@ -389,8 +389,8 @@
<!--</el-option>-->
<!--</el-select>-->
<el-select filterable v-model='msg.BankList[0].AccountId' placeholder=""
@change="getAccName(msg.BankList[0].AccountId,1)" class="w100 _border_b_1">
<el-option v-for='item in accountList' :label='item.Name' :value='item.ID' :key='item.ID'>
@change="getAccName(msg.BankList[0].AccountId,1),Calculation(0,1),countFee()" class="w100 _border_b_1">
<el-option v-for='(item,index) in accountList' :label='item.Name' :value='item.ID' :key='index'>
</el-option>
</el-select>
</p>
......@@ -411,7 +411,9 @@
<th rowspan="2">{{$t('restaurant.res_Number')}}</th>
<th rowspan="2">{{$t('fnc.danjia')}}</th>
<th rowspan="2" width="80">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th colspan="3">{{$t('fnc.jine')}}
<template v-if="StandardCurrencyId>0">({{StandardCurrencyName}})</template>
</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
</tr>
<tr>
......@@ -805,7 +807,9 @@
platformAccount: '',
Handmsg: {},
crmOrderObj:{},
tradeObj:{}
tradeObj:{},
StandardCurrencyId: 0,
StandardCurrencyName: '',
}
},
methods: {
......@@ -1101,16 +1105,20 @@
}
}, err => {})
},
getAccountList(i) { //获取账户类型对应下的账户列表
this.msg.BankList[0].AccountId = '';
this.AccountNumber = '';
getAccountList(i,t) { //获取账户类型对应下的账户列表
if(!t){
this.msg.BankList[0].AccountId = '';
this.AccountNumber = '';
}
this.apipost('FinancialInstitutions_post_GetALLAccountList', {
TypeId: i
TypeId: i,
StandCurrBranchId: this.msg.RB_Branch_Id
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
let list= []
if(this.$route.query.id==192){//如果流程等于192 只显示地接部专户 10月8号新增
list= []
data.forEach(x=>{
if(x.Alias=='国内地接专户'){
x.allName = x.BackNo + "(" + x.Alias + ")";
......@@ -1119,6 +1127,7 @@
}
})
}else{//如果不是192的情况不显示 国内地接专户
list= []
data.forEach(x=>{
if(x.Alias!='国内地接专户'){
x.allName = x.BackNo + "(" + x.Alias + ")";
......@@ -1131,9 +1140,29 @@
if (this.$route.query.edit) {
this.getAccName(this.msg.BankList[0].AccountId)
}
if(t){
let isState = true
this.accountList.forEach(item=>{
if(isState&&item.ID===this.msg.BankList[0].AccountId){
this.detailList.Rate = item.Rate
this.msg.detailList.forEach(x=>{
x.Rate = item.Rate
})
isState = false
return
}
})
if(isState){
this.msg.BankList[0].AccountId = '';
this.AccountNumber = '';
}
this.getAccName(this.msg.BankList[0].AccountId,1)
this.Calculation(0,1)
this.countFee()
}
}
}, err => {})
},
BankAccount_post_GetPlatformList(i) { //获取平台账户
let msg = {
......@@ -1764,6 +1793,22 @@
}, err => {})
},
admin_get_DepartmentGetList(Bid, T) { // 获取部门
if(this.bankType){
this.getAccountList(this.bankType,1)
}
this.msg.detailList.forEach(x=>{
x.Rate = ''
})
this.detailList.Rate = ''
if(this.msg.RB_Branch_Id){
this.companyList.forEach(item=>{
if(this.msg.RB_Branch_Id==item.Id&&item.StandardCurrencyId>0){
this.StandardCurrencyId = item.StandardCurrencyId
this.StandardCurrencyName = item.StandardCurrencyName
}
})
}
this.countFee()
this.departmentMsg.RB_Branch_Id = -1;
this.msg.RB_Depart_Id = '';
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
......@@ -1801,6 +1846,15 @@
});
}
this.companyList = data;
if(this.msg.RB_Branch_Id){
this.companyList.forEach(item=>{
if(this.msg.RB_Branch_Id==item.Id&&item.StandardCurrencyId>0){
this.StandardCurrencyId = item.StandardCurrencyId
this.StandardCurrencyName = item.StandardCurrencyName
console.log(item,'----')
}
})
}
if (!Status) {
let id = this.$route.query.id;
this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', {
......
src/components/platformModule/companyManagement.vue
View file @ 5f03fde2
......@@ -148,7 +148,6 @@
:key='item.ID'>
</el-option>
</el-select>
<!-- <el-input type="text" v-model="addMsg.StandardCurrencyId" placeholder="请选择本位币"></el-input> -->
</el-form-item>
<el-form-item class='w400' :label="$t('admin.admin_company')" prop="BName">
<el-input type="text" v-model="addMsg.BName" :placeholder="$t('pub.pleaseImport')"></el-input>
......
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