Skip to content

S
SuperMan
Commit 3ba23898 authored by liudong1993's avatar liudong1993
Browse files
Options

下单增加平台付款收款账户

parent d3f49ee4
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 14 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 3ba23898
......@@ -1008,13 +1008,21 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="收款账户">
<el-select filterable v-model='addMsg.PlatformAccount' @change="changeSelect">
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="平台订单号" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods'
:disabled="isAllowUpdate==0"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if="addMsg.TradeWay==1 && addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<!-- <el-col :span="4" v-if="addMsg.TradeWay==1 && addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
......@@ -1031,7 +1039,7 @@
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -1790,6 +1798,7 @@
ClientSource: '',
BrandId: '',
TradeWay: '2',
PlatformAccount:'',
PlatformOrder: '',
GuestNum: 0,
IsChildrenTour: '0',
......@@ -1889,6 +1898,7 @@
ssptList: [],
jyfsList: [],
ScenicRefundList: [],
PlatformAccountList:[],
ScenicRefundMoney: 0,
//显示修改业务员
showChangeSales: false,
......@@ -2307,6 +2317,17 @@
this.getTotalPrice()
this.getTicheng()
},
getPlatformAccount(typeIdtwo,platformAccount) {
let platBranchId=this.getLocalStorage().RB_Branch_id;
this.apipost('FinancialInstitutions_post_GetALLAccountList', {
TypeId: typeIdtwo,BranchId:platBranchId
}, res => {
if (res.data.resultCode == 1) {
this.PlatformAccountList = res.data.data;
this.addMsg.PlatformAccount=platformAccount;
}
}, err => {})
},
getScenicRefund (TCID) {
this.apipost(
'sellorder_get_GetScenicRefundList',
......@@ -2387,7 +2408,9 @@
let x = res.data.data.model
this.addMsg = x
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr
this.addMsg.PlatformAccount = ''
this.getScenicRefund(obj.tcid)
this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount);
this.SetOutCityId = res.data.data.SetOutCityId
this.reOutCityId = res.data.data.SetBackCityId
this.addMsg.CustomerType = x.CustomerType.toString()
......@@ -2403,6 +2426,7 @@
this.addMsg.BabyNum = x.BabyNum.toString()
this.IsChildrenTour = x.IsChildrenTour
this.IsBirdDiscount = x.IsBirdDiscount
this.stratPrice = res.data.data.modelPrice.GoAddPrice
if (this.stratPrice == 0) {
......@@ -2807,6 +2831,9 @@
}
this.getHouseNo()
},
changeSelect: function (){
this.$forceUpdate()
},
yzBigBed1 () {
let x =
Number(this.addMsg.AirticketNum) +
......@@ -2919,6 +2946,7 @@
this.addMsg.Commission = '0'
this.addMsg.BrandId = ''
this.addMsg.TradeWay = '2'
this.addMsg.PlatformAccount='';
this.addMsg.GuestNum = '0'
this.addMsg.IsChildrenTour = '0'
this.addMsg.OrderId = '0'
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 3ba23898
......@@ -915,7 +915,7 @@
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
......@@ -932,7 +932,7 @@
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -1241,12 +1241,20 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="收款账户">
<el-select filterable v-model='addMsg.PlatformAccount' @change="changeSelect">
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="平台订单号" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!=''">
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!=''">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
......@@ -1263,7 +1271,7 @@
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -2100,6 +2108,7 @@ export default {
ClientSource: "",
BrandId: "",
TradeWay: "2",
PlatformAccount:'',
PlatformOrder: "",
GuestNum: 0,
IsChildrenTour: "0",
......@@ -2233,6 +2242,7 @@ export default {
ssptList: [],
jyfsList: [],
ScenicRefundList: [],
PlatformAccountList:[],
ScenicRefundMoney: 0,
isShowCancelOrder: false,
tuanInfo: {},
......@@ -2342,6 +2352,17 @@ export default {
this.TCMsg.CommissionMinusRate = 100
}
},
getPlatformAccount(typeIdtwo,platformAccount) {
let platBranchId=this.getLocalStorage().RB_Branch_id;
this.apipost('FinancialInstitutions_post_GetALLAccountList', {
TypeId: typeIdtwo,BranchId:platBranchId
}, res => {
if (res.data.resultCode == 1) {
this.PlatformAccountList = res.data.data;
this.addMsg.PlatformAccount=platformAccount;
}
}, err => {})
},
submitTCMsg: function () {
this.apipost('sellorder_post_SetOrderCommission', this.TCMsg, res=>{
if (res.data.resultCode == 1) {
......@@ -2468,6 +2489,9 @@ export default {
transferClose: function () {
this.transferData.show = false
},
changeSelect: function (){
this.$forceUpdate()
},
transferSave: function () {
if (this.transferData.info.TCNUM.trim() === '') {
this.$message.error('请输入团号或团队编号')
......@@ -2730,6 +2754,7 @@ export default {
this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid);
this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount);
this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString();
......@@ -3318,6 +3343,7 @@ export default {
this.addMsg.Commission = "0";
this.addMsg.BrandId = "";
this.addMsg.TradeWay = "2";
this.addMsg.PlatformAccount='';
this.addMsg.GuestNum = "0";
this.addMsg.IsChildrenTour = "0";
this.addMsg.OrderId = "0";
......
src/components/SalesModule/productQuery.vue
View file @ 3ba23898
......@@ -426,12 +426,20 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="收款账户">
<el-select filterable v-model='addMsg.PlatformAccount' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="平台订单号" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' maxlength='20'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!=''">
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!=''">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
......@@ -448,7 +456,7 @@
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -916,6 +924,7 @@
ClientSource: '',
BrandId: '',
TradeWay: '2',
PlatformAccount:'',
PlatformOrder: '',
GuestNum: 0,
IsChildrenTour: '0',
......@@ -1047,6 +1056,7 @@
},
otherRemark: '',
ScenicRefundList: [],
PlatformAccountList: [],
ScenicRefundMoney: 0,
TCIDList: null,
tripObj: {
......@@ -1436,12 +1446,14 @@
tradeWayMethods() {
if (this.addMsg.TradeWay == 2) {
this.addMsg.PlatformOrder = ''
this.addMsg.PlatformAccount=''
this.addMsg.MinOrderPrice = 0
this.addMsg.CostType = ''
this.addMsg.TradeDate = ''
}
},
platformOrderMethods() {
return;
if (this.addMsg.PlatformOrder == '') {
this.addMsg.MinOrderPrice = 0
this.addMsg.CostType = ''
......@@ -1691,6 +1703,7 @@
this.addMsg.FSeatNum = '0'
this.addMsg.Commission = '0'
this.addMsg.BrandId = ''
this.addMsg.PlatformAccount=''
this.addMsg.TradeWay = '2'
this.addMsg.GuestNum = '0'
this.addMsg.IsChildrenTour = '0'
......@@ -1800,6 +1813,7 @@
this.addMsg.SonControlID = obj.SonControlID;
this.getMinPrice(obj.LineID);
this.getScenicRefund(obj.TCID);
this.getPlatformAccount(obj.PlatformAccountTypeId);
this.clearMsg()
let str = ''
if (obj.OtherPrice > 0) {
......@@ -1808,7 +1822,17 @@
this.addMsg.Remarks = str
this.otherRemark = str;
},
getScenicRefund(TCID) {
getPlatformAccount(typeIdtwo) {
let platBranchId=this.getLocalStorage().RB_Branch_id;
this.apipost('FinancialInstitutions_post_GetALLAccountList', {
TypeId: typeIdtwo,BranchId:platBranchId
}, res => {
if (res.data.resultCode == 1) {
this.PlatformAccountList = res.data.data
}
}, err => {})
},
getScenicRefundgetScenicRefund(TCID) {
this.apipost('sellorder_get_GetScenicRefundList', {
TCID
}, res => {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 3ba23898
......@@ -984,7 +984,7 @@
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
......@@ -1001,7 +1001,7 @@
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="23">
......@@ -1277,12 +1277,20 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="收款账户">
<el-select filterable v-model='addMsg.PlatformAccount' @change="changeSelect">
<el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="平台订单号" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item>
......@@ -1299,7 +1307,7 @@
<el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="23">
......@@ -2233,6 +2241,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
ClientSource: "",
BrandId: "",
TradeWay: "2",
PlatformAccount:'',
PlatformOrder: "",
GuestNum: 0,
IsChildrenTour: "0",
......@@ -2407,6 +2416,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
//交易方式
jyfsList: [],
ScenicRefundList: [],
PlatformAccountList:[],
ScenicRefundMoney: 0,
//费用类型
fylxList: [],
......@@ -2619,6 +2629,17 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
this.$message.info("已取消！");
});
},
getPlatformAccount(typeIdtwo,platformAccount) {
let platBranchId=this.getLocalStorage().RB_Branch_id;
this.apipost('FinancialInstitutions_post_GetALLAccountList', {
TypeId: typeIdtwo,BranchId:platBranchId
}, res => {
if (res.data.resultCode == 1) {
this.PlatformAccountList = res.data.data;
this.addMsg.PlatformAccount=platformAccount;
}
}, err => {})
},
getUnionTravelPrice(obj, type) {
let msg = {};
msg.TCID = obj.TCID;
......@@ -2719,6 +2740,9 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
});
}
},
changeSelect: function (){
this.$forceUpdate()
},
ScenicRefundMethods() {
if (this.addMsg.ScenicRefundArr.length == 0) {
this.ScenicRefundMoney = 0;
......@@ -2815,6 +2839,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid);
this.getPlatformAccount(obj.PlatformAccountTypeId,obj.PlatformAccount);
this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString();
......@@ -3288,6 +3313,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
this.addMsg.Commission = "0";
this.addMsg.BrandId = "";
this.addMsg.TradeWay = "2";
this.addMsg.PlatformAccount='';
this.addMsg.GuestNum = "0";
this.addMsg.IsChildrenTour = "0";
this.addMsg.OrderId = "0";
......
src/components/commonPage/payURL.vue
View file @ 3ba23898
......@@ -124,7 +124,9 @@
"companyID":obj.outBranchId,
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj)
'orderObj':JSON.stringify(orderObj),
'tradeWay':obj.tradeWay,
'platformAccount':obj.platformAccount
}
});
} else if (this.value === '3') {
......
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