Skip to content

S
SuperMan
Commit 56f0969d authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

'moming iasd'

parent 7b6ea734
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 587 additions and 991 deletions
src/components/DomesticModule/OrderToday.vue deleted 100644 → 0
View file @ 7b6ea734
This diff is collapsed.
src/components/DomesticModule/SettlementOrder.vue
View file @ 56f0969d
......@@ -57,6 +57,7 @@
<div class="_content">
<table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading = 'loading'>
<tr>
<th>机票类别</th>
<th>期数</th>
<th>应收金额</th>
<th>成本</th>
......@@ -65,9 +66,11 @@
<th>实付</th>
<th>待收金额</th>
<th>实际利润</th>
<th>操作人</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in dataList">
<td>{{item.IsInter==0?"国内机票":"国际机票"}}</td>
<td>{{item.Term}}</td>
<td>¥{{item.Money}}</td>
<td>¥{{item.Cost}}</td>
......@@ -109,17 +112,18 @@
<span v-if="item.Status!=0" :class="Math.abs(item.RealProfit)>0?'_color_red':''">¥{{Math.abs(item.RealProfit)}}</span>
<span v-else>-</span>
</td>
<td>{{item.EmName}}<br/>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" content="详情" placement="top">
<el-button type="danger" class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term)" circle>详</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="收款" placement="top">
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="收款" placement="top">
<el-button type="primary" class="_bth_bg_bl" @click="goUrlT(item,1)" circle>收</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="付款" placement="top">
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="付款" placement="top">
<el-button type="danger" class="_bth_bg_bgr" @click="goUrlT(item,2)" circle>付</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="确认" placement="top">
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="确认" placement="top">
<el-button v-if="item.Status==0" type="danger" class="_bth_bg_bl" @click="queren(item)" circle>确</el-button>
</el-tooltip>
</td>
......@@ -157,6 +161,7 @@ export default {
dataList:[],
noData:false,
total:0,
emID:0,
currentPage:1,
loading:true,
transactionDate:[],
......@@ -173,6 +178,7 @@ export default {
mounted(){
this.getList();
let userInfo = this.getLocalStorage();
this.emID=userInfo.EmployeeId;
this.RB_Branch_Id = userInfo.RB_Branch_id;
},
methods:{
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 56f0969d
......@@ -902,7 +902,7 @@ export default {
this.loading= true;
this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
let data = res.data.data.pageData.list;
this.total = res.data.data.count;
if(this.total==0){
this.DataList=[];
......
src/components/FinancialModule/ReportForm/YearReport.vue
View file @ 56f0969d
......@@ -793,7 +793,7 @@ export default {
if (field === "RemarkValue") return this.priceFormat(rowData.RemarkValue);
if (field === "NRemarkValue") return this.priceFormat(rowData.NRemarkValue);
},
priceFormat(value) {
priceFormat(value) {
if (value == null) {
return 0.0;
}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 56f0969d
......@@ -442,7 +442,7 @@
</div>
<div class="_submit">
<div class="chosenNextBox">
<div v-if='resultCode==11019'>
<div v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
<label>下一步：<span class="red">{{msg.AuditDescription}}</span></label>
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请选择下一步审批人" :remote-method="remoteMethod" :loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
......@@ -990,7 +990,7 @@ export default {
}
if (x.Type===4){
AccList.forEach(y=>{
if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池'){
if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'){
newAccList.push(y)
}
})
......
src/components/SalesModule/groupTourOrder.vue
View file @ 56f0969d
......@@ -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 @ 56f0969d
......@@ -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 @ 56f0969d
......@@ -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 @ 56f0969d
......@@ -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">
......@@ -1404,35 +1412,7 @@
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
</td>
<td>
<!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.ManNum}}人</span>
<span>儿童：{{item.ChirdNum}}人</span>
<span>老人：{{item.OldPeopleNum}}人</span>
<span>婴儿：{{item.BabyNum}}人</span>
<span>单地接：{{item.AirticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>姓名</th>
<th>护照</th>
<th>性别</th>
<th>年龄</th>
<th width="110">联系电话</th>
</tr>
<tr v-if='item.GuestList.length>0' v-for="(item2,index2) in item.GuestList" :key="index2">
<td>{{item2.userName}}</td>
<td>{{item2.passportNo}}</td>
<td>{{item2.sexStr}}</td>
<td>{{item2.age}}</td>
<td>{{item2.mobilePhone}}</td>
</tr>
<tr v-if='item.GuestList.length==0'>
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div> -->
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
......@@ -1506,6 +1486,7 @@
<el-tooltip effect="dark" content="更多" placement="top-start" style="float:left">
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="goToPassenger(item)">旅客名单</div>
<div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
......@@ -2233,6 +2214,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
ClientSource: "",
BrandId: "",
TradeWay: "2",
PlatformAccount:'',
PlatformOrder: "",
GuestNum: 0,
IsChildrenTour: "0",
......@@ -2407,6 +2389,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
//交易方式
jyfsList: [],
ScenicRefundList: [],
PlatformAccountList:[],
ScenicRefundMoney: 0,
//费用类型
fylxList: [],
......@@ -2619,6 +2602,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 +2713,9 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
});
}
},
changeSelect: function (){
this.$forceUpdate()
},
ScenicRefundMethods() {
if (this.addMsg.ScenicRefundArr.length == 0) {
this.ScenicRefundMoney = 0;
......@@ -2815,6 +2812,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 +3286,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";
......@@ -3975,6 +3974,23 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
tab: "团队收支明细"
}
});
},
//跳转到旅客名单
goToPassenger(item)
{
//passengerSaleList?id=11468&tcid=732&tcnum=NRT3U07190101A&isOrder=1&blank=y&tab=旅客名单
this.$router.push({
name: "passengerSaleList",
query: {
id: item.OrderId,
tcid: this.msg.TCID,
tcnum:this.ConfigData.Config.TCNUM,
isOrder:1,
blank: "y",
tab: "旅客名单"
}
});
}
},
mounted() {
......
src/components/commonPage/payURL.vue
View file @ 56f0969d
......@@ -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') {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 56f0969d
......@@ -228,11 +228,11 @@
<br/>
<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-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">
<input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
</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>
</el-popover>
</el-button-group>
......@@ -243,6 +243,7 @@
<td colspan="20" style="text-align: left!important;padding:0 20px;">
<div class="link">
<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[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
</div>
......@@ -285,7 +286,7 @@
colspanTotal: 0,
//地接团号对象
NumObj: {
newCombinationNum: "",
DMCNum: "",
TCIDs: ""
}
}
......@@ -443,15 +444,22 @@
}
}, err => {})
},
ClickNumItem(newCombinationNum, tcids) {
this.NumObj.newCombinationNum = newCombinationNum;
ClickNumItem(DMCNum,newCombinationNum, tcids) {
if(DMCNum&& DMCNum!="")
{
this.NumObj.DMCNum = DMCNum;
}
else
{
this.NumObj.DMCNum = newCombinationNum;
}
this.NumObj.TCIDs = tcids;
},
//保存地接团号
UpdateCombinationNum() {
this.loading = true;
let msg = {
newCombinationNum: this.NumObj.newCombinationNum,
DMCNum: this.NumObj.DMCNum,
TCIDs: this.NumObj.TCIDs
};
this.apipost('dmcstatistics_post_UpdateCombinationNum', msg, res => {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 56f0969d
......@@ -637,56 +637,56 @@
</div>
<div class="clearfix">
<div class="clearfix">
<div class="leftSetInfo">
<span class="TPbaseSet" style="width:62px;"></span>
<span class="TPsecondTitle" style="width:66px;">op对外备注</span>
</div>
<div class="TPright" style="float:left;margin-left: 0">
<el-form-item>
<div class="TPright" style="float:left;">
<el-form-item style="margin-top:-20px;">
<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 v-if="!flagWangYue">
<el-form-item>
<div>
<span class="TCSwitchtitle">订单操作</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsOrder" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后，业务人员将不能操作订单</div>
</span>
<el-switch v-model="priceData.IsOrder" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后，业务人员将不能操作订单</div>
</span>
</div>
</el-form-item>
<el-form-item v-if="!flagWangYue">
<el-form-item>
<div>
<span class="TCSwitchtitle">同行在线预订</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsB2B" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2B站点</div>
</span>
<el-switch v-model="priceData.IsB2B" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2B站点</div>
</span>
</div>
</el-form-item>
</div>
<div class="TPright" style="float:left;" v-if="!flagWangYue">
<div class="TPright" style="float:left;">
<el-form-item>
<div>
<span class="TCSwitchtitle">报名候补</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsSubstitution" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后不可超收人数</div>
</span>
<el-switch v-model="priceData.IsSubstitution" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">关闭后不可超收人数</div>
</span>
</div>
</el-form-item>
<el-form-item>
<div>
<span class="TCSwitchtitle">直客在线预订</span>
<span class="TCswitch">
<el-switch v-model="priceData.IsB2C" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2C站点</div>
</span>
<el-switch v-model="priceData.IsB2C" :active-value="inActive"
:inactive-value="notInActive"></el-switch>
<div class="TC-config">产品将会直接推送到B2C站点</div>
</span>
</div>
</el-form-item>
</div>
......@@ -773,7 +773,7 @@
priceShowCount: 6,//团期展示条数
flagWangYue:false,
userID:null,
dijiebaojiaShow:true,
dijiebaojiaShow:false,
queryPriceListLoading:true,
queryPriceList:[],
OfferTotalMoney:0,
......
src/router/config.js
View file @ 56f0969d
......@@ -2357,7 +2357,14 @@ export default {
meta: {
title: '年度营收报表'
},
}, { // 销售 制作广告
}, {
path: '/JumpReport',
name: 'JumpReport',
component: resolve => require(['@/components/FinancialModule/JumpReport'], resolve),
meta: {
title: '单据明细'
},
},{ // 销售 制作广告
path: '/advert',
name: 'advert',
component: resolve => require(['@/components/SalesModule/advert'], resolve),
......@@ -2739,6 +2746,21 @@ export default {
meta: {
title: '优惠券列表'
}
},
{
path: '/LuckyDraw',
name: 'LuckyDraw',
component: resolve => require(['@/components/activity/LuckyDraw'], resolve),
meta: {
title: '抽奖列表'
}
},{
path: '/awardList',
name: 'awardList',
component: resolve => require(['@/components/activity/awardList'], resolve),
meta: {
title: '奖项列表'
}
}
]
},
......
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