Skip to content

S
SuperMan
Commit 5e2e1fc8 authored by liudong1993's avatar liudong1993
Browse files
Options

账户明细增加查询；流程增加查询

parent af262646
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 11 deletions
src/components/FinancialModule/FProcessManagement.vue
View file @ 5e2e1fc8
...@@ -101,13 +101,34 @@ ...@@ -101,13 +101,34 @@
<!-- <li> <!-- <li>
<span>注：财务基本流程包括（收款流程，付款流程，发票流程），如果需要其他的流程，比如退款流程等请在自定义流程下新增流程设置</span> <span>注：财务基本流程包括（收款流程，付款流程，发票流程），如果需要其他的流程，比如退款流程等请在自定义流程下新增流程设置</span>
</li> --> </li> -->
<li><input type="button" class="normalBtn" value="新增流程" @click="goUrl('addFinancialProcess',0,8)"/></li> <li><input type="button" class="normalBtn" value="新增流程" @click="goUrl('addFinancialProcess',0,8)"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex();getTemplateList();"/>
</li>
</ul> </ul>
</div> </div>
<ul class="_nav clearfix"> <ul class="_nav clearfix">
<li class="_active" @click="getTemplateList()">流程列表</li> <li class="_active" @click="getTemplateList()">流程列表</li>
<!-- <li :class="active==1?'_active':''" @click="active=1,msg.TempLateWay=8,getTemplateList()">自定义流程</li> --> <!-- <li :class="active==1?'_active':''" @click="active=1,msg.TempLateWay=8,getTemplateList()">自定义流程</li> -->
</ul> </ul>
<ul>
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item label="流程名称">
<el-input v-model="msg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</ul>
<ul class="_content" v-loading="loading"> <ul class="_content" v-loading="loading">
<li v-for="(item,index) in CTemplateList" > <li v-for="(item,index) in CTemplateList" >
<div class="_left"> <div class="_left">
...@@ -253,6 +274,7 @@ export default { ...@@ -253,6 +274,7 @@ export default {
//TemplateList:[], //TemplateList:[],
CTemplateList:[], CTemplateList:[],
FinanceInfoChangeLog:[], FinanceInfoChangeLog:[],
GetCostTypeList:[],
total:0, total:0,
currentPage:1, currentPage:1,
noData:true, noData:true,
...@@ -261,6 +283,8 @@ export default { ...@@ -261,6 +283,8 @@ export default {
pageIndex:1, pageIndex:1,
pageSize:6, pageSize:6,
RB_BranchId:-1, RB_BranchId:-1,
Name:'',
CostTypeID:0
} }
} }
},created(){ },created(){
...@@ -314,6 +338,15 @@ export default { ...@@ -314,6 +338,15 @@ export default {
}); });
}); });
}, },
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
UpdateStatus(id,type){ //启停用 UpdateStatus(id,type){ //启停用
this.apipost('FinancialFlowTemplate_post_UpdateStatus',{ID:id,TemplateType:type,RB_Branch_id:this.msg.RB_BranchId},res=>{ this.apipost('FinancialFlowTemplate_post_UpdateStatus',{ID:id,TemplateType:type,RB_Branch_id:this.msg.RB_BranchId},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
...@@ -372,11 +405,16 @@ export default { ...@@ -372,11 +405,16 @@ export default {
} }
},err=>{}) },err=>{})
}, },
resetPageIndex() {
this.msg.pageIndex = 1
this.currentPage = 1
},
goUrl(path,id,isZ,Branch_Id) { goUrl(path,id,isZ,Branch_Id) {
this.$router.push({ name: path,query:{"id":id,"isZ":isZ,"blank":'y',tab:"修改流程"} }) this.$router.push({ name: path,query:{"id":id,"isZ":isZ,"blank":'y',tab:"修改流程"} })
}, },
},mounted(){ },mounted(){
this.getTemplateList() this.getTemplateList();
this.financeinfo_post_GetCostTypeList();
} }
} }
</script> </script>
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 5e2e1fc8
...@@ -110,6 +110,26 @@ ...@@ -110,6 +110,26 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul> <ul>
...@@ -126,10 +146,10 @@ ...@@ -126,10 +146,10 @@
<th rowspan="2"></th> <th rowspan="2"></th>
<th rowspan="2">{{$t('system.query_company')}}</th> <th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th> <th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th> <th rowspan="2" width="250px">{{$t('fnc.a_zhaiyao')}}</th>
<th rowspan="2">{{$t('fnc.a_hkrfkduixiang')}}</th> <th rowspan="2" width="250px">{{$t('fnc.a_hkrfkduixiang')}}</th>
<th rowspan="2">{{$t('fnc.a_hkfkshijian')}}</th> <th rowspan="2">{{$t('fnc.a_hkfkshijian')}}</th>
<th rowspan="2">{{$t('fnc.jylshuihao')}}</th> <th rowspan="2" width="250px">{{$t('fnc.jylshuihao')}}</th>
<th colspan="3">{{$t('fnc.waibi')}}（{{TypeName}}）</th> <th colspan="3">{{$t('fnc.waibi')}}（{{TypeName}}）</th>
<th rowspan="2">{{$t('fnc.a_dhuanlv')}}</th> <th rowspan="2">{{$t('fnc.a_dhuanlv')}}</th>
<th colspan="3">{{$t('fnc.a_rminbi')}}</th> <th colspan="3">{{$t('fnc.a_rminbi')}}</th>
...@@ -376,6 +396,8 @@ export default { ...@@ -376,6 +396,8 @@ export default {
eTradeDate:'', eTradeDate:'',
QStartDate:'', QStartDate:'',
QEndDate:'', QEndDate:'',
CostTypeID:0,
RB_Branch_Id:-1,
BankList:[], BankList:[],
Is_Cashier:-1, Is_Cashier:-1,
}, },
...@@ -395,6 +417,8 @@ export default { ...@@ -395,6 +417,8 @@ export default {
productionDate:[], productionDate:[],
productionDateByTC:[], productionDateByTC:[],
ClientAccountList:[], ClientAccountList:[],
GetCostTypeList:[],
CompanyList:[],
RB_Branch_Id:null, RB_Branch_Id:null,
loading:false, loading:false,
date:'', date:'',
...@@ -853,6 +877,22 @@ export default { ...@@ -853,6 +877,22 @@ export default {
} }
}, err => {}) }, err => {})
}, },
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
getList(){ //获取列表 getList(){ //获取列表
this.loading = true; this.loading = true;
if( this.msg.ClientID === '' ){ if( this.msg.ClientID === '' ){
...@@ -931,6 +971,8 @@ export default { ...@@ -931,6 +971,8 @@ export default {
this.AccountType_post_GetList(); this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType(); this.BankAccount_post_GetAccountType();
this.financeinfo_post_GetClientAccountList(); this.financeinfo_post_GetClientAccountList();
this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
} }
} }
</script> </script>
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 5e2e1fc8
...@@ -112,6 +112,18 @@ ...@@ -112,6 +112,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul> <ul>
...@@ -340,6 +352,7 @@ export default { ...@@ -340,6 +352,7 @@ export default {
pageSize:5, pageSize:5,
ClientID:'', ClientID:'',
CostTypeID:0, CostTypeID:0,
RB_Branch_Id:-1,
sTradeDate:'', sTradeDate:'',
eTradeDate:'', eTradeDate:'',
QStartDate:'', QStartDate:'',
...@@ -359,6 +372,7 @@ export default { ...@@ -359,6 +372,7 @@ export default {
productionDateByTC:[], productionDateByTC:[],
ClientAccountList:[], ClientAccountList:[],
GetCostTypeList:[], GetCostTypeList:[],
CompanyList:[],
loading:false, loading:false,
date:'', date:'',
accType:'', accType:'',
...@@ -868,6 +882,13 @@ export default { ...@@ -868,6 +882,13 @@ export default {
} }
},err=>{}) },err=>{})
}, },
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getAccountTypeList(); this.getAccountTypeList();
...@@ -875,6 +896,7 @@ export default { ...@@ -875,6 +896,7 @@ export default {
this.BankAccount_post_GetAccountType(); this.BankAccount_post_GetAccountType();
this.financeinfo_post_GetClientAccountList(); this.financeinfo_post_GetClientAccountList();
this.financeinfo_post_GetCostTypeList(); this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
} }
} }
</script> </script>
\ No newline at end of file
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 5e2e1fc8
...@@ -101,6 +101,26 @@ ...@@ -101,6 +101,26 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul> <ul>
...@@ -319,6 +339,8 @@ export default { ...@@ -319,6 +339,8 @@ export default {
pageIndex:1, pageIndex:1,
pageSize:5, pageSize:5,
ClientID:'', ClientID:'',
CostTypeID:0,
RB_Branch_Id:-1,
sTradeDate:'', sTradeDate:'',
eTradeDate:'', eTradeDate:'',
QStartDate:'', QStartDate:'',
...@@ -339,6 +361,8 @@ export default { ...@@ -339,6 +361,8 @@ export default {
productionDate:[], productionDate:[],
productionDateByTC:[], productionDateByTC:[],
ClientAccountList:[], ClientAccountList:[],
GetCostTypeList:[],
CompanyList:[],
loading:false, loading:false,
RB_Branch_Id:null, RB_Branch_Id:null,
date:'', date:'',
...@@ -843,6 +867,22 @@ export default { ...@@ -843,6 +867,22 @@ export default {
// this.listAllMoney = this.listAllMoney + x.allMoney // this.listAllMoney = this.listAllMoney + x.allMoney
// }) // })
}, },
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.RB_Branch_Id = userInfo.RB_Branch_id; this.RB_Branch_Id = userInfo.RB_Branch_id;
...@@ -850,6 +890,8 @@ export default { ...@@ -850,6 +890,8 @@ export default {
this.AccountType_post_GetList(); this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType(); this.BankAccount_post_GetAccountType();
this.financeinfo_post_GetClientAccountList(); this.financeinfo_post_GetClientAccountList();
this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
} }
} }
</script> </script>
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 5e2e1fc8
...@@ -93,6 +93,26 @@ ...@@ -93,6 +93,26 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul> <ul>
...@@ -106,7 +126,7 @@ ...@@ -106,7 +126,7 @@
<div class="cm_content"> <div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th rowspan="2"></th> <!-- <th rowspan="2"></th> -->
<th rowspan="2">{{$t('system.query_company')}}</th> <th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th> <th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th> <th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th>
...@@ -126,7 +146,7 @@ ...@@ -126,7 +146,7 @@
<th width="">{{$t('fnc.yueacc')}}</th> <th width="">{{$t('fnc.yueacc')}}</th>
</tr> </tr>
<tr> <tr>
<td :colspan="6">{{$t('fnc.a_qcyue')}}：</td> <td :colspan="5">{{$t('fnc.a_qcyue')}}：</td>
<td></td> <td></td>
<td></td> <td></td>
<td> {{ moneyFormat(RStartMoney) }} </td> <td> {{ moneyFormat(RStartMoney) }} </td>
...@@ -152,9 +172,9 @@ ...@@ -152,9 +172,9 @@
<span v-if=" item.Type == 1">{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span> <span v-if=" item.Type == 1">{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 2">{{$t('fnc.a_fkshijian')}}：{{ item.TradeDate }}</span> <span v-if=" item.Type == 2">{{$t('fnc.a_fkshijian')}}：{{ item.TradeDate }}</span>
</td> </td>
<td> <!-- <td>
{{ item.AccountNumber }} {{ item.AccountNumber }}
</td> </td> -->
<td> <td>
{{ item.Type == 1 ? moneyFormat(item.OriginalMoney) : '' }} {{ item.Type == 1 ? moneyFormat(item.OriginalMoney) : '' }}
</td> </td>
...@@ -178,7 +198,7 @@ ...@@ -178,7 +198,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td :colspan="6">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td> <td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td></td> <td></td>
<td></td> <td></td>
<td> {{ moneyFormat(endRStartMoney) }} </td> <td> {{ moneyFormat(endRStartMoney) }} </td>
...@@ -349,6 +369,8 @@ export default { ...@@ -349,6 +369,8 @@ export default {
pageIndex:1, pageIndex:1,
pageSize:5, pageSize:5,
ClientID:'', ClientID:'',
CostTypeID:0,
RB_Branch_Id:-1,
sTradeDate:'', sTradeDate:'',
eTradeDate:'', eTradeDate:'',
QStartDate:'', QStartDate:'',
...@@ -370,6 +392,8 @@ export default { ...@@ -370,6 +392,8 @@ export default {
productionDate:[], productionDate:[],
productionDateByTC:[], productionDateByTC:[],
ClientAccountList:[], ClientAccountList:[],
GetCostTypeList:[],
CompanyList:[],
RB_Branch_Id:null, RB_Branch_Id:null,
loading:false, loading:false,
date:'', date:'',
...@@ -860,12 +884,30 @@ export default { ...@@ -860,12 +884,30 @@ export default {
// this.listAllMoney = this.listAllMoney + x.allMoney // this.listAllMoney = this.listAllMoney + x.allMoney
// }) // })
}, },
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getAccountTypeList(); this.getAccountTypeList();
this.AccountType_post_GetList(); this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType(); this.BankAccount_post_GetAccountType();
this.financeinfo_post_GetClientAccountList(); this.financeinfo_post_GetClientAccountList();
this.financeinfo_post_GetCostTypeList();
this.getCompanyList();
} }
} }
</script> </script>
......
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