Skip to content

S
SuperMan
Commit 24214c71 authored by 王悦's avatar 王悦
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 8979400e 2f15c7a4
Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 44 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 24214c71
...@@ -1008,13 +1008,21 @@ ...@@ -1008,13 +1008,21 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </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-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="平台订单号" prop="PlatformOrder"> <el-form-item label="平台订单号" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' <el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods'
:disabled="isAllowUpdate==0"></el-input> :disabled="isAllowUpdate==0"></el-input>
</el-form-item> </el-form-item>
</el-col> </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-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input> <el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item> </el-form-item>
...@@ -1031,7 +1039,7 @@ ...@@ -1031,7 +1039,7 @@
<el-form-item label="交易日期" prop="TradeDate"> <el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
...@@ -1790,6 +1798,7 @@ ...@@ -1790,6 +1798,7 @@
ClientSource: '', ClientSource: '',
BrandId: '', BrandId: '',
TradeWay: '2', TradeWay: '2',
PlatformAccount:'',
PlatformOrder: '', PlatformOrder: '',
GuestNum: 0, GuestNum: 0,
IsChildrenTour: '0', IsChildrenTour: '0',
...@@ -1889,6 +1898,7 @@ ...@@ -1889,6 +1898,7 @@
ssptList: [], ssptList: [],
jyfsList: [], jyfsList: [],
ScenicRefundList: [], ScenicRefundList: [],
PlatformAccountList:[],
ScenicRefundMoney: 0, ScenicRefundMoney: 0,
//显示修改业务员 //显示修改业务员
showChangeSales: false, showChangeSales: false,
...@@ -2307,6 +2317,17 @@ ...@@ -2307,6 +2317,17 @@
this.getTotalPrice() this.getTotalPrice()
this.getTicheng() 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) { getScenicRefund (TCID) {
this.apipost( this.apipost(
'sellorder_get_GetScenicRefundList', 'sellorder_get_GetScenicRefundList',
...@@ -2387,7 +2408,9 @@ ...@@ -2387,7 +2408,9 @@
let x = res.data.data.model let x = res.data.data.model
this.addMsg = x this.addMsg = x
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr
this.addMsg.PlatformAccount = ''
this.getScenicRefund(obj.tcid) this.getScenicRefund(obj.tcid)
this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount);
this.SetOutCityId = res.data.data.SetOutCityId this.SetOutCityId = res.data.data.SetOutCityId
this.reOutCityId = res.data.data.SetBackCityId this.reOutCityId = res.data.data.SetBackCityId
this.addMsg.CustomerType = x.CustomerType.toString() this.addMsg.CustomerType = x.CustomerType.toString()
...@@ -2403,6 +2426,7 @@ ...@@ -2403,6 +2426,7 @@
this.addMsg.BabyNum = x.BabyNum.toString() this.addMsg.BabyNum = x.BabyNum.toString()
this.IsChildrenTour = x.IsChildrenTour this.IsChildrenTour = x.IsChildrenTour
this.IsBirdDiscount = x.IsBirdDiscount this.IsBirdDiscount = x.IsBirdDiscount
this.stratPrice = res.data.data.modelPrice.GoAddPrice this.stratPrice = res.data.data.modelPrice.GoAddPrice
if (this.stratPrice == 0) { if (this.stratPrice == 0) {
...@@ -2807,6 +2831,9 @@ ...@@ -2807,6 +2831,9 @@
} }
this.getHouseNo() this.getHouseNo()
}, },
changeSelect: function (){
this.$forceUpdate()
},
yzBigBed1 () { yzBigBed1 () {
let x = let x =
Number(this.addMsg.AirticketNum) + Number(this.addMsg.AirticketNum) +
...@@ -2919,6 +2946,7 @@ ...@@ -2919,6 +2946,7 @@
this.addMsg.Commission = '0' this.addMsg.Commission = '0'
this.addMsg.BrandId = '' this.addMsg.BrandId = ''
this.addMsg.TradeWay = '2' this.addMsg.TradeWay = '2'
this.addMsg.PlatformAccount='';
this.addMsg.GuestNum = '0' this.addMsg.GuestNum = '0'
this.addMsg.IsChildrenTour = '0' this.addMsg.IsChildrenTour = '0'
this.addMsg.OrderId = '0' this.addMsg.OrderId = '0'
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 24214c71
...@@ -915,7 +915,7 @@ ...@@ -915,7 +915,7 @@
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input> <el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input>
</el-form-item> </el-form-item>
</el-col> </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-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input> <el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item> </el-form-item>
...@@ -932,7 +932,7 @@ ...@@ -932,7 +932,7 @@
<el-form-item label="交易日期" prop="TradeDate"> <el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
...@@ -1237,6 +1237,14 @@ ...@@ -1237,6 +1237,14 @@
:label='item.Name' :label='item.Name'
:value='item.Id' :value='item.Id'
:key='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="收款账户">
<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-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1246,7 +1254,7 @@ ...@@ -1246,7 +1254,7 @@
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input> <el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input>
</el-form-item> </el-form-item>
</el-col> </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-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input> <el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item> </el-form-item>
...@@ -1263,7 +1271,7 @@ ...@@ -1263,7 +1271,7 @@
<el-form-item label="交易日期" prop="TradeDate"> <el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
...@@ -2100,6 +2108,7 @@ export default { ...@@ -2100,6 +2108,7 @@ export default {
ClientSource: "", ClientSource: "",
BrandId: "", BrandId: "",
TradeWay: "2", TradeWay: "2",
PlatformAccount:'',
PlatformOrder: "", PlatformOrder: "",
GuestNum: 0, GuestNum: 0,
IsChildrenTour: "0", IsChildrenTour: "0",
...@@ -2233,6 +2242,7 @@ export default { ...@@ -2233,6 +2242,7 @@ export default {
ssptList: [], ssptList: [],
jyfsList: [], jyfsList: [],
ScenicRefundList: [], ScenicRefundList: [],
PlatformAccountList:[],
ScenicRefundMoney: 0, ScenicRefundMoney: 0,
isShowCancelOrder: false, isShowCancelOrder: false,
tuanInfo: {}, tuanInfo: {},
...@@ -2342,6 +2352,17 @@ export default { ...@@ -2342,6 +2352,17 @@ export default {
this.TCMsg.CommissionMinusRate = 100 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 () { submitTCMsg: function () {
this.apipost('sellorder_post_SetOrderCommission', this.TCMsg, res=>{ this.apipost('sellorder_post_SetOrderCommission', this.TCMsg, res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -2468,6 +2489,9 @@ export default { ...@@ -2468,6 +2489,9 @@ export default {
transferClose: function () { transferClose: function () {
this.transferData.show = false this.transferData.show = false
}, },
changeSelect: function (){
this.$forceUpdate()
},
transferSave: function () { transferSave: function () {
if (this.transferData.info.TCNUM.trim() === '') { if (this.transferData.info.TCNUM.trim() === '') {
this.$message.error('请输入团号或团队编号') this.$message.error('请输入团号或团队编号')
...@@ -2730,6 +2754,7 @@ export default { ...@@ -2730,6 +2754,7 @@ export default {
this.addMsg = x; this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr; this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid); this.getScenicRefund(obj.tcid);
this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount);
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString(); this.addMsg.CustomerType = x.CustomerType.toString();
...@@ -3318,6 +3343,7 @@ export default { ...@@ -3318,6 +3343,7 @@ export default {
this.addMsg.Commission = "0"; this.addMsg.Commission = "0";
this.addMsg.BrandId = ""; this.addMsg.BrandId = "";
this.addMsg.TradeWay = "2"; this.addMsg.TradeWay = "2";
this.addMsg.PlatformAccount='';
this.addMsg.GuestNum = "0"; this.addMsg.GuestNum = "0";
this.addMsg.IsChildrenTour = "0"; this.addMsg.IsChildrenTour = "0";
this.addMsg.OrderId = "0"; this.addMsg.OrderId = "0";
......
src/components/SalesModule/productQuery.vue
View file @ 24214c71
...@@ -426,12 +426,20 @@ ...@@ -426,12 +426,20 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </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-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="平台订单号" prop="PlatformOrder"> <el-form-item label="平台订单号" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' maxlength='20'></el-input> <el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' maxlength='20'></el-input>
</el-form-item> </el-form-item>
</el-col> </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-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input> <el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item> </el-form-item>
...@@ -448,7 +456,7 @@ ...@@ -448,7 +456,7 @@
<el-form-item label="交易日期" prop="TradeDate"> <el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
...@@ -916,6 +924,7 @@ ...@@ -916,6 +924,7 @@
ClientSource: '', ClientSource: '',
BrandId: '', BrandId: '',
TradeWay: '2', TradeWay: '2',
PlatformAccount:'',
PlatformOrder: '', PlatformOrder: '',
GuestNum: 0, GuestNum: 0,
IsChildrenTour: '0', IsChildrenTour: '0',
...@@ -1047,6 +1056,7 @@ ...@@ -1047,6 +1056,7 @@
}, },
otherRemark: '', otherRemark: '',
ScenicRefundList: [], ScenicRefundList: [],
PlatformAccountList: [],
ScenicRefundMoney: 0, ScenicRefundMoney: 0,
TCIDList: null, TCIDList: null,
tripObj: { tripObj: {
...@@ -1436,12 +1446,14 @@ ...@@ -1436,12 +1446,14 @@
tradeWayMethods() { tradeWayMethods() {
if (this.addMsg.TradeWay == 2) { if (this.addMsg.TradeWay == 2) {
this.addMsg.PlatformOrder = '' this.addMsg.PlatformOrder = ''
this.addMsg.PlatformAccount=''
this.addMsg.MinOrderPrice = 0 this.addMsg.MinOrderPrice = 0
this.addMsg.CostType = '' this.addMsg.CostType = ''
this.addMsg.TradeDate = '' this.addMsg.TradeDate = ''
} }
}, },
platformOrderMethods() { platformOrderMethods() {
return;
if (this.addMsg.PlatformOrder == '') { if (this.addMsg.PlatformOrder == '') {
this.addMsg.MinOrderPrice = 0 this.addMsg.MinOrderPrice = 0
this.addMsg.CostType = '' this.addMsg.CostType = ''
...@@ -1691,6 +1703,7 @@ ...@@ -1691,6 +1703,7 @@
this.addMsg.FSeatNum = '0' this.addMsg.FSeatNum = '0'
this.addMsg.Commission = '0' this.addMsg.Commission = '0'
this.addMsg.BrandId = '' this.addMsg.BrandId = ''
this.addMsg.PlatformAccount=''
this.addMsg.TradeWay = '2' this.addMsg.TradeWay = '2'
this.addMsg.GuestNum = '0' this.addMsg.GuestNum = '0'
this.addMsg.IsChildrenTour = '0' this.addMsg.IsChildrenTour = '0'
...@@ -1800,6 +1813,7 @@ ...@@ -1800,6 +1813,7 @@
this.addMsg.SonControlID = obj.SonControlID; this.addMsg.SonControlID = obj.SonControlID;
this.getMinPrice(obj.LineID); this.getMinPrice(obj.LineID);
this.getScenicRefund(obj.TCID); this.getScenicRefund(obj.TCID);
this.getPlatformAccount(obj.PlatformAccountTypeId);
this.clearMsg() this.clearMsg()
let str = '' let str = ''
if (obj.OtherPrice > 0) { if (obj.OtherPrice > 0) {
...@@ -1808,7 +1822,17 @@ ...@@ -1808,7 +1822,17 @@
this.addMsg.Remarks = str this.addMsg.Remarks = str
this.otherRemark = 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', { this.apipost('sellorder_get_GetScenicRefundList', {
TCID TCID
}, res => { }, res => {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 24214c71
...@@ -984,7 +984,7 @@ ...@@ -984,7 +984,7 @@
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input> <el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input>
</el-form-item> </el-form-item>
</el-col> </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-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input> <el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item> </el-form-item>
...@@ -1001,7 +1001,7 @@ ...@@ -1001,7 +1001,7 @@
<el-form-item label="交易日期" prop="TradeDate"> <el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="23"> <el-col :span="23">
...@@ -1277,12 +1277,20 @@ ...@@ -1277,12 +1277,20 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </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-col :span="4" v-if='addMsg.TradeWay==1'>
<el-form-item label="平台订单号" prop="PlatformOrder"> <el-form-item label="平台订单号" prop="PlatformOrder">
<el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input> <el-input v-model='addMsg.PlatformOrder' @input='platformOrderMethods' :disabled="isAllowUpdate==0"></el-input>
</el-form-item> </el-form-item>
</el-col> </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-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input> <el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
</el-form-item> </el-form-item>
...@@ -1299,7 +1307,7 @@ ...@@ -1299,7 +1307,7 @@
<el-form-item label="交易日期" prop="TradeDate"> <el-form-item label="交易日期" prop="TradeDate">
<el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="23"> <el-col :span="23">
...@@ -2206,6 +2214,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2206,6 +2214,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
ClientSource: "", ClientSource: "",
BrandId: "", BrandId: "",
TradeWay: "2", TradeWay: "2",
PlatformAccount:'',
PlatformOrder: "", PlatformOrder: "",
GuestNum: 0, GuestNum: 0,
IsChildrenTour: "0", IsChildrenTour: "0",
...@@ -2380,6 +2389,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2380,6 +2389,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
//交易方式 //交易方式
jyfsList: [], jyfsList: [],
ScenicRefundList: [], ScenicRefundList: [],
PlatformAccountList:[],
ScenicRefundMoney: 0, ScenicRefundMoney: 0,
//费用类型 //费用类型
fylxList: [], fylxList: [],
...@@ -2592,6 +2602,17 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2592,6 +2602,17 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
this.$message.info("已取消！"); 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) { getUnionTravelPrice(obj, type) {
let msg = {}; let msg = {};
msg.TCID = obj.TCID; msg.TCID = obj.TCID;
...@@ -2692,6 +2713,9 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2692,6 +2713,9 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
}); });
} }
}, },
changeSelect: function (){
this.$forceUpdate()
},
ScenicRefundMethods() { ScenicRefundMethods() {
if (this.addMsg.ScenicRefundArr.length == 0) { if (this.addMsg.ScenicRefundArr.length == 0) {
this.ScenicRefundMoney = 0; this.ScenicRefundMoney = 0;
...@@ -2788,6 +2812,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2788,6 +2812,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
this.addMsg = x; this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr; this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid); this.getScenicRefund(obj.tcid);
this.getPlatformAccount(obj.PlatformAccountTypeId,obj.PlatformAccount);
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString(); this.addMsg.CustomerType = x.CustomerType.toString();
...@@ -3261,6 +3286,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -3261,6 +3286,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
this.addMsg.Commission = "0"; this.addMsg.Commission = "0";
this.addMsg.BrandId = ""; this.addMsg.BrandId = "";
this.addMsg.TradeWay = "2"; this.addMsg.TradeWay = "2";
this.addMsg.PlatformAccount='';
this.addMsg.GuestNum = "0"; this.addMsg.GuestNum = "0";
this.addMsg.IsChildrenTour = "0"; this.addMsg.IsChildrenTour = "0";
this.addMsg.OrderId = "0"; this.addMsg.OrderId = "0";
......
src/components/commonPage/payURL.vue
View file @ 24214c71
...@@ -124,7 +124,9 @@ ...@@ -124,7 +124,9 @@
"companyID":obj.outBranchId, "companyID":obj.outBranchId,
"path": "", "path": "",
'blank':'y', 'blank':'y',
'orderObj':JSON.stringify(orderObj) 'orderObj':JSON.stringify(orderObj),
'tradeWay':obj.tradeWay,
'platformAccount':obj.platformAccount
} }
}); });
} else if (this.value === '3') { } else if (this.value === '3') {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 24214c71
...@@ -228,11 +228,11 @@ ...@@ -228,11 +228,11 @@
<br/> <br/>
<el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button> <el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button>
<el-popover placement="bottom" width="300" trigger="click"> <el-popover placement="bottom" width="300" trigger="click">
<el-input class='mt10' v-model='NumObj.newCombinationNum' type='textarea'></el-input> <el-input class='mt10' v-model='NumObj.DMCNum' type='textarea'></el-input>
<p class="alcenter mt10"> <p class="alcenter mt10">
<input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" /> <input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
</p> </p>
<el-button type="primary" slot="reference" @click='ClickNumItem(outItem.NewCombinationNum,outItem.TCIDs)' <el-button type="primary" slot="reference" @click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;">地接团号</el-button> style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;">地接团号</el-button>
</el-popover> </el-popover>
</el-button-group> </el-button-group>
...@@ -243,6 +243,7 @@ ...@@ -243,6 +243,7 @@
<td colspan="20" style="text-align: left!important;padding:0 20px;"> <td colspan="20" style="text-align: left!important;padding:0 20px;">
<div class="link"> <div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div> <div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div> <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
</div> </div>
...@@ -285,7 +286,7 @@ ...@@ -285,7 +286,7 @@
colspanTotal: 0, colspanTotal: 0,
//地接团号对象 //地接团号对象
NumObj: { NumObj: {
newCombinationNum: "", DMCNum: "",
TCIDs: "" TCIDs: ""
} }
} }
...@@ -443,15 +444,22 @@ ...@@ -443,15 +444,22 @@
} }
}, err => {}) }, err => {})
}, },
ClickNumItem(newCombinationNum, tcids) { ClickNumItem(DMCNum,newCombinationNum, tcids) {
this.NumObj.newCombinationNum = newCombinationNum; if(DMCNum&& DMCNum!="")
{
this.NumObj.DMCNum = DMCNum;
}
else
{
this.NumObj.DMCNum = newCombinationNum;
}
this.NumObj.TCIDs = tcids; this.NumObj.TCIDs = tcids;
}, },
//保存地接团号 //保存地接团号
UpdateCombinationNum() { UpdateCombinationNum() {
this.loading = true; this.loading = true;
let msg = { let msg = {
newCombinationNum: this.NumObj.newCombinationNum, DMCNum: this.NumObj.DMCNum,
TCIDs: this.NumObj.TCIDs TCIDs: this.NumObj.TCIDs
}; };
this.apipost('dmcstatistics_post_UpdateCombinationNum', msg, res => { this.apipost('dmcstatistics_post_UpdateCombinationNum', msg, res => {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 24214c71
...@@ -642,12 +642,12 @@ ...@@ -642,12 +642,12 @@
<span class="TPbaseSet" style="width:62px;"></span> <span class="TPbaseSet" style="width:62px;"></span>
<span class="TPsecondTitle" style="width:66px;">op对外备注</span> <span class="TPsecondTitle" style="width:66px;">op对外备注</span>
</div> </div>
<div class="TPright" style="float:left;margin-left: 0"> <div class="TPright" style="float:left;">
<el-form-item> <el-form-item style="margin-top:-20px;">
<el-input v-model="priceData.OPRemark" type="textarea" :autosize="{minRows: 3, maxRows: 3 }" <el-input v-model="priceData.OPRemark" type="textarea" :autosize="{minRows: 3, maxRows: 3 }"
resize="none" class="w660" placeholder="op对外备注"></el-input> resize="none" class="w760" placeholder="op对外备注"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="!flagWangYue"> <el-form-item>
<div> <div>
<span class="TCSwitchtitle">订单操作</span> <span class="TCSwitchtitle">订单操作</span>
<span class="TCswitch"> <span class="TCswitch">
...@@ -657,7 +657,7 @@ ...@@ -657,7 +657,7 @@
</span> </span>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="!flagWangYue"> <el-form-item>
<div> <div>
<span class="TCSwitchtitle">同行在线预订</span> <span class="TCSwitchtitle">同行在线预订</span>
<span class="TCswitch"> <span class="TCswitch">
...@@ -668,7 +668,7 @@ ...@@ -668,7 +668,7 @@
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
<div class="TPright" style="float:left;" v-if="!flagWangYue"> <div class="TPright" style="float:left;">
<el-form-item> <el-form-item>
<div> <div>
<span class="TCSwitchtitle">报名候补</span> <span class="TCSwitchtitle">报名候补</span>
...@@ -773,7 +773,7 @@ ...@@ -773,7 +773,7 @@
priceShowCount: 6,//团期展示条数 priceShowCount: 6,//团期展示条数
flagWangYue:false, flagWangYue:false,
userID:null, userID:null,
dijiebaojiaShow:true, dijiebaojiaShow:false,
queryPriceListLoading:true, queryPriceListLoading:true,
queryPriceList:[], queryPriceList:[],
OfferTotalMoney:0, OfferTotalMoney:0,
......
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