Commit b3c2b669 authored by youjie's avatar youjie

no message

parent dee54651
......@@ -572,7 +572,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item label="账户类型:">
<el-select filterable v-model='msg.AccountType'>
<el-option value="" label="不限"></el-option>
......@@ -580,8 +580,8 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
</el-col> -->
<!-- <el-col :span="4" @click="typeVisible=true">
<el-form-item label="交易方式:">
<el-select filterable v-model='msg.TradeWay'
@change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''">
......@@ -590,18 +590,23 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
</el-col> -->
<!-- <el-col :span="8" @click="typeVisible=true">
<el-form-item label="收付款账户:">
<el-row>
<el-col :span="9">
<el-select filterable v-model='msg.BankID'>
<el-option value="" label="不限"></el-option>
<el-option v-for='item in accountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="heightQueryBox">
<el-col :span="13">
<q-btn class="q-ml-lg" color="primary" size="9px" label="选择交易/账户" @click="typeVisible=true" />
</el-col>
</el-row>
</el-form-item>
</el-col> -->
<el-col :span="4">
<el-form-item label="排序:">
<el-select filterable v-model='msg.Sort'>
......@@ -623,6 +628,15 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="交易账户:">
<q-btn class="q-ml-lg" color="primary" size="9px" label="筛选类型/交易/账户" @click="typeVisible=true" />
</el-form-item>
</el-col>
<template v-if="heightQueryBox">
<el-col :span="6">
<el-form-item label="审核状态:">
<el-select filterable v-model='msg.Status' class="">
<el-option key="-1" value="-1" label="不限"></el-option>
......@@ -635,7 +649,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="币种类型:">
<el-select filterable v-model='msg.CurrencyId'>
<el-option key="0" value="0" label="不限"></el-option>
......@@ -644,34 +658,34 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="订单编号:">
<el-input v-model="msg.OrderID"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="金额:">
<el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')" clearable></el-input>-
<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5" clearable></el-input>
<el-input v-model="msg.sMoney" class="w64d5" style="width: 47%;" @keyup.native="checkPrice(msg,'sMoney')" clearable></el-input>-
<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5" style="width: 47%;" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期:">
<el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
<el-date-picker style="width: 100%;" class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="交易日期:">
<el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
<el-date-picker class="h34" style="width: 100%;" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="发团日期:">
<el-date-picker class="h34" v-model="missionDate" @change="timeAdd(4)" type="daterange"
<el-form-item label="开班日期:">
<el-date-picker class="h34" style="width: 100%;" v-model="missionDate" @change="timeAdd(4)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
......@@ -687,7 +701,7 @@
<ul class="clearfix">
<div class="hight_query" style="text-align: right;">
<span>
<span @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo q-mr-lg"></i></span>
<span style="cursor: pointer;" @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo q-mr-lg"></i></span>
</span>
<!-- <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getPageList()" style="marginRight:10px" />
......@@ -795,7 +809,50 @@
</div>
</template>
</el-dialog>
<el-dialog custom-class='w400' title="账户类型/交易方式/收款账户" :visible.sync="typeVisible" center>
<el-form class="_info_box clearfix" label-width="80px">
<div v-for="(i,index) in typeList" :key="index">
<el-row class="fit row wrap" style="padding:15px 20px 0 0;">
<el-col :span="6">
<el-form-item label="类型:">
<el-select filterable v-model='i.AccountType'>
<el-option value="" label="不限"></el-option>
<el-option v-for='item in i.AccList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="方式:">
<el-select filterable v-model='i.TradeWay'
@change="getAccountList(i.AccountType,i.TradeWay,index),msg.ClientID=''">
<el-option value="0" label="不限"></el-option>
<el-option v-for='item in i.BranchAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="账户:">
<el-select style="width: 100%;" filterable multiple v-model='i.BankID'>
<el-option value="" label="不限"></el-option>
<el-option v-for='item in i.accountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3" class="q-pt-sm">
<q-btn v-if="index==0" class="q-ml-lg" color="primary" icon="add" size="9px" label="" @click="addType(i,index,1)" />
<q-btn v-else class="q-ml-lg" icon="delete" size="9px" label="" @click="addType(i,index,0)" />
</el-col>
</el-row>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<q-btn @click="msg.TradeWay='',msg.BankID='',typeVisible=false">取消</q-btn>
<q-btn color="primary" class="normalBtn q-ml-lg" @click="determine,typeVisible=false">确定</q-btn>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -868,6 +925,7 @@
KingdeeBranchId:'1',
FinanceName:'记',
BranchIds:'',
AccountIdStr:''
},
BranchIds:[],
getCompanyMsg: { // 校区
......@@ -953,6 +1011,17 @@
costmode:false,//费用类型的修改弹窗
trabeList:[],//修改费用类型的下啦数据
TheAliasList:[],
typeVisible: false,
typeList:[
{
AccountType:'',//账户类型
AccList:[],
TradeWay:'',//交易方式
BranchAccountList:[],
BankID:[],//收付款账户
accountList:[]
}
]
}
},
created() {
......@@ -995,6 +1064,31 @@
},
methods: {
determine(){
this.msg.AccountIdStr = ''
for(let i=0;i<this.typeList.length;i++){
let data = (this.typeList[i].AccountType?this.typeList[i].AccountType:0)+'&'
+(this.typeList[i].TradeWay?this.typeList[i].TradeWay:0)+'&'
+(this.typeList[i].BankID?this.typeList[i].BankID.join(','):0)
this.msg.AccountIdStr = JSON.parse(JSON.stringify(this.msg.AccountIdStr))+(i==0?'':'|')+data
}
// console.log(this.msg.AccountIdStr,'00000')
},
addType(item,index,type){
if(type){
this.typeList.push(
{AccountType:'',//账户类型
AccList:JSON.parse(JSON.stringify(item.AccList)),
TradeWay:'',//交易方式
BranchAccountList:JSON.parse(JSON.stringify(item.BranchAccountList)),
BankID:[],//收付款账户
accountList:[]}
)
}else{
this.typeList.splice(index,1)
}
},
Financial_post_GetEduBranchEnumList() {
this.apipost('Financial_post_GetEduBranchEnumList', {}, res => {
if (res.data.resultCode == 1) {
......@@ -1109,6 +1203,9 @@
this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
if (res.data.resultCode == 1) {
this.AccList = res.data.data;
this.typeList.forEach(item=>{
item.AccList = this.AccList
})
} else {
this.$message.error(res.data.message);
}
......@@ -1258,7 +1355,7 @@
}
}, err => {})
},
getAccountList(i, t) { //收款账户
getAccountList(i, t, index) { //收款账户
let accountList = [];
if (t == 1) { // 银行
this.apipost('bankaccount_post_GetList', {
......@@ -1275,6 +1372,7 @@
accountList.push(obj)
})
this.accountList = accountList;
this.typeList[index].accountList = accountList
}
}, err => {})
}
......@@ -1297,6 +1395,7 @@
accountList.push(obj)
})
this.accountList = accountList;
this.typeList[index].accountList = accountList
}
}, err => {})
}
......@@ -1317,7 +1416,8 @@
}
accountList.push(obj)
})
this.accountList = accountList
this.accountList = accountList;
this.typeList[index].accountList = accountList
}
}, err => {})
}
......@@ -1338,7 +1438,8 @@
}
accountList.push(obj)
})
this.accountList = accountList
this.accountList = accountList;
this.typeList[index].accountList = accountList
}
}, err => {})
}
......@@ -1348,6 +1449,9 @@
this.apipost('Financial_post_GetBranchAccountList', {}, res => {
if (res.data.resultCode == 1) {
this.BranchAccountList = res.data.data;
this.typeList.forEach(item=>{
item.BranchAccountList = JSON.parse(JSON.stringify(this.BranchAccountList))
})
}
}, err => {})
},
......@@ -1458,7 +1562,7 @@
this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1];
}
if (t == 4) { //发团日期
if (t == 4) { //开班日期
if (!this.missionDate) {
this.dateStart = '';
this.dateEnd = '';
......
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