Skip to content

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

1

parents 02e4b00e f86b3a7b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 876 additions and 763 deletions
src/components/DomesticModule/SettlementOrder.vue
View file @ a5330127
......@@ -37,6 +37,16 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</span>
</li>
<li>
<span>
<em>机票类别</em>
<el-select filterable v-model='msg.IsInter' >
<el-option label='全部' value='-1'></el-option>
<el-option label='国内机票' value='0'></el-option>
<el-option label='国际机票' value='1'></el-option>
</el-select>
</span>
</li>
<li>
<span>
......@@ -156,7 +166,8 @@ export default {
PageIndex:1,
pageSize:15,
sDate:'',
eDate:''
eDate:'',
IsInter:'-1'
},
dataList:[],
noData:false,
......@@ -275,7 +286,7 @@ export default {
},null)
},
method5: function() {
this.GetLocalFile("DomesticTicket_post_DownBill", {'Term':this.msg.Term,'Status':this.msg.Status,'sDate':this.msg.sDate,'eDate':this.msg.eDate},"历史账单.xls");
this.GetLocalFile("DomesticTicket_post_DownBill", {'Term':this.msg.Term,'Status':this.msg.Status,'sDate':this.msg.sDate,'eDate':this.msg.eDate,'emID':this.emID,'IsInter':this.msg.IsInter},"历史账单.xls");
} ,
resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1;
......
src/components/Hotel/roomReservationsDetails.vue
View file @ a5330127
......@@ -218,7 +218,12 @@ export default {
ID:item.NewHotelId
})
item.PayStyle=item.PayStyle.toString()
item.OrderDetailsList.forEach(x=>{
item.OrderDetailsList.forEach((x,index1)=>{
if(x.HouseTypeCount<=0){
x.HouseTypeCount = item.HouseStatistics.HouseTypeList[index1].HouseTypeCount.toString();
}else{
x.HouseTypeCount =x.HouseTypeCount.toString();
}
x.HouseTypeCount = x.HouseTypeCount.toString();
x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString();
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ a5330127
......@@ -13,6 +13,35 @@
<em>订单号</em><el-input v-model='msg.AirOrderId' class='w150'></el-input>
</span>
</li>
<li>
<span>
<em>报名公司</em>
<el-select class="w200" v-model="msg.RB_Branch_Id" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>人员选择</em>
</span>
<el-select
class="w200"
v-model="msg.EnterID"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option label="不限" value="-1"></el-option>
<el-option
v-for="item in employeeList"
:label="item.name"
:value="item.empId"
:key="item.empId"
></el-option>
</el-select>
</li>
<li>
<span>
<em>状态</em>
......@@ -143,7 +172,9 @@
<div>收款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">{{fina.PayMoney}}</span>
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.FinanceList==0">
暂无数据
</span>
......@@ -155,7 +186,9 @@
<div>付款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">{{fina.PayMoney}}</span>
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.RefundFinanceList==0">
暂无数据
</span>
......@@ -191,10 +224,45 @@ export default {
loading:false,
total:0,
currentPage: 1,
companyList:[],
employeeList:[],
};
},
components: {},
created(){
this.getEmployee();
this.getCompanyList();
},
methods: {
getEmployee() {
this.apipost(
"app_get_company_employee",
this.employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
},
err => {}
);
},
getCompanyList() {
let userInfo = this.getLocalStorage();
let RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
}
this.apipost('admin_get_BranchGetList', msg, res => {
if(res.data.resultCode == 1) {
this.companyList=res.data.data;
}
}, err => {})
},
goUrl: function (name, path, id ) {
this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
},
handleCurrentChange (val) {
this.msg.pageIndex = val
this.getList()
......@@ -211,7 +279,7 @@ export default {
res => {
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res);
// console.log(res);
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
} else {
......
src/components/commonPage/payURL.vue
View file @ a5330127
......@@ -132,17 +132,17 @@
} else if (this.value === '3') {
this.visible=false
let orderObj = {
OrderID:obj.orderId,
OrderSource:8,
OrderID:obj.orderId,//订单号
OrderSource:8,//12
Obj: {},
SourceID:obj.ID,
SourceID:obj.ID,//机票id
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":2,
"companyID":obj.outBranchId,
"companyID":obj.outBranchId,//公司id
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj)
......
src/plug/index.js
View file @ a5330127
......@@ -115,7 +115,12 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
<<<<<<< HEAD
domainUrl = "http://192.168.2.65:8025"; //214主域名
=======
domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.2.16:8083";
>>>>>>> f86b3a7beecb55955eae334e9c3e56a9f3e331ad
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "http://webapi.viitto.com";
}
......
src/router/config.js
View file @ a5330127
......@@ -1866,6 +1866,15 @@ export default {
title: '机票订单'
},
},
{ // 销售 散卖机票订单
path: '/BulkAirTicketOrders',
name: 'BulkAirTicketOrders',
component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
meta: {
title: '散卖机票订单'
},
},
{ // 销售 报名统计
path: '/enrollTotal',
name: 'enrollTotal',
......
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