Skip to content

C
CRM
Commit 022d4a20 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 86ae5328
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 82 deletions
src/components/guestManagement/Agreement.vue
View file @ 022d4a20
...@@ -503,6 +503,9 @@ ...@@ -503,6 +503,9 @@
row.selectedType = row.checkList.join(',') row.selectedType = row.checkList.join(',')
} }
} }
if(num == 3){
}
}, },
// 删除套餐值 // 删除套餐值
delType(row,item) { delType(row,item) {
...@@ -551,7 +554,37 @@ ...@@ -551,7 +554,37 @@
this.ValidateOperator() this.ValidateOperator()
} else { } else {
if (row.OrderStatus != '2') { if (row.OrderStatus != '2') {
if(num=='2'){ if(list&&list.length>1){
if(num=='1'){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num
let $this = this;
row.ReFinanceId2 = num
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}if(num=='3'){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
RelevanceFrId: row.selectedType, // 单据类型
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
}
}else{
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href let href
...@@ -561,27 +594,30 @@ ...@@ -561,27 +594,30 @@
} else { } else {
url = 'http://www.test.com:8081/#/' url = 'http://www.test.com:8081/#/'
} }
let data = [{ let data
path: 'ChoiceAddFinancialDocuments', if(num==1||num==2){
type: type, data = [{
OtherType: 55, path: 'ChoiceAddFinancialDocuments',
ReFinanceId: row.OrderId, type: type,
ReFinanceId2: num, OtherType: 55,
GuestId: row.GuestId, ReFinanceId: row.OrderId,
RelevanceFrId: row.selectedType?row.selectedType:row.OrderType // 单据类型 ReFinanceId2: num,
}] GuestId: row.GuestId,
RelevanceFrId: row.OrderType, // 单据类型
}]
}
if(num==3){
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
}]
}
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data) href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href); window.open(href);
}if(num=='1'&&list&&list.length>1){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num
let $this = this;
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}else{
this.apipost2("Financial_post_SetFinanceInfoForCRMIn",{},(res)=>{
})
} }
} }
......
src/components/guestManagement/ticketOrder.vue
View file @ 022d4a20
...@@ -327,8 +327,10 @@ ...@@ -327,8 +327,10 @@
.BillMaking-header{ .BillMaking-header{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap;
} }
.BillMaking-header-center{ .BillMaking-header-center{
width: 167px;
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: 20px; margin-right: 20px;
...@@ -366,11 +368,17 @@ ...@@ -366,11 +368,17 @@
flex-direction: row; flex-direction: row;
margin-bottom: 5px; margin-bottom: 5px;
} }
.BillMakingType-right-box{
flex-grow: 1;
display: flex;
flex-wrap: wrap;
}
.BillMakingType-right-center{ .BillMakingType-right-center{
flex: 1; width: 155px;
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px;
} }
.BillMakingType-right-center span:first-child{ .BillMakingType-right-center span:first-child{
flex-shrink: 0; flex-shrink: 0;
...@@ -673,7 +681,8 @@ ...@@ -673,7 +681,8 @@
<div class="BillMaking-header"> <div class="BillMaking-header">
<div class="BillMaking-header-center"> <div class="BillMaking-header-center">
<span>流程：</span> <span>流程：</span>
<el-select size="mini" v-model="BillMaking.TemplateId" filterable clearable placeholder="请选择流程"> <el-select size="mini" v-model="BillMaking.TemplateId" filterable clearable placeholder="请选择流程"
@change="Financial_post_GetCostTypeList">
<el-option <el-option
v-for="item in processList" v-for="item in processList"
:key="item.Id" :key="item.Id"
...@@ -696,7 +705,7 @@ ...@@ -696,7 +705,7 @@
</el-select> </el-select>
</div> </div>
<div class="BillMaking-header-center"> <div class="BillMaking-header-center">
<span>部门：</span> <span>费用归属部门：</span>
<el-select size="mini" v-model="BillMaking.RB_Depart_Id" filterable placeholder="请选择部门"> <el-select size="mini" v-model="BillMaking.RB_Depart_Id" filterable placeholder="请选择部门">
<el-option <el-option
v-for="(item,index) in departmentList" v-for="(item,index) in departmentList"
...@@ -707,8 +716,8 @@ ...@@ -707,8 +716,8 @@
</el-select> </el-select>
</div> </div>
<div class="BillMaking-header-center"> <div class="BillMaking-header-center">
<span>账户类型：</span> <span>收款账户：</span>
<el-select size="mini" v-model="BillMaking.IsPublic" filterable placeholder="请选择账户类型" <el-select size="mini" v-model="BillMaking.IsPublic" filterable placeholder="请选择收款账户"
@change="getAccountList"> @change="getAccountList">
<el-option <el-option
v-for="(item,index) in AccList" v-for="(item,index) in AccList"
...@@ -719,8 +728,9 @@ ...@@ -719,8 +728,9 @@
</el-select> </el-select>
</div> </div>
<div class="BillMaking-header-center"> <div class="BillMaking-header-center">
<span>账户：</span> <span>收款账号：</span>
<el-select size="mini" v-model="BillMaking.AccountId" filterable placeholder="请选择账户"> <el-select size="mini" v-model="BillMaking.AccountId" filterable placeholder="请选择收款账号"
@change="getReceivingAccount">
<el-option <el-option
v-for="(item,index) in accountList" v-for="(item,index) in accountList"
:key="index" :key="index"
...@@ -736,18 +746,26 @@ ...@@ -736,18 +746,26 @@
<div class="BillMakingType-left">{{airTickets.title}}</div> <div class="BillMakingType-left">{{airTickets.title}}</div>
<div class="BillMakingType-right"> <div class="BillMakingType-right">
<div class="BillMakingType-right-list" v-for="(item,index) in airTickets.detailList" :key="index"> <div class="BillMakingType-right-list" v-for="(item,index) in airTickets.detailList" :key="index">
<div class="BillMakingType-right-box">
<div class="BillMakingType-right-center">
<span>费用说明：</span>
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="费用说明">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>数量：</span> <span>数量：</span>
<el-input size="mini" placeholder="数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="请输入数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.Number"></el-input> v-model="item.Number"></el-input>
</div> </div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>单价：</span> <span>单价：</span>
<el-input size="mini" placeholder="单价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="请输入单价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.UnitPrice"></el-input> v-model="item.UnitPrice"></el-input>
</div> </div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>金额：</span> <span>原币：</span>
<span>{{item.OriginalMoney}}</span> <span>{{item.OriginalMoney}}</span>
<!-- <el-input size="mini" placeholder="金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <!-- <el-input size="mini" placeholder="金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
...@@ -761,6 +779,7 @@ ...@@ -761,6 +779,7 @@
placeholder="备注" placeholder="备注"
v-model="item.Remark"></el-input> v-model="item.Remark"></el-input>
</div> </div>
</div>
<i class="iconfont clickJia" v-if="index==0" @click="addTypeList(1)">&#xe615;</i> <i class="iconfont clickJia" v-if="index==0" @click="addTypeList(1)">&#xe615;</i>
<i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,1)">&#xe67a;</i> <i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,1)">&#xe67a;</i>
</div> </div>
...@@ -768,15 +787,17 @@ ...@@ -768,15 +787,17 @@
</div> </div>
<div class="BillingTotal-box"> <div class="BillingTotal-box">
<div class="BillingTotal-center">
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="airTickets.OriginalFee"></el-input>
</div>
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>总价：</span> <span>总价：</span>
<span>{{airTickets.WBMoney}}</span> <span>{{airTickets.TotalCost}}</span>
<!-- <el-input size="mini" placeholder="总价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="airTickets.WBMoney"></el-input> -->
</div> </div>
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<el-input size="mini" placeholder="请输入费率" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <span>应收：</span>
v-model="airTickets.OriginalFee"></el-input> <span>{{airTickets.WBMoney}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -786,6 +807,14 @@ ...@@ -786,6 +807,14 @@
<div class="BillMakingType-left">{{visa.title}}</div> <div class="BillMakingType-left">{{visa.title}}</div>
<div class="BillMakingType-right"> <div class="BillMakingType-right">
<div class="BillMakingType-right-list" v-for="(item,index) in visa.detailList" :key="index"> <div class="BillMakingType-right-list" v-for="(item,index) in visa.detailList" :key="index">
<div class="BillMakingType-right-box">
<div class="BillMakingType-right-center">
<span>费用说明：</span>
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="费用说明">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>数量：</span> <span>数量：</span>
<el-input size="mini" placeholder="请输入数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="请输入数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
...@@ -797,7 +826,7 @@ ...@@ -797,7 +826,7 @@
v-model="item.UnitPrice"></el-input> v-model="item.UnitPrice"></el-input>
</div> </div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>金额：</span> <span>原币：</span>
<!-- <span>{{item.OriginalMoney}}</span> --> <!-- <span>{{item.OriginalMoney}}</span> -->
<el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.OriginalMoney" disabled></el-input> v-model="item.OriginalMoney" disabled></el-input>
...@@ -810,6 +839,7 @@ ...@@ -810,6 +839,7 @@
placeholder="备注" placeholder="备注"
v-model="item.Remark"></el-input> v-model="item.Remark"></el-input>
</div> </div>
</div>
<i class="iconfont clickJia" v-if="index==0" @click="addTypeList(2)">&#xe615;</i> <i class="iconfont clickJia" v-if="index==0" @click="addTypeList(2)">&#xe615;</i>
<i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,2)">&#xe67a;</i> <i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,2)">&#xe67a;</i>
</div> </div>
...@@ -817,16 +847,18 @@ ...@@ -817,16 +847,18 @@
</div> </div>
<div class="BillingTotal-box"> <div class="BillingTotal-box">
<div class="BillingTotal-center">
<span>手续费：</span>
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="visa.OriginalFee"></el-input>
</div>
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>总价：</span> <span>总价：</span>
<span>{{visa.WBMoney}}</span> <span>{{visa.TotalCost}}</span>
<!-- <el-input size="mini" placeholder="总价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="visa.WBMoney"></el-input> -->
</div> </div>
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>费率：</span> <span>应收：</span>
<el-input size="mini" placeholder="请输入费率" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <span>{{visa.WBMoney}}</span>
v-model="visa.OriginalFee"></el-input>
</div> </div>
</div> </div>
</div> </div>
...@@ -836,6 +868,14 @@ ...@@ -836,6 +868,14 @@
<div class="BillMakingType-left">{{ground.title}}</div> <div class="BillMakingType-left">{{ground.title}}</div>
<div class="BillMakingType-right"> <div class="BillMakingType-right">
<div class="BillMakingType-right-list" v-for="(item,index) in ground.detailList" :key="index"> <div class="BillMakingType-right-list" v-for="(item,index) in ground.detailList" :key="index">
<div class="BillMakingType-right-box">
<div class="BillMakingType-right-center">
<span>费用说明：</span>
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="费用说明">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>数量：</span> <span>数量：</span>
<el-input size="mini" placeholder="请输入数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="请输入数量" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
...@@ -847,7 +887,7 @@ ...@@ -847,7 +887,7 @@
v-model="item.UnitPrice"></el-input> v-model="item.UnitPrice"></el-input>
</div> </div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>金额：</span> <span>原币：</span>
<!-- <span>{{item.OriginalMoney}}</span> --> <!-- <span>{{item.OriginalMoney}}</span> -->
<el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.OriginalMoney" disabled></el-input> v-model="item.OriginalMoney" disabled></el-input>
...@@ -860,6 +900,7 @@ ...@@ -860,6 +900,7 @@
placeholder="备注" placeholder="备注"
v-model="item.Remark"></el-input> v-model="item.Remark"></el-input>
</div> </div>
</div>
<i class="iconfont clickJia" v-if="index==0" @click="addTypeList(3)">&#xe615;</i> <i class="iconfont clickJia" v-if="index==0" @click="addTypeList(3)">&#xe615;</i>
<i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,3)">&#xe67a;</i> <i class="iconfont clickJia" v-if="index!=0" @click="deleteTypeList(item,index,3)">&#xe67a;</i>
</div> </div>
...@@ -867,17 +908,18 @@ ...@@ -867,17 +908,18 @@
</div> </div>
<div class="BillingTotal-box"> <div class="BillingTotal-box">
<div class="BillingTotal-center">
<span>手续费：</span>
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="ground.OriginalFee"></el-input>
</div>
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>总价：</span> <span>总价：</span>
<span>{{ground.WBMoney}}</span> <span>{{ground.TotalCost}}</span>
<!-- <el-input size="mini" placeholder="总价" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="ground.WBMoney"></el-input> -->
</div> </div>
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>费率：</span> <span>应收：</span>
<el-input size="mini" placeholder="请输入费率" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <span>{{ground.WBMoney}}</span>
v-model="ground.OriginalFee"></el-input>
</div> </div>
</div> </div>
</div> </div>
...@@ -919,7 +961,7 @@ ...@@ -919,7 +961,7 @@
v-model="combo.WBMoney"></el-input> v-model="combo.WBMoney"></el-input>
</div> </div>
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<el-input size="mini" placeholder="费率" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="combo.OriginalFee"></el-input> v-model="combo.OriginalFee"></el-input>
</div> </div>
</div> </div>
...@@ -962,7 +1004,7 @@ ...@@ -962,7 +1004,7 @@
v-model="other.WBMoney"></el-input> v-model="other.WBMoney"></el-input>
</div> </div>
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<el-input size="mini" placeholder="费率" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="other.OriginalFee"></el-input> v-model="other.OriginalFee"></el-input>
</div> </div>
</div> </div>
...@@ -1002,20 +1044,20 @@ ...@@ -1002,20 +1044,20 @@
</div> </div>
</div> </div>
<div class="RemittanceInformation-center"> <div class="RemittanceInformation-center">
<span>日期：</span> <span>汇款时间：</span>
<div class="RemittanceInformation-center-right"> <div class="RemittanceInformation-center-right">
<el-date-picker <el-date-picker
style="width: 100%;" style="width: 100%;"
size="mini" size="mini"
v-model="BillMaking.TradeDate" v-model="BillMaking.TradeDate"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
placeholder="选择日期"> placeholder="选择汇款时间">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<div class="RemittanceInformation-center"> <div class="RemittanceInformation-center">
<span>流水：</span> <span>交易流水号：</span>
<div class="RemittanceInformation-center-right"> <div class="RemittanceInformation-center-right">
<el-input size="mini" placeholder="流水" <el-input size="mini" placeholder="流水"
v-model="BillMaking.AccountNumber"></el-input> v-model="BillMaking.AccountNumber"></el-input>
...@@ -1031,7 +1073,7 @@ ...@@ -1031,7 +1073,7 @@
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" class="add-box-btn" @click="submitForm('form')">确 定</el-button> <el-button type="primary" class="add-box-btn" @click="submitForm('form')" :loading="clickShow">确 定</el-button>
<el-button class="add-box-btn add-box-cancel" @click="dialogTableVisible = false, resetForm('form')">取 消</el-button> <el-button class="add-box-btn add-box-cancel" @click="dialogTableVisible = false, resetForm('form')">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -1066,6 +1108,8 @@ ...@@ -1066,6 +1108,8 @@
}, },
data() { data() {
return { return {
clickShow:false,
GetCostTypeList:[],//费用类型
accountList:[],//账号类别 accountList:[],//账号类别
AccList:[],//账户类型 AccList:[],//账户类型
departmentList:[],// 部门 departmentList:[],// 部门
...@@ -1077,6 +1121,7 @@ ...@@ -1077,6 +1121,7 @@
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费 OriginalFee:"",//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[ detailList:[
{ {
CostTypeId:"",//费用ID CostTypeId:"",//费用ID
...@@ -1092,6 +1137,7 @@ ...@@ -1092,6 +1137,7 @@
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费 OriginalFee:"",//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[ detailList:[
{ {
CostTypeId:"",//费用ID CostTypeId:"",//费用ID
...@@ -1107,6 +1153,7 @@ ...@@ -1107,6 +1153,7 @@
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费 OriginalFee:"",//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[ detailList:[
{ {
CostTypeId:"",//费用ID CostTypeId:"",//费用ID
...@@ -1122,6 +1169,7 @@ ...@@ -1122,6 +1169,7 @@
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:0,//原币手续费 OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[ detailList:[
{ {
CostTypeId:"",//费用ID CostTypeId:"",//费用ID
...@@ -1137,6 +1185,7 @@ ...@@ -1137,6 +1185,7 @@
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费 OriginalFee:"",//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[ detailList:[
{ {
CostTypeId:"",//费用ID CostTypeId:"",//费用ID
...@@ -1325,7 +1374,16 @@ ...@@ -1325,7 +1374,16 @@
}, },
monthAirTickets(){ monthAirTickets(){
return this.airTickets.detailList return this.airTickets.detailList
} },
monthGroundTotalCost(){
return this.ground.OriginalFee
},
monthVisaTotalCost(){
return this.visa.OriginalFee
},
monthAirTicketsTotalCost(){
return this.airTickets.OriginalFee
},
}, },
watch: { watch: {
ID: { ID: {
...@@ -1382,6 +1440,24 @@ ...@@ -1382,6 +1440,24 @@
this.sum(1) this.sum(1)
}, },
deep: true, deep: true,
},
monthGroundTotalCost:{
handler(val, oldVal) {
this.TotalCost(3)
},
deep: true,
},
monthVisaTotalCost:{
handler(val, oldVal) {
this.TotalCost(2)
},
deep: true,
},
monthAirTicketsTotalCost:{
handler(val, oldVal) {
this.TotalCost(1)
},
deep: true,
} }
}, },
mounted() { mounted() {
...@@ -1456,10 +1532,10 @@ ...@@ -1456,10 +1532,10 @@
AccountNumber:this.BillMaking.AccountNumber,//流水号 AccountNumber:this.BillMaking.AccountNumber,//流水号
TemplateId:this.BillMaking.TemplateId,//流程ID TemplateId:this.BillMaking.TemplateId,//流程ID
OtherType:this.BillMaking.OtherType,//默认=55 OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.obj.ReFinanceId,//订单ID ReFinanceId:this.obj.OrderId,//订单ID
ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款 ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款
GuestId:this.GuestId,//客人ID GuestId:this.GuestId,//客人ID
RelevanceFrId:this.BillMaking.RelevanceFrId, RelevanceFrId:this.obj.selectedType,//订单类型 1机票 2签证 3地接 4套餐 5其他
vorcherInos:[], vorcherInos:[],
detailList:[] detailList:[]
} }
...@@ -1470,6 +1546,7 @@ ...@@ -1470,6 +1546,7 @@
this.getCompany() this.getCompany()
this.admin_get_DepartmentGetList() this.admin_get_DepartmentGetList()
this.AccountType_post_GetList() this.AccountType_post_GetList()
this.Financial_post_GetCostTypeList()
} }
let $this = this; let $this = this;
setTimeout(() => { setTimeout(() => {
...@@ -1478,7 +1555,30 @@ ...@@ -1478,7 +1555,30 @@
}, },
methods: { methods: {
// 获取对应的银行类型
getReceivingAccount(value){
this.accountList.forEach(item=>{
if(item.ID==value){
this.BillMaking.BType = item.BankType
}
})
},
// 应收
TotalCost(num){
if(num=='1'){
this.airTickets.WBMoney = 0
this.airTickets.WBMoney = this.airTickets.TotalCost-this.airTickets.OriginalFee
}
if(num=='2'){
this.visa.WBMoney = 0
this.visa.WBMoney = this.visa.TotalCost-this.visa.OriginalFee
}
if(num=='3'){
this.ground.WBMoney = 0
this.ground.WBMoney = this.ground.TotalCost-this.ground.OriginalFee
}
},
// 合计
sum(num){ sum(num){
if(num=='1'){ if(num=='1'){
for(let i=0;i<this.airTickets.detailList.length;i++){ for(let i=0;i<this.airTickets.detailList.length;i++){
...@@ -1488,23 +1588,25 @@ ...@@ -1488,23 +1588,25 @@
let OriginalMoney = this.airTickets.detailList.map(item=>{ let OriginalMoney = this.airTickets.detailList.map(item=>{
return item.OriginalMoney return item.OriginalMoney
}) })
this.airTickets.WBMoney= 0 this.airTickets.TotalCost= 0
for(let j=0;j<OriginalMoney.length;j++){ for(let j=0;j<OriginalMoney.length;j++){
this.airTickets.WBMoney += OriginalMoney[j] this.airTickets.TotalCost += OriginalMoney[j]
} }
this.TotalCost(num)
} }
if(num=='2'){ if(num=='2'){
for(let i=0;i<this.visa.detailList.length;i++){ for(let i=0;i<this.visa.detailList.length;i++){
this.visa.detailList[i].OriginalMoney = this.visa.detailList[i].Number*this.visa.detailList[i].UnitPrice this.visa.detailList[i].OriginalMoney = this.visa.detailList[i].Number*this.visa.detailList[i].UnitPrice
} }
let OriginalMoney = this.visa.detailList.map(item=>{ let OriginalMoney = this.visa.detailList.map(item=>{
return item.OriginalMoney return item.OriginalMoney
}) })
this.visa.WBMoney= 0 this.visa.TotalCost= 0
for(let j=0;j<OriginalMoney.length;j++){ for(let j=0;j<OriginalMoney.length;j++){
this.visa.WBMoney += OriginalMoney[j] this.visa.TotalCost += OriginalMoney[j]
} }
this.TotalCost(num)
} }
if(num=='3'){ if(num=='3'){
for(let i=0;i<this.ground.detailList.length;i++){ for(let i=0;i<this.ground.detailList.length;i++){
...@@ -1514,21 +1616,28 @@ ...@@ -1514,21 +1616,28 @@
let OriginalMoney = this.ground.detailList.map(item=>{ let OriginalMoney = this.ground.detailList.map(item=>{
return item.OriginalMoney return item.OriginalMoney
}) })
this.ground.WBMoney= 0 this.ground.TotalCost= 0
for(let j=0;j<OriginalMoney.length;j++){ for(let j=0;j<OriginalMoney.length;j++){
this.ground.WBMoney += OriginalMoney[j] this.ground.TotalCost += OriginalMoney[j]
} }
this.TotalCost(num)
} }
}, },
// 删除 // 删除
deleteTypeList(item,index,num){ deleteTypeList(item,index,num){
this.airTickets.detailList.splice(index,1) if(num=='1'){
this.airTickets.detailList.splice(index,1)
}if(num=='2'){
this.visa.detailList.splice(index,1)
}if(num=='3'){
this.ground.detailList.splice(index,1)
}
}, },
// 添加 // 添加
addTypeList(item){ addTypeList(item){
let data = { let data = {
CostTypeId:item,//费用ID CostTypeId:"",//费用ID
Number:"",//数量 Number:"",//数量
UnitPrice:"",//单价 UnitPrice:"",//单价
OriginalMoney:"",//总金额 OriginalMoney:"",//总金额
...@@ -1544,6 +1653,19 @@ ...@@ -1544,6 +1653,19 @@
this.ground.detailList.push(data) this.ground.detailList.push(data)
} }
}, },
Financial_post_GetCostTypeList() { //获取支出费用类型
if(this.BillMaking.TemplateId){
this.apipost2('Financial_post_GetCostTypeList', {
ID: this.BillMaking.TemplateId
}, res => {
if (res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data;
}
}, err => {})
}
},
getAccountList() { //获取账户类型对应下的账户列表 getAccountList() { //获取账户类型对应下的账户列表
if(this.BillMaking.IsPublic){ if(this.BillMaking.IsPublic){
this.apipost2('FinancialInstitutions_post_GetALLAccountList', { this.apipost2('FinancialInstitutions_post_GetALLAccountList', {
...@@ -1909,21 +2031,23 @@ ...@@ -1909,21 +2031,23 @@
}, },
// 制单 // 制单
Financial_post_SetFinanceInfoForCRMIn(){ Financial_post_SetFinanceInfoForCRMIn(){
if(!this.BillMaking.TemplateId){ if(!this.BillMaking.TemplateId){
this.$message.warning('请选择流程'); this.$message.warning('请选择流程');
return return
} }
if(!this.BillMaking.IsPublic){ if(!this.BillMaking.IsPublic){
this.$message.warning('请选择账户类型'); this.$message.warning('请选择收款账户');
return return
} }
if(!this.BillMaking.AccountId){ if(!this.BillMaking.AccountId){
this.$message.warning('请选择账户'); this.$message.warning('请选择收款账号');
return return
} }
this.obj.checkList.indexOf('1')!=-1&&this.airTickets.detailList.forEach(item=>{ this.obj.checkList.indexOf('1')!=-1&&this.airTickets.detailList.forEach(item=>{
item.CostTypeId = this.obj.OrderType if(!item.CostTypeId){
this.$message.warning('请选择费用说明');
return
}
if(!item.Number){ if(!item.Number){
this.$message.warning('请输入机票数量'); this.$message.warning('请输入机票数量');
return return
...@@ -1938,7 +2062,10 @@ ...@@ -1938,7 +2062,10 @@
} }
}) })
this.obj.checkList.indexOf('2')!=-1&&this.visa.detailList.forEach(item=>{ this.obj.checkList.indexOf('2')!=-1&&this.visa.detailList.forEach(item=>{
item.CostTypeId = this.obj.OrderType if(!item.CostTypeId){
this.$message.warning('请选择费用说明');
return
}
if(!item.Number){ if(!item.Number){
this.$message.warning('请输入签证数量'); this.$message.warning('请输入签证数量');
return return
...@@ -1953,7 +2080,10 @@ ...@@ -1953,7 +2080,10 @@
} }
}) })
this.obj.checkList.indexOf('3')!=-1&&this.ground.detailList.forEach(item=>{ this.obj.checkList.indexOf('3')!=-1&&this.ground.detailList.forEach(item=>{
item.CostTypeId = this.obj.OrderType if(!item.CostTypeId){
this.$message.warning('请选择费用说明');
return
}
if(!item.Number){ if(!item.Number){
this.$message.warning('请输入地接数量'); this.$message.warning('请输入地接数量');
return return
...@@ -1979,7 +2109,7 @@ ...@@ -1979,7 +2109,7 @@
this.$message.warning('请输入地接手续费'); this.$message.warning('请输入地接手续费');
return return
} }
if(this.BillMaking.vorcherInos==[]){ if(this.BillMaking.vorcherInos.length==0){
this.$message.warning('请上传凭证'); this.$message.warning('请上传凭证');
return return
} }
...@@ -1988,7 +2118,7 @@ ...@@ -1988,7 +2118,7 @@
return return
} }
if(!this.BillMaking.TradeDate){ if(!this.BillMaking.TradeDate){
this.$message.warning('请选择交易日期'); this.$message.warning('请选择汇款时间');
return return
} }
if(!this.BillMaking.TradeDate){ if(!this.BillMaking.TradeDate){
...@@ -2070,10 +2200,17 @@ ...@@ -2070,10 +2200,17 @@
} }
this.msgList.push(this.BillMaking) this.msgList.push(this.BillMaking)
} }
console.log(this.msgList,'----')
return
this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{ this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{
console.log(this.msgList,'----') if (res.data.resultCode == 1) {
this.clickShow = false
this.dialogTableVisible = false;
this.$message.success("操作成功");
this.MsgBus.$emit("closeBillMaking");
this.msgList=[]
} else {
this.clickShow = false
this.$message.error(res.data.message);
}
}) })
}, },
submitForm(addMsg) { submitForm(addMsg) {
...@@ -2119,6 +2256,7 @@ ...@@ -2119,6 +2256,7 @@
}); });
} }
if(this.name=='制单'){ if(this.name=='制单'){
this.clickShow = true
this.Financial_post_SetFinanceInfoForCRMIn() this.Financial_post_SetFinanceInfoForCRMIn()
} }
......
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