Commit c519c8c0 authored by 吴春's avatar 吴春

提交成本月结查询修改

parent f16ce0f8
...@@ -84,11 +84,27 @@ ...@@ -84,11 +84,27 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="付款对象:"> <el-form-item label="汇款人:">
<el-select <el-input placeholder="" class="" v-model="msg.RemitterName" ></el-input>
v-model="msg.ClientID" class="w150" </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.dxleixing')">
<el-select filterable v-model='msg.ClientType'
@change="ClaerClientAccountList(),msg.ClientID=''" class="">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientTypeList' :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="$t('fnc.fkduixiang')">
<el-select
v-model="msg.ClientID" class=""
filterable filterable
remote remote
reserve-keyword reserve-keyword
...@@ -108,8 +124,19 @@ ...@@ -108,8 +124,19 @@
</div> </div>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="排序:">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="金额:"> <el-form-item label="金额:">
<div style="display: flex;flex-direction: row;flex-wrap: nowrap;"> <div style="display: flex;flex-direction: row;flex-wrap: nowrap;">
...@@ -145,17 +172,7 @@ ...@@ -145,17 +172,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="排序:">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="模板类型:"> <el-form-item label="模板类型:">
<el-select v-model="msg.TemplateIds" filterable > <el-select v-model="msg.TemplateIds" filterable >
...@@ -181,9 +198,22 @@ ...@@ -181,9 +198,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="订单类型">
<el-select filterable v-model='msg.OtherType' class="">
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="63" value="63" label="团队"></el-option>
<el-option key="61" value="61" label="酒店"></el-option>
<el-option key="66" value="66" label="门票"></el-option>
<el-option key="67" value="67" label="车辆"></el-option>
<el-option key="62" value="62" label="签证"></el-option>
<el-option key="5" value="5" label="日本车行"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="订单编号:"> <el-form-item label="订单编号:">
<el-input v-model="msg.OrderID"></el-input> <el-input v-model="msg.ReFinanceId"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -191,6 +221,16 @@ ...@@ -191,6 +221,16 @@
<el-input v-model="msg.Remark"></el-input> <el-input v-model="msg.Remark"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="车行客户:">
<el-select filterable v-model='msg.JapanCarCustomerId' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in JapanCarCustomerList" :key="item.Id" :value="item.Id" :label="item.CustomerName"></el-option>
</el-select>
</el-form-item>
</el-col>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
...@@ -337,6 +377,37 @@ ...@@ -337,6 +377,37 @@
<template v-else> <template v-else>
<p class="_TCIDAndTCNUMList">暂无</p> <p class="_TCIDAndTCNUMList">暂无</p>
</template> </template>
<template v-if="scope.row.OtherType>0&&scope.row.ReFinanceIds!='0'&&scope.row.ReFinanceIds">
<p v-if="scope.row.OtherType==66">
<span >门票订单号</span>
<span>{{scope.row.ReFinanceIds}}</span>
</p>
<p v-else-if="scope.row.OtherType==67">
<span >车辆订单号</span>
<span>{{scope.row.ReFinanceIds}}</span>
</p>
<p v-else-if="scope.row.OtherType==61">
<span >酒店订单号</span>
<span>{{scope.row.ReFinanceIds}}</span>
</p>
<p v-else-if="scope.row.OtherType==80">
<span >印象车行订单号</span>
<span>{{scope.row.ReFinanceIds}}</span>
</p>
</template>
<template v-else-if="scope.row.OrderSource>0&&scope.row.OrderID>0">
<p v-if="scope.row.OrderSource==8">
<span>团队订单号</span>
<span>{{scope.row.OrderID}}</span>
</p>
<p v-else-if="scope.row.OrderSource==10">
<span >签证订单号</span>
<span>{{scope.row.OrderID}}</span>
</p>
</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -476,6 +547,7 @@ export default { ...@@ -476,6 +547,7 @@ export default {
sTradeDate:'', sTradeDate:'',
eTradeDate:'', eTradeDate:'',
ClientType:'0', ClientType:'0',
JapanCarCustomerId:0,
RemitterName:'', RemitterName:'',
ClientID:'', ClientID:'',
sMoney:'', sMoney:'',
...@@ -487,6 +559,8 @@ export default { ...@@ -487,6 +559,8 @@ export default {
TradeWay:'', TradeWay:'',
Type:'-1', Type:'-1',
AccountType:'', AccountType:'',
ReFinanceId:0,
OtherType:'0',
QEndDate:'', QEndDate:'',
QStartDate:'', QStartDate:'',
UpdateBy:'', UpdateBy:'',
...@@ -543,6 +617,7 @@ export default { ...@@ -543,6 +617,7 @@ export default {
ChineseStr:'', ChineseStr:'',
DepartIDs:'', DepartIDs:'',
heightQueryBox:false, heightQueryBox:false,
JapanCarCustomerList:[],
} }
}, },
created(){ created(){
...@@ -580,6 +655,7 @@ export default { ...@@ -580,6 +655,7 @@ export default {
} }
}, },
mounted(){ mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.DepartIDs = userInfo.RB_Department_Id; this.DepartIDs = userInfo.RB_Department_Id;
...@@ -597,10 +673,21 @@ export default { ...@@ -597,10 +673,21 @@ export default {
this.FinancialFlowTemplate_post_GetStatusList(); this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList(); this.getPageList();
this.AccountType_post_GetList(); this.AccountType_post_GetList();
this.GetJapanCarCustomerList();
var that = this; var that = this;
}, },
methods:{ methods:{
GetJapanCarCustomerList() { // 获取对象类型
this.apipost('JapanCar_get_GetJapanCarCustomerList', {}, res => {
if (res.data.resultCode == 1) {
console.log("JapanCarCustomerList",this.JapanCarCustomerList);
this.JapanCarCustomerList = res.data.data;
}
}, err => {})
},
ClaerClientAccountList(){
this.ClientAccountList=[];
},
handleClose(rows){ handleClose(rows){
if (rows) { if (rows) {
rows.forEach(row => { rows.forEach(row => {
...@@ -661,7 +748,8 @@ export default { ...@@ -661,7 +748,8 @@ export default {
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0; if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0; if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0; if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0; if(!this.msg.ReFinanceId)this.msg.ReFinanceId=0;
if(!this.msg.OtherType)this.msg.OtherType=0;
if(!this.msg.Status)this.msg.Status=0; if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0; if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.Conditon)this.msg.Conditon=1; if(!this.msg.Conditon)this.msg.Conditon=1;
...@@ -805,7 +893,6 @@ export default { ...@@ -805,7 +893,6 @@ export default {
} }
}, },
getAccountList(i,t){ //收款账户 getAccountList(i,t){ //收款账户
let accountList = []; let accountList = [];
if(t==1){ // 银行 if(t==1){ // 银行
......
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