Skip to content

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

1

parents 02e4b00e f86b3a7b
Hide whitespace changes
Inline Side-by-side
Showing with 876 additions and 763 deletions
src/components/DomesticModule/SettlementOrder.vue
View file @ a5330127
...@@ -37,7 +37,17 @@ ...@@ -37,7 +37,17 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </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> <li>
<span> <span>
<em>状态</em> <em>状态</em>
...@@ -156,7 +166,8 @@ export default { ...@@ -156,7 +166,8 @@ export default {
PageIndex:1, PageIndex:1,
pageSize:15, pageSize:15,
sDate:'', sDate:'',
eDate:'' eDate:'',
IsInter:'-1'
}, },
dataList:[], dataList:[],
noData:false, noData:false,
...@@ -275,7 +286,7 @@ export default { ...@@ -275,7 +286,7 @@ export default {
},null) },null)
}, },
method5: function() { 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() {//查询初始化页码 resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
......
src/components/Hotel/roomReservationsDetails.vue
View file @ a5330127
...@@ -218,7 +218,12 @@ export default { ...@@ -218,7 +218,12 @@ export default {
ID:item.NewHotelId ID:item.NewHotelId
}) })
item.PayStyle=item.PayStyle.toString() 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.HouseTypeCount = x.HouseTypeCount.toString();
x.UnitPrice = x.UnitPrice.toString(); x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString(); x.HotelDiscount = x.HotelDiscount.toString();
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ a5330127
...@@ -13,6 +13,35 @@ ...@@ -13,6 +13,35 @@
<em>订单号</em><el-input v-model='msg.AirOrderId' class='w150'></el-input> <em>订单号</em><el-input v-model='msg.AirOrderId' class='w150'></el-input>
</span> </span>
</li> </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> <li>
<span> <span>
<em>状态</em> <em>状态</em>
...@@ -143,7 +172,9 @@ ...@@ -143,7 +172,9 @@
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span style="cursor: default;"> <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 v-if="item.FinanceList==0">
暂无数据 暂无数据
</span> </span>
...@@ -155,7 +186,9 @@ ...@@ -155,7 +186,9 @@
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span style="cursor: default;"> <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 v-if="item.RefundFinanceList==0">
暂无数据 暂无数据
</span> </span>
...@@ -191,10 +224,45 @@ export default { ...@@ -191,10 +224,45 @@ export default {
loading:false, loading:false,
total:0, total:0,
currentPage: 1, currentPage: 1,
companyList:[],
employeeList:[],
}; };
}, },
components: {}, components: {},
created(){
this.getEmployee();
this.getCompanyList();
},
methods: { 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) { handleCurrentChange (val) {
this.msg.pageIndex = val this.msg.pageIndex = val
this.getList() this.getList()
...@@ -211,7 +279,7 @@ export default { ...@@ -211,7 +279,7 @@ export default {
res => { res => {
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res); // console.log(res);
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
} else { } else {
......
src/components/Ticketing/IndividualTicketOrderDetails.vue
View file @ a5330127
...@@ -4,14 +4,16 @@ ...@@ -4,14 +4,16 @@
<!-- 信息 --> <!-- 信息 -->
<div class="AirModel"> <div class="AirModel">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="7">
<p>{{AirModel.AirlineName}}</p> <p>{{AirModel.AirlineName}}</p>
<p><el-button type="primary" size="mini">{{AirModel.FreightSpaceStr}}</el-button></p> <p><el-button type="primary" size="mini">{{AirModel.FreightSpaceStr}}</el-button></p>
</el-col> </el-col>
<el-col :span="15"> <el-col :span="17">
<p v-for="item in AirModel.flightList" :key="item"> <p v-for="item in AirModel.flightList" :key="item.Flight_number">
<span class="air">{{item.Flight_number}} </span> <span class="air">{{item.Flight_number}} </span>
<span>{{item.FlightDate}} {{item.Departure_time}}{{item.DepartureName}} - {{item.AIATA}}{{item.ArrivalCityName}}</span> <span>{{item.FlightDate}} {{item.Departure_time}}({{item.DIATA}}){{item.DepartureName}}
<span v-if="item.StopoverName">-({{item.StopoverIATA}}){{item.StopoverName}}</span>
<span v-if="item.ArrivalCityName">- ({{item.AIATA}}){{item.ArrivalCityName}}</span></span>
</p> </p>
</el-col> </el-col>
</el-row> </el-row>
...@@ -112,7 +114,9 @@ ...@@ -112,7 +114,9 @@
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span style="cursor: default;"> <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 v-if="item.FinanceList==0">
暂无数据 暂无数据
</span> </span>
...@@ -124,7 +128,9 @@ ...@@ -124,7 +128,9 @@
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span style="cursor: default;"> <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 v-if="item.RefundFinanceList==0">
暂无数据 暂无数据
</span> </span>
...@@ -143,104 +149,109 @@ ...@@ -143,104 +149,109 @@
</p> </p>
</td> </td>
</tr> </tr>
<tbody v-show="toggle_status" v-for="item in CancelList" :key="item.ContactName"> <!-- 取消订单列表 -->
<tr> <tbody v-show="toggle_status" v-for="(item,index) in CancelList" :key="index">
<td>{{item.AirProductId}} </td> <tr>
<td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p> <td>{{item.AirProductId}} </td>
<!-- <p class="fz12">123456</p> --> <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
</td> <!-- <p class="fz12">123456</p> -->
<td>{{item.GuestNum}}</td> </td>
<td class="fz12">{{item.TC_Price}}</td> <td>{{item.GuestNum}}</td>
<td class="fz12">{{item.Unit_Price}}</td> <td class="fz12">{{item.TC_Price}}</td>
<td style="color:#FF9C00">{{item.PreferPrice}}</td> <td class="fz12">{{item.Unit_Price}}</td>
<td style="color:#FF9C00">{{item.Income}}</td> <td style="color:#FF9C00">{{item.PreferPrice}}</td>
<td>{{item.Refund}}</td> <td style="color:#FF9C00">{{item.Income}}</td>
<td>{{item.PlatformTax}}</td> <td>{{item.Refund}}</td>
<td> <td>{{item.PlatformTax}}</td>
<span v-if="item.Status==1">正常</span> <td>
<span v-if="item.Status==2">取消</span> <span v-if="item.Status==1">正常</span>
</td> <span v-if="item.Status==2">取消</span>
</tr> </td>
<tr style="height:20px"> </tr>
<td colspan="15" class="RL_Order" style="height:20px"> <tr style="height:20px">
<span class="RL-remarkTitle">名单:</span> <td colspan="15" class="RL_Order" style="height:20px">
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0"> <span class="RL-remarkTitle">名单:</span>
<span v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span> <span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<el-popover <span v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
placement="right" <el-popover
width="1000" placement="right"
trigger="click"> width="1000"
<el-table :data="item.GuestList"> trigger="click">
<el-table-column property="Id" label="排号"></el-table-column> <el-table :data="item.GuestList">
<el-table-column property="Name" label="姓名"></el-table-column> <el-table-column property="Id" label="排号"></el-table-column>
<el-table-column property="Sex" label="性别"> <el-table-column property="Name" label="姓名"></el-table-column>
<template slot-scope="scope"> <el-table-column property="Sex" label="性别">
<span v-if="scope.row.Sex=='1'">男</span> <template slot-scope="scope">
<span v-if="scope.row.Sex=='2'">女</span> <span v-if="scope.row.Sex=='1'">男</span>
</template> <span v-if="scope.row.Sex=='2'">女</span>
</el-table-column> </template>
<el-table-column property="Birthday" label="生日"></el-table-column> </el-table-column>
<el-table-column property="PassportNo" label="护照号码"></el-table-column> <el-table-column property="Birthday" label="生日"></el-table-column>
<el-table-column property="NationalityName" label="国籍"></el-table-column> <el-table-column property="PassportNo" label="护照号码"></el-table-column>
<el-table-column width="120" property="MobilePhone" label="手机号码"></el-table-column> <el-table-column property="NationalityName" label="国籍"></el-table-column>
<el-table-column width="120" property="MobilePhone" label="手机号码"></el-table-column>
<el-table-column property="AgeType" label="年龄类型">
<template slot-scope="scope"> <el-table-column property="AgeType" label="年龄类型">
<span v-if="scope.row.AgeType=='1'">成人</span> <template slot-scope="scope">
<span v-if="scope.row.AgeType=='2'">孩子</span> <span v-if="scope.row.AgeType=='1'">成人</span>
<span v-if="scope.row.AgeType=='3'">婴儿</span> <span v-if="scope.row.AgeType=='2'">孩子</span>
<span v-if="scope.row.AgeType=='4'">老人</span> <span v-if="scope.row.AgeType=='3'">婴儿</span>
</template> <span v-if="scope.row.AgeType=='4'">老人</span>
</el-table-column> </template>
</el-table> </el-table-column>
<span slot="reference"> </el-table>
<span style="cursor:pointer" v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span> <span slot="reference">
</span> <span style="cursor:pointer" v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
</el-popover> </span>
</span> </el-popover>
<span class="RL-redType RL-remarkCon" v-else> </span>
<span>暂无名单</span> <span class="RL-redType RL-remarkCon" v-else>
</span> <span>暂无名单</span>
</span>
</td>
</tr> </td>
<tr> </tr>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;"> <tr>
<div> <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<span>备注:</span> <div>
<p>{{item.Remarks}}</p> <span>备注:</span>
</div> <p>{{item.Remarks}}</p>
</div> </div>
</td> </div>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;"> </td>
<div> <td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div>收款单据：</div> <div>
<div> <div>收款单据：</div>
<span style="cursor: default;"> <div>
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">{{fina.PayMoney}}</span> <span style="cursor: default;">
<span v-if="item.FinanceList==0"> <span class="tickets_green" v-for="fina in item.FinanceList" :key="fina.FrID">
暂无数据 <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span> </span>
</span> <span v-if="item.FinanceList==0">
暂无数据
</div> </span>
</div> </span>
<div>
<div>付款单据：</div> </div>
<div> </div>
<span style="cursor: default;"> <div>
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">{{fina.PayMoney}}</span> <div>付款单据：</div>
<span v-if="item.RefundFinanceList==0"> <div>
暂无数据 <span style="cursor: default;">
</span> <span class="tickets_green" v-for="fina in item.RefundFinanceList" :key="fina.FrID">
</span> <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</div> </span>
</div> <span v-if="item.RefundFinanceList==0">
</td> 暂无数据
</tr> </span>
</tbody> </span>
</div>
</div>
</td>
</tr>
</tbody>
</table> </table>
</div> </div>
...@@ -251,780 +262,784 @@ ...@@ -251,780 +262,784 @@
export default { export default {
data() { data() {
return { return {
activeName: 'first', activeName: "first",
msg: { msg: {
AirProductId:'', AirProductId: ""
}, },
dataList:[], dataList: [],
loading:false, loading: false,
AirModel:{}, AirModel: {},
CancelList:[], CancelList: [],
toggle_status:false, toggle_status: false,
toggle_title:"展开", toggle_title: "展开"
}; };
}, },
components: {}, components: {},
created(){ created() {
var id = this.$route.query.ID; var id = this.$route.query.ID;
if (id) { if (id) {
this.msg.AirProductId = id; this.msg.AirProductId = id;
this.getList(); this.getList();
} }
}, },
methods: { methods: {
Toggle(){ goUrl: function (name, path, id ) {
this.toggle_status=!this.toggle_status; this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
if(this.toggle_status){ },
this.toggle_title="关闭" Toggle() {
}else{ this.toggle_status = !this.toggle_status;
this.toggle_title="展开" if (this.toggle_status) {
} this.toggle_title = "关闭";
} else {
}, this.toggle_title = "展开";
}
},
getList() { getList() {
this.loading=true; this.loading = true;
this.apipost( this.apipost(
"ticket_get_GetScatteringOrderForAirTicketList", "ticket_get_GetScatteringOrderForAirTicketList",
this.msg, this.msg,
res => { res => {
console.log(res); // console.log(res);
this.loading=false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.total = res.data.data.count; this.dataList = res.data.data.NorList;
this.dataList = res.data.data.NorList; this.AirModel = res.data.data.AirModel;
this.AirModel=res.data.data.AirModel; this.CancelList = res.data.data.CancelList;
this.CancelList=res.data.data.CancelList;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
err => {} err => {}
); );
}, }
}, }
}; };
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/newTravelManager.css"; @import "../../assets/css/newTravelManager.css";
.tickets_green { .tickets_green {
color: #008000; color: #008000;
text-decoration: underline; text-decoration: underline;
margin-right: 6px; margin-right: 6px;
} cursor: pointer;
.groupTourOrderSearchTable tr:first-child td:first-child{ }
border-bottom:none; .groupTourOrderSearchTable tr:first-child td:first-child {
} border-bottom: none;
.AirModel{ }
font-size: 14px; .AirModel {
width: 500px; font-size: 14px;
margin-bottom:15px; width: 560px;
font-weight: 400; margin-bottom: 15px;
padding: 6px; font-weight: 400;
height: 100%; padding: 6px;
border: 1px solid #e6e6e6; height: 100%;
background-color: #ffffff; border: 1px solid #e6e6e6;
color: #221515; background-color: #ffffff;
border-radius: 6px; color: #221515;
} border-radius: 6px;
.AirModel .air{ }
color: #ff0066; .AirModel .air {
font-weight: bold; color: #ff0066;
} font-weight: bold;
}
.AirModel p{
padding:6px 0;
}
.title_tr th{
width:10%;
}
.color_red_order {
color: #e95252 !important;
}
.groupTourOrderSearch { .AirModel p {
width: 100%; padding: 6px 0;
min-height: auto; }
padding: 0 0 20px 0; .title_tr th {
} width: 10%;
}
.color_red_order {
color: #e95252 !important;
}
.groupTourOrderSearch li { .groupTourOrderSearch {
float: left; width: 100%;
font-size: 12px; min-height: auto;
color: #666; padding: 0 0 20px 0;
margin: 20px 0 0px 0; }
}
.groupTourOrderSearch li > span { .groupTourOrderSearch li {
display: inline-block; float: left;
} font-size: 12px;
color: #666;
margin: 20px 0 0px 0;
}
.groupTourOrderSearch li span > em { .groupTourOrderSearch li > span {
display: inline-block; display: inline-block;
min-width: 60px; }
text-align: right;
font-style: normal;
margin: 0 12px 0 0;
}
.groupTourOrderSearch li:last-child { .groupTourOrderSearch li span > em {
position: fixed; display: inline-block;
z-index: 10; min-width: 60px;
top: 36px; text-align: right;
right: 20px; font-style: normal;
} margin: 0 12px 0 0;
}
.groupTourOrderSearch ul { .groupTourOrderSearch li:last-child {
overflow: hidden; position: fixed;
} z-index: 10;
top: 36px;
right: 20px;
}
.groupTourOrderSearchTable { .groupTourOrderSearch ul {
width: 100%; overflow: hidden;
min-width: 1500px; }
font-size: 14px;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
.groupTourOrderSearchTable tbody tr:last-child { .groupTourOrderSearchTable {
/* border-bottom: 2px solid #333; */ width: 100%;
} min-width: 1500px;
font-size: 14px;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
.groupTourOrderSearchTable tr:first-child td:first-child { .groupTourOrderSearchTable tbody tr:last-child {
/* border-bottom: 2px solid #333; */ /* border-bottom: 2px solid #333; */
} }
.groupTourOrderSearchTable tbody { .groupTourOrderSearchTable tr:first-child td:first-child {
/* border-bottom: 2px solid #333; */
}
} .groupTourOrderSearchTable tbody {
}
.groupTourOrderSearchTable tr th { .groupTourOrderSearchTable tr th {
background: #e6e6e6; background: #e6e6e6;
height: 30px; height: 30px;
font-size: 12px; font-size: 12px;
text-align: left; text-align: left;
text-indent: 15px; text-indent: 15px;
border-top: 1px solid #cccccc; border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc; border-left: 1px solid #cccccc;
} }
.groupTourOrderSearchTable tr { .groupTourOrderSearchTable tr {
background: #fff; background: #fff;
text-align: left; text-align: left;
} }
.groupTourOrderSearchTable tr td { .groupTourOrderSearchTable tr td {
/* height: 60px; */ /* height: 60px; */
padding: 10px; padding: 10px;
border-top: 1px solid #cccccc; border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc; border-left: 1px solid #cccccc;
} }
.groupTourOrderSearchTable tr td p { .groupTourOrderSearchTable tr td p {
line-height: 20px; line-height: 20px;
} }
.groupTourOrderSearchTable .dowloadSpan:hover { .groupTourOrderSearchTable .dowloadSpan:hover {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.groupTourOrderSearchTable span.personNo { .groupTourOrderSearchTable span.personNo {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.groupTourOrderSearchTable span.personNo:hover { .groupTourOrderSearchTable span.personNo:hover {
font-weight: bold; font-weight: bold;
color: #e95252; color: #e95252;
} }
.personNolayer p { .personNolayer p {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
padding-left: 15px; padding-left: 15px;
} }
.personNolayer p > span { .personNolayer p > span {
font-size: 12px; font-size: 12px;
color: #333; color: #333;
margin-right: 15px; margin-right: 15px;
} }
.personNolayer table { .personNolayer table {
padding: 10px 0 0 20px; padding: 10px 0 0 20px;
width: 100%; width: 100%;
background-color: #ededed; background-color: #ededed;
border-collapse: collapse; border-collapse: collapse;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
font-size: 12px; font-size: 12px;
} }
.personNolayer table th { .personNolayer table th {
background-color: #ededed; background-color: #ededed;
height: 34px; height: 34px;
text-indent: 15px; text-indent: 15px;
} }
.personNolayer table td { .personNolayer table td {
background-color: #ffffff; background-color: #ffffff;
padding: 9px 15px; padding: 9px 15px;
color: #333333; color: #333333;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
.personNolayer table ._color_666 { .personNolayer table ._color_666 {
color: #666666; color: #666666;
} }
.personNolayer table tr._color_666 th { .personNolayer table tr._color_666 th {
padding: 9px 15px; padding: 9px 15px;
} }
.groupSuperSearchLayer { .groupSuperSearchLayer {
} }
.groupSuperSearchLayer > p { .groupSuperSearchLayer > p {
padding: 20px 0; padding: 20px 0;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
font-weight: bold; font-weight: bold;
} }
.groupSuperSearchLayerTable { .groupSuperSearchLayerTable {
font-size: 12px; font-size: 12px;
color: #666; color: #666;
} }
.groupSuperSearchLayerTable tr { .groupSuperSearchLayerTable tr {
height: 50px; height: 50px;
} }
.groupSuperSearchLayerTable td { .groupSuperSearchLayerTable td {
padding-right: 15px; padding-right: 15px;
} }
.groupTourOrderIcon button { .groupTourOrderIcon button {
width: 30px; width: 30px;
height: 30px; height: 30px;
border-radius: 4px; border-radius: 4px;
} }
.groupTourOrderIcon .el-button--primary { .groupTourOrderIcon .el-button--primary {
padding: 5px; padding: 5px;
margin: 0; margin: 0;
font-size: 14px !important; font-size: 14px !important;
} }
.groupTourOrderIcon .el-button + .el-button { .groupTourOrderIcon .el-button + .el-button {
margin-left: 0 !important; margin-left: 0 !important;
} }
.productQuerybottomLayer { .productQuerybottomLayer {
overflow: auto; overflow: auto;
position: fixed; position: fixed;
min-height: 300px; min-height: 300px;
z-index: 50; z-index: 50;
bottom: 0; bottom: 0;
left: 0; left: 0;
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #ffffff; background-color: #ffffff;
padding: 10px 10px 0; padding: 10px 10px 0;
width: 100%; width: 100%;
} }
.productQuerybottomLayer .el-form-item__label { .productQuerybottomLayer .el-form-item__label {
font-size: 12px !important; font-size: 12px !important;
} }
.productQuerybottomLayer > p { .productQuerybottomLayer > p {
border-left: 3px solid #e95252; border-left: 3px solid #e95252;
text-indent: 15px; text-indent: 15px;
height: 16px; height: 16px;
font-family: "PingFangSc-Fine"; font-family: "PingFangSc-Fine";
font-size: 16px; font-size: 16px;
margin-bottom: 20px; margin-bottom: 20px;
line-height: 14px; line-height: 14px;
color: #000; color: #000;
} }
.productQuerybottomLayer .el-input-number { .productQuerybottomLayer .el-input-number {
width: auto !important; width: auto !important;
} }
.groupTourOrder_count_green { .groupTourOrder_count_green {
color: #1BC594; color: #1bc594;
} }
.groupTourOrder_count_blue { .groupTourOrder_count_blue {
color: #4D7AFD; color: #4d7afd;
} }
.groupTourOrder_count_yellow { .groupTourOrder_count_yellow {
color: #FF9C00; color: #ff9c00;
} }
.groupTourOrder_count_gray { .groupTourOrder_count_gray {
color: #999999; color: #999999;
} }
.groupTourOrder_count { .groupTourOrder_count {
margin: 0 0 20px 0; margin: 0 0 20px 0;
width: 100%; width: 100%;
height: auto; height: auto;
} }
.groupTourOrder_count_col { .groupTourOrder_count_col {
height: 80px; height: 80px;
} }
.groupTourOrder_count_item { .groupTourOrder_count_item {
font-weight: 400; font-weight: 400;
padding: 10px; padding: 10px;
height: 100%; height: 100%;
border: 1px solid #E6E6E6; border: 1px solid #e6e6e6;
background-color: #FFFFFF; background-color: #ffffff;
color: #333333; color: #333333;
} }
.groupTourOrder_count_item > div > i { .groupTourOrder_count_item > div > i {
font-size: 12px; font-size: 12px;
vertical-align: bottom; vertical-align: bottom;
} }
.groupTourOrder_count_item > div > span:nth-child(2) { .groupTourOrder_count_item > div > span:nth-child(2) {
font-size: 14px; font-size: 14px;
vertical-align: bottom; vertical-align: bottom;
} }
.groupTourOrder_count_item > div > span:nth-child(3) { .groupTourOrder_count_item > div > span:nth-child(3) {
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
vertical-align: bottom; vertical-align: bottom;
} }
.groupTourOrder_count_item > p { .groupTourOrder_count_item > p {
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
.groupTourOrder_count_item > p > span { .groupTourOrder_count_item > p > span {
margin: 0 5px 0 0; margin: 0 5px 0 0;
white-space: nowrap; white-space: nowrap;
} }
.groupTourOrder_more { .groupTourOrder_more {
margin: 0 -12px; margin: 0 -12px;
} }
.groupTourOrder_more > div { .groupTourOrder_more > div {
width: 100%; width: 100%;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
color: #333333; color: #333333;
background-color: #FFFFFF; background-color: #ffffff;
cursor: pointer; cursor: pointer;
} }
.groupTourOrder_more > div:hover { .groupTourOrder_more > div:hover {
color: #297BEF; color: #297bef;
background-color: #DCEBFF; background-color: #dcebff;
} }
.groupTourOrder_remarks { .groupTourOrder_remarks {
font-size: 0px; font-size: 0px;
} }
.groupTourOrder_remarks > div { .groupTourOrder_remarks > div {
} }
.groupTourOrder_remarks > div > div:nth-child(1) { .groupTourOrder_remarks > div > div:nth-child(1) {
float: left; float: left;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.groupTourOrder_remarks > div > div:nth-child(1) > span { .groupTourOrder_remarks > div > div:nth-child(1) > span {
line-height: 20px; line-height: 20px;
font-size: 12px; font-size: 12px;
color: #e95252; color: #e95252;
white-space: nowrap; white-space: nowrap;
} }
.groupTourOrder_remarks > div > div:nth-child(1) > p { .groupTourOrder_remarks > div > div:nth-child(1) > p {
line-height: 20px; line-height: 20px;
font-size: 12px; font-size: 12px;
color: #e95252; color: #e95252;
} }
.groupTourOrder_remarks > div > div:nth-child(2) { .groupTourOrder_remarks > div > div:nth-child(2) {
float: right; float: right;
text-align: right; text-align: right;
font-size: 12px; font-size: 12px;
color: #e95252; color: #e95252;
} }
.groupTourOrder_remarks > div > div:nth-child(2) > i { .groupTourOrder_remarks > div > div:nth-child(2) > i {
font-size: 10px; font-size: 10px;
cursor: pointer; cursor: pointer;
} }
.groupTourOrder_remarks > div::after { .groupTourOrder_remarks > div::after {
display: block; display: block;
clear: both; clear: both;
content: ""; content: "";
visibility: hidden; visibility: hidden;
height: 0; height: 0;
} }
.groupTourOrder_remarks_btn { .groupTourOrder_remarks_btn {
padding: 0px; padding: 0px;
width: 12px; width: 12px;
height: 12px; height: 12px;
border: none; border: none;
background-color: transparent; background-color: transparent;
} }
.groupTourOrder_remarks_btn > i { .groupTourOrder_remarks_btn > i {
color: #e95252; color: #e95252;
font-size: 12px; font-size: 12px;
} }
.groupTourOrder_remarks_popover > div { .groupTourOrder_remarks_popover > div {
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
color: #000000; color: #000000;
} }
.groupTourOrder_remarks_popover > div::before { .groupTourOrder_remarks_popover > div::before {
content: ''; content: "";
display: inline-block; display: inline-block;
margin: 0 5px 0 0; margin: 0 5px 0 0;
width: 2px; width: 2px;
height: 12px; height: 12px;
background-color: #e95252; background-color: #e95252;
} }
.groupTourOrder_remarks_popover > span { .groupTourOrder_remarks_popover > span {
display: block; display: block;
margin: 0 0 0 0; margin: 0 0 0 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
color: #000000; color: #000000;
} }
.groupTourOrder_remarks_popover > p { .groupTourOrder_remarks_popover > p {
margin: 5px 0 0 0; margin: 5px 0 0 0;
padding: 3px; padding: 3px;
width: 100%; width: 100%;
max-height: 300px; max-height: 300px;
overflow-y: auto; overflow-y: auto;
font-size: 12px; font-size: 12px;
color: #000000; color: #000000;
} }
.groupTourOrder_remarks_popover > p:nth-child(even) { .groupTourOrder_remarks_popover > p:nth-child(even) {
background-color: #E6E6E6; background-color: #e6e6e6;
} }
.groupTourOrder_remarks_popover > p > span:nth-child(1) { .groupTourOrder_remarks_popover > p > span:nth-child(1) {
float: left; float: left;
} }
.groupTourOrder_remarks_popover > p > span:nth-child(2) { .groupTourOrder_remarks_popover > p > span:nth-child(2) {
margin: 0 10px 0 0; margin: 0 10px 0 0;
float: right; float: right;
} }
.groupTourOrder_remarks_popover > p::after { .groupTourOrder_remarks_popover > p::after {
display: block; display: block;
clear: both; clear: both;
content: ""; content: "";
visibility: hidden; visibility: hidden;
height: 0; height: 0;
} }
.groupTourOrder_tickets > div { .groupTourOrder_tickets > div {
display: table; display: table;
} }
.groupTourOrder_tickets > div > div { .groupTourOrder_tickets > div > div {
display: table-cell; display: table-cell;
cursor: pointer; cursor: pointer;
} }
.groupTourOrder_tickets > div > div:nth-child(1) { .groupTourOrder_tickets > div > div:nth-child(1) {
width: 80px; width: 80px;
} }
.groupTourOrder_tickets > div > div > span { .groupTourOrder_tickets > div > div > span {
display: inline-block; display: inline-block;
margin: 0 10px 0 0; margin: 0 10px 0 0;
} }
.groupTourOrder_tickets_red { .groupTourOrder_tickets_red {
color: #FF0000; color: #ff0000;
text-decoration: underline; text-decoration: underline;
} }
.groupTourOrder_tickets_blue { .groupTourOrder_tickets_blue {
color: #0000FF; color: #0000ff;
text-decoration: underline; text-decoration: underline;
} }
.groupTourOrder_tickets_green { .groupTourOrder_tickets_green {
color: #008000; color: #008000;
text-decoration: underline; text-decoration: underline;
} }
.groupTourOrder_tickets_black { .groupTourOrder_tickets_black {
color: #000000; color: #000000;
text-decoration: underline; text-decoration: underline;
} }
.groupTourOrderByTuan_ico { .groupTourOrderByTuan_ico {
margin: 0 10px 0 0; margin: 0 10px 0 0;
} }
.groupTourOrderByTuan_ico > i { .groupTourOrderByTuan_ico > i {
display: inline-block; display: inline-block;
margin: 0 2px 0 0; margin: 0 2px 0 0;
width: 8px; width: 8px;
height: 8px; height: 8px;
border-radius: 2px; border-radius: 2px;
vertical-align: middle; vertical-align: middle;
} }
.groupTourOrderByTuan_ico > span { .groupTourOrderByTuan_ico > span {
vertical-align: middle; vertical-align: middle;
} }
/* 出团通知书打印选择 */ /* 出团通知书打印选择 */
.travelControlTripLayer { .travelControlTripLayer {
position: fixed; position: fixed;
z-index: 99; z-index: 99;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(0, 0, 0, 0.3); background: rgba(0, 0, 0, 0.3);
left: 0; left: 0;
top: 0; top: 0;
} }
.travelControlTripLayerCont { .travelControlTripLayerCont {
position: absolute; position: absolute;
left: 50%; left: 50%;
margin-left: -300px; margin-left: -300px;
background: #fff; background: #fff;
top: 50%; top: 50%;
margin-top: -180px; margin-top: -180px;
width: 600px; width: 600px;
} }
.travelControlTripLayerCont > div { .travelControlTripLayerCont > div {
padding: 0 30px; padding: 0 30px;
} }
.travelControlTripLayerCont > div label { .travelControlTripLayerCont > div label {
cursor: pointer; cursor: pointer;
vertical-align: middle; vertical-align: middle;
} }
.travelControlTripLayerCont > div label input { .travelControlTripLayerCont > div label input {
vertical-align: middle; vertical-align: middle;
} }
.travelControlTripBtn { .travelControlTripBtn {
color: #fff; color: #fff;
width: 90px; width: 90px;
height: 30px; height: 30px;
background: #E95252; background: #e95252;
border: 1px solid #E95252; border: 1px solid #e95252;
cursor: pointer; cursor: pointer;
border-radius: 15px; border-radius: 15px;
margin-left: 10px; margin-left: 10px;
} }
.travelControlTripLayer input[type="checkbox"] + label::before { .travelControlTripLayer input[type="checkbox"] + label::before {
content: "\A0"; content: "\A0";
display: inline-block; display: inline-block;
width: 15px; width: 15px;
height: 15px; height: 15px;
margin-right: 5px; margin-right: 5px;
border-radius: 4px; border-radius: 4px;
background-color: white; background-color: white;
text-indent: .15em; text-indent: 0.15em;
line-height: 15px; line-height: 15px;
color: white; color: white;
border: 1px solid #e95252; border: 1px solid #e95252;
} }
.travelControlTripLayer input[type="checkbox"]:checked + label::before { .travelControlTripLayer input[type="checkbox"]:checked + label::before {
content: "\2713"; content: "\2713";
background-color: #e95252; background-color: #e95252;
} }
.travelControlTripLayer input[type="checkbox"] { .travelControlTripLayer input[type="checkbox"] {
position: absolute; position: absolute;
clip: rect(0, 0, 0, 0); clip: rect(0, 0, 0, 0);
} }
.travelControlTripLayer input[type="checkbox"]:focus + label::before { .travelControlTripLayer input[type="checkbox"]:focus + label::before {
box-shadow: none; box-shadow: none;
} }
.travelControlTripLayer input[type="checkbox"]:disabled + label::before { .travelControlTripLayer input[type="checkbox"]:disabled + label::before {
background-color: gray; background-color: gray;
box-shadow: none; box-shadow: none;
color: #555; color: #555;
} }
.groupTourOrder_transfer { .groupTourOrder_transfer {
position: fixed; position: fixed;
z-index: 50; z-index: 50;
bottom: 0; bottom: 0;
left: 50px; left: 50px;
padding: 10px 10px; padding: 10px 10px;
width: 100%; width: 100%;
min-width: 1366px; min-width: 1366px;
min-height: 200px; min-height: 200px;
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #ffffff; background-color: #ffffff;
overflow-y: auto; overflow-y: auto;
} }
.groupTourOrder_transfer > .transfer_header { .groupTourOrder_transfer > .transfer_header {
position: relative; position: relative;
width: 100%; width: 100%;
height: 30px; height: 30px;
} }
.groupTourOrder_transfer > .transfer_header > div:nth-child(1) { .groupTourOrder_transfer > .transfer_header > div:nth-child(1) {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 10px;
width: 200px; width: 200px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
border-left: 3px solid #e95252; border-left: 3px solid #e95252;
text-indent: 10px; text-indent: 10px;
font-size: 16px; font-size: 16px;
color: #000000; color: #000000;
} }
.groupTourOrder_transfer > .transfer_header > div:nth-child(2) { .groupTourOrder_transfer > .transfer_header > div:nth-child(2) {
position: absolute; position: absolute;
top: 0px; top: 0px;
right: 80px; right: 80px;
height: 30px; height: 30px;
} }
.groupTourOrder_transfer > .transfer_header > div:nth-child(2) > div:nth-child(1) { .groupTourOrder_transfer
display: inline-block; > .transfer_header
padding: 0 15px; > div:nth-child(2)
height: 30px; > div:nth-child(1) {
line-height: 28px; display: inline-block;
font-size: 14px; padding: 0 15px;
color: #E95252; height: 30px;
border: 1px solid #E95252; line-height: 28px;
background: #fff; font-size: 14px;
border-radius: 15px; color: #e95252;
cursor: pointer; border: 1px solid #e95252;
vertical-align: top; background: #fff;
} border-radius: 15px;
cursor: pointer;
vertical-align: top;
}
.groupTourOrder_transfer > .transfer_header > div:nth-child(2) > div:nth-child(2) { .groupTourOrder_transfer
display: inline-block; > .transfer_header
margin: 0 0 0 10px; > div:nth-child(2)
padding: 0 15px; > div:nth-child(2) {
height: 30px; display: inline-block;
line-height: 28px; margin: 0 0 0 10px;
font-size: 14px; padding: 0 15px;
color: #fff; height: 30px;
border: 1px solid #E95252; line-height: 28px;
background: #E95252; font-size: 14px;
border-radius: 15px; color: #fff;
cursor: pointer; border: 1px solid #e95252;
vertical-align: top; background: #e95252;
} border-radius: 15px;
cursor: pointer;
vertical-align: top;
}
.groupTourOrder_transfer > .transfer_info { .groupTourOrder_transfer > .transfer_info {
padding: 20px 0; padding: 20px 0;
width: 100%; width: 100%;
font-size: 0px; font-size: 0px;
border-bottom: 1px dashed #999999; border-bottom: 1px dashed #999999;
} }
.groupTourOrder_transfer > .transfer_info > div { .groupTourOrder_transfer > .transfer_info > div {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 10px;
width: 25%; width: 25%;
height: 30px; height: 30px;
vertical-align: top; vertical-align: top;
} }
.groupTourOrder_transfer > .transfer_info > div > em { .groupTourOrder_transfer > .transfer_info > div > em {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 10px;
width: 35%; width: 35%;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
text-align: right; text-align: right;
font-size: 16px; font-size: 16px;
vertical-align: top; vertical-align: top;
} }
.groupTourOrder_transfer > .transfer_info > div > span { .groupTourOrder_transfer > .transfer_info > div > span {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 10px;
width: 65%; width: 65%;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
text-align: left; text-align: left;
font-size: 16px; font-size: 16px;
border-radius: 3px; border-radius: 3px;
background-color: #E5E5E5; background-color: #e5e5e5;
vertical-align: top; vertical-align: top;
} }
.groupTourOrder_transfer > .transfer_input { .groupTourOrder_transfer > .transfer_input {
padding: 20px 0; padding: 20px 0;
width: 100%; width: 100%;
font-size: 0px; font-size: 0px;
} }
.groupTourOrder_transfer > .transfer_input > div { .groupTourOrder_transfer > .transfer_input > div {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 10px;
width: 25%; width: 25%;
height: 30px; height: 30px;
vertical-align: top; vertical-align: top;
} }
.groupTourOrder_transfer > .transfer_input > div > em { .groupTourOrder_transfer > .transfer_input > div > em {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 10px;
width: 35%; width: 35%;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
text-align: right; text-align: right;
font-size: 16px; font-size: 16px;
vertical-align: top; vertical-align: top;
} }
.groupTourOrder_transfer > .transfer_input > div > .el-input { .groupTourOrder_transfer > .transfer_input > div > .el-input {
display: inline-block; display: inline-block;
width: 65%; width: 65%;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
text-align: left; text-align: left;
font-size: 14px; font-size: 14px;
vertical-align: top; vertical-align: top;
} }
</style> </style>
src/components/commonPage/payURL.vue
View file @ a5330127
...@@ -132,17 +132,17 @@ ...@@ -132,17 +132,17 @@
} else if (this.value === '3') { } else if (this.value === '3') {
this.visible=false this.visible=false
let orderObj = { let orderObj = {
OrderID:obj.orderId, OrderID:obj.orderId,//订单号
OrderSource:8, OrderSource:8,//12
Obj: {}, Obj: {},
SourceID:obj.ID, SourceID:obj.ID,//机票id
TCIDList: TCIDARR TCIDList: TCIDARR
} }
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query:{ query:{
"Type":2, "Type":2,
"companyID":obj.outBranchId, "companyID":obj.outBranchId,//公司id
"path": "", "path": "",
'blank':'y', 'blank':'y',
'orderObj':JSON.stringify(orderObj) 'orderObj':JSON.stringify(orderObj)
......
src/plug/index.js
View file @ a5330127
...@@ -115,7 +115,12 @@ export default { ...@@ -115,7 +115,12 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
<<<<<<< HEAD
domainUrl = "http://192.168.2.65:8025"; //214主域名 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) { if (locationName.indexOf('oytour')!==-1) {
domainUrl = "http://webapi.viitto.com"; domainUrl = "http://webapi.viitto.com";
} }
......
src/router/config.js
View file @ a5330127
...@@ -1866,6 +1866,15 @@ export default { ...@@ -1866,6 +1866,15 @@ export default {
title: '机票订单' title: '机票订单'
}, },
}, },
{ // 销售 散卖机票订单
path: '/BulkAirTicketOrders',
name: 'BulkAirTicketOrders',
component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
meta: {
title: '散卖机票订单'
},
},
{ // 销售 报名统计 { // 销售 报名统计
path: '/enrollTotal', path: '/enrollTotal',
name: '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