Skip to content

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

1

parents 02e4b00e f86b3a7b
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/Ticketing/IndividualTicketOrderDetails.vue
View file @ a5330127
......@@ -4,14 +4,16 @@
<!-- 信息 -->
<div class="AirModel">
<el-row>
<el-col :span="8">
<el-col :span="7">
<p>{{AirModel.AirlineName}}</p>
<p><el-button type="primary" size="mini">{{AirModel.FreightSpaceStr}}</el-button></p>
</el-col>
<el-col :span="15">
<p v-for="item in AirModel.flightList" :key="item">
<el-col :span="17">
<p v-for="item in AirModel.flightList" :key="item.Flight_number">
<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>
</el-col>
</el-row>
......@@ -112,7 +114,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>
......@@ -124,7 +128,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>
......@@ -143,7 +149,8 @@
</p>
</td>
</tr>
<tbody v-show="toggle_status" v-for="item in CancelList" :key="item.ContactName">
<!-- 取消订单列表 -->
<tbody v-show="toggle_status" v-for="(item,index) in CancelList" :key="index">
<tr>
<td>{{item.AirProductId}} </td>
<td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
......@@ -219,7 +226,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 in item.FinanceList" :key="fina.FrID">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.FinanceList==0">
暂无数据
</span>
......@@ -231,7 +240,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 in item.RefundFinanceList" :key="fina.FrID">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.RefundFinanceList==0">
暂无数据
</span>
......@@ -251,77 +262,76 @@
export default {
data() {
return {
activeName: 'first',
activeName: "first",
msg: {
AirProductId:'',
AirProductId: ""
},
dataList:[],
loading:false,
AirModel:{},
CancelList:[],
toggle_status:false,
toggle_title:"展开",
dataList: [],
loading: false,
AirModel: {},
CancelList: [],
toggle_status: false,
toggle_title: "展开"
};
},
components: {},
created(){
created() {
var id = this.$route.query.ID;
if (id) {
this.msg.AirProductId = id;
this.getList();
}
},
methods: {
Toggle(){
this.toggle_status=!this.toggle_status;
if(this.toggle_status){
this.toggle_title="关闭"
}else{
this.toggle_title="展开"
goUrl: function (name, path, id ) {
this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
},
Toggle() {
this.toggle_status = !this.toggle_status;
if (this.toggle_status) {
this.toggle_title = "关闭";
} else {
this.toggle_title = "展开";
}
},
getList() {
this.loading=true;
this.loading = true;
this.apipost(
"ticket_get_GetScatteringOrderForAirTicketList",
this.msg,
res => {
console.log(res);
this.loading=false;
// console.log(res);
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.NorList;
this.AirModel=res.data.data.AirModel;
this.CancelList=res.data.data.CancelList;
this.AirModel = res.data.data.AirModel;
this.CancelList = res.data.data.CancelList;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
},
}
}
};
</script>
<style scoped>
@import "../../assets/css/newTravelManager.css";
.tickets_green {
@import "../../assets/css/newTravelManager.css";
.tickets_green {
color: #008000;
text-decoration: underline;
margin-right: 6px;
cursor: pointer;
}
.groupTourOrderSearchTable tr:first-child td:first-child{
border-bottom:none;
}
.AirModel{
.groupTourOrderSearchTable tr:first-child td:first-child {
border-bottom: none;
}
.AirModel {
font-size: 14px;
width: 500px;
margin-bottom:15px;
width: 560px;
margin-bottom: 15px;
font-weight: 400;
padding: 6px;
height: 100%;
......@@ -329,59 +339,59 @@ export default {
background-color: #ffffff;
color: #221515;
border-radius: 6px;
}
.AirModel .air{
}
.AirModel .air {
color: #ff0066;
font-weight: bold;
}
}
.AirModel p{
padding:6px 0;
}
.title_tr th{
width:10%;
.AirModel p {
padding: 6px 0;
}
.title_tr th {
width: 10%;
}
.color_red_order {
.color_red_order {
color: #e95252 !important;
}
}
.groupTourOrderSearch {
.groupTourOrderSearch {
width: 100%;
min-height: auto;
padding: 0 0 20px 0;
}
}
.groupTourOrderSearch li {
.groupTourOrderSearch li {
float: left;
font-size: 12px;
color: #666;
margin: 20px 0 0px 0;
}
}
.groupTourOrderSearch li > span {
.groupTourOrderSearch li > span {
display: inline-block;
}
}
.groupTourOrderSearch li span > em {
.groupTourOrderSearch li span > em {
display: inline-block;
min-width: 60px;
text-align: right;
font-style: normal;
margin: 0 12px 0 0;
}
}
.groupTourOrderSearch li:last-child {
.groupTourOrderSearch li:last-child {
position: fixed;
z-index: 10;
top: 36px;
right: 20px;
}
}
.groupTourOrderSearch ul {
.groupTourOrderSearch ul {
overflow: hidden;
}
}
.groupTourOrderSearchTable {
.groupTourOrderSearchTable {
width: 100%;
min-width: 1500px;
font-size: 14px;
......@@ -389,21 +399,20 @@ export default {
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
}
.groupTourOrderSearchTable tbody tr:last-child {
.groupTourOrderSearchTable tbody tr:last-child {
/* border-bottom: 2px solid #333; */
}
}
.groupTourOrderSearchTable tr:first-child td:first-child {
.groupTourOrderSearchTable tr:first-child td:first-child {
/* border-bottom: 2px solid #333; */
}
.groupTourOrderSearchTable tbody {
}
}
.groupTourOrderSearchTable tbody {
}
.groupTourOrderSearchTable tr th {
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
......@@ -411,121 +420,121 @@ export default {
text-indent: 15px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.groupTourOrderSearchTable tr {
.groupTourOrderSearchTable tr {
background: #fff;
text-align: left;
}
}
.groupTourOrderSearchTable tr td {
.groupTourOrderSearchTable tr td {
/* height: 60px; */
padding: 10px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
}
.groupTourOrderSearchTable tr td p {
.groupTourOrderSearchTable tr td p {
line-height: 20px;
}
}
.groupTourOrderSearchTable .dowloadSpan:hover {
.groupTourOrderSearchTable .dowloadSpan:hover {
text-decoration: underline;
cursor: pointer;
}
}
.groupTourOrderSearchTable span.personNo {
.groupTourOrderSearchTable span.personNo {
text-decoration: underline;
cursor: pointer;
}
}
.groupTourOrderSearchTable span.personNo:hover {
.groupTourOrderSearchTable span.personNo:hover {
font-weight: bold;
color: #e95252;
}
}
.personNolayer p {
.personNolayer p {
height: 28px;
line-height: 28px;
padding-left: 15px;
}
}
.personNolayer p > span {
.personNolayer p > span {
font-size: 12px;
color: #333;
margin-right: 15px;
}
}
.personNolayer table {
.personNolayer table {
padding: 10px 0 0 20px;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
}
.personNolayer table th {
.personNolayer table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
}
.personNolayer table td {
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
}
.personNolayer table ._color_666 {
.personNolayer table ._color_666 {
color: #666666;
}
}
.personNolayer table tr._color_666 th {
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
}
.groupSuperSearchLayer {
}
.groupSuperSearchLayer {
}
.groupSuperSearchLayer > p {
.groupSuperSearchLayer > p {
padding: 20px 0;
font-size: 14px;
color: #333;
font-weight: bold;
}
}
.groupSuperSearchLayerTable {
.groupSuperSearchLayerTable {
font-size: 12px;
color: #666;
}
}
.groupSuperSearchLayerTable tr {
.groupSuperSearchLayerTable tr {
height: 50px;
}
}
.groupSuperSearchLayerTable td {
.groupSuperSearchLayerTable td {
padding-right: 15px;
}
}
.groupTourOrderIcon button {
.groupTourOrderIcon button {
width: 30px;
height: 30px;
border-radius: 4px;
}
}
.groupTourOrderIcon .el-button--primary {
.groupTourOrderIcon .el-button--primary {
padding: 5px;
margin: 0;
font-size: 14px !important;
}
}
.groupTourOrderIcon .el-button + .el-button {
.groupTourOrderIcon .el-button + .el-button {
margin-left: 0 !important;
}
}
.productQuerybottomLayer {
.productQuerybottomLayer {
overflow: auto;
position: fixed;
min-height: 300px;
......@@ -536,13 +545,13 @@ export default {
background-color: #ffffff;
padding: 10px 10px 0;
width: 100%;
}
}
.productQuerybottomLayer .el-form-item__label {
.productQuerybottomLayer .el-form-item__label {
font-size: 12px !important;
}
}
.productQuerybottomLayer > p {
.productQuerybottomLayer > p {
border-left: 3px solid #e95252;
text-indent: 15px;
height: 16px;
......@@ -551,177 +560,177 @@ export default {
margin-bottom: 20px;
line-height: 14px;
color: #000;
}
}
.productQuerybottomLayer .el-input-number {
.productQuerybottomLayer .el-input-number {
width: auto !important;
}
}
.groupTourOrder_count_green {
color: #1BC594;
}
.groupTourOrder_count_green {
color: #1bc594;
}
.groupTourOrder_count_blue {
color: #4D7AFD;
}
.groupTourOrder_count_blue {
color: #4d7afd;
}
.groupTourOrder_count_yellow {
color: #FF9C00;
}
.groupTourOrder_count_yellow {
color: #ff9c00;
}
.groupTourOrder_count_gray {
.groupTourOrder_count_gray {
color: #999999;
}
}
.groupTourOrder_count {
.groupTourOrder_count {
margin: 0 0 20px 0;
width: 100%;
height: auto;
}
}
.groupTourOrder_count_col {
.groupTourOrder_count_col {
height: 80px;
}
}
.groupTourOrder_count_item {
.groupTourOrder_count_item {
font-weight: 400;
padding: 10px;
height: 100%;
border: 1px solid #E6E6E6;
background-color: #FFFFFF;
border: 1px solid #e6e6e6;
background-color: #ffffff;
color: #333333;
}
}
.groupTourOrder_count_item > div > i {
.groupTourOrder_count_item > div > i {
font-size: 12px;
vertical-align: bottom;
}
}
.groupTourOrder_count_item > div > span:nth-child(2) {
.groupTourOrder_count_item > div > span:nth-child(2) {
font-size: 14px;
vertical-align: bottom;
}
}
.groupTourOrder_count_item > div > span:nth-child(3) {
.groupTourOrder_count_item > div > span:nth-child(3) {
font-weight: bold;
font-size: 16px;
vertical-align: bottom;
}
}
.groupTourOrder_count_item > p {
.groupTourOrder_count_item > p {
font-size: 12px;
line-height: 18px;
}
}
.groupTourOrder_count_item > p > span {
.groupTourOrder_count_item > p > span {
margin: 0 5px 0 0;
white-space: nowrap;
}
}
.groupTourOrder_more {
.groupTourOrder_more {
margin: 0 -12px;
}
}
.groupTourOrder_more > div {
.groupTourOrder_more > div {
width: 100%;
height: 30px;
line-height: 30px;
text-align: center;
font-size: 12px;
color: #333333;
background-color: #FFFFFF;
background-color: #ffffff;
cursor: pointer;
}
}
.groupTourOrder_more > div:hover {
color: #297BEF;
background-color: #DCEBFF;
}
.groupTourOrder_more > div:hover {
color: #297bef;
background-color: #dcebff;
}
.groupTourOrder_remarks {
.groupTourOrder_remarks {
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;
display: flex;
align-items: flex-start;
}
}
.groupTourOrder_remarks > div > div:nth-child(1) > span {
.groupTourOrder_remarks > div > div:nth-child(1) > span {
line-height: 20px;
font-size: 12px;
color: #e95252;
white-space: nowrap;
}
}
.groupTourOrder_remarks > div > div:nth-child(1) > p {
.groupTourOrder_remarks > div > div:nth-child(1) > p {
line-height: 20px;
font-size: 12px;
color: #e95252;
}
}
.groupTourOrder_remarks > div > div:nth-child(2) {
.groupTourOrder_remarks > div > div:nth-child(2) {
float: right;
text-align: right;
font-size: 12px;
color: #e95252;
}
}
.groupTourOrder_remarks > div > div:nth-child(2) > i {
.groupTourOrder_remarks > div > div:nth-child(2) > i {
font-size: 10px;
cursor: pointer;
}
}
.groupTourOrder_remarks > div::after {
.groupTourOrder_remarks > div::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
}
.groupTourOrder_remarks_btn {
.groupTourOrder_remarks_btn {
padding: 0px;
width: 12px;
height: 12px;
border: none;
background-color: transparent;
}
}
.groupTourOrder_remarks_btn > i {
.groupTourOrder_remarks_btn > i {
color: #e95252;
font-size: 12px;
}
}
.groupTourOrder_remarks_popover > div {
.groupTourOrder_remarks_popover > div {
display: inline-block;
font-size: 14px;
color: #000000;
}
}
.groupTourOrder_remarks_popover > div::before {
content: '';
.groupTourOrder_remarks_popover > div::before {
content: "";
display: inline-block;
margin: 0 5px 0 0;
width: 2px;
height: 12px;
background-color: #e95252;
}
}
.groupTourOrder_remarks_popover > span {
.groupTourOrder_remarks_popover > span {
display: block;
margin: 0 0 0 0;
width: 100%;
text-align: center;
font-size: 12px;
color: #000000;
}
}
.groupTourOrder_remarks_popover > p {
.groupTourOrder_remarks_popover > p {
margin: 5px 0 0 0;
padding: 3px;
width: 100%;
......@@ -729,86 +738,86 @@ export default {
overflow-y: auto;
font-size: 12px;
color: #000000;
}
}
.groupTourOrder_remarks_popover > p:nth-child(even) {
background-color: #E6E6E6;
}
.groupTourOrder_remarks_popover > p:nth-child(even) {
background-color: #e6e6e6;
}
.groupTourOrder_remarks_popover > p > span:nth-child(1) {
.groupTourOrder_remarks_popover > p > span:nth-child(1) {
float: left;
}
}
.groupTourOrder_remarks_popover > p > span:nth-child(2) {
.groupTourOrder_remarks_popover > p > span:nth-child(2) {
margin: 0 10px 0 0;
float: right;
}
}
.groupTourOrder_remarks_popover > p::after {
.groupTourOrder_remarks_popover > p::after {
display: block;
clear: both;
content: "";
visibility: hidden;
height: 0;
}
}
.groupTourOrder_tickets > div {
.groupTourOrder_tickets > div {
display: table;
}
}
.groupTourOrder_tickets > div > div {
.groupTourOrder_tickets > div > div {
display: table-cell;
cursor: pointer;
}
}
.groupTourOrder_tickets > div > div:nth-child(1) {
.groupTourOrder_tickets > div > div:nth-child(1) {
width: 80px;
}
}
.groupTourOrder_tickets > div > div > span {
.groupTourOrder_tickets > div > div > span {
display: inline-block;
margin: 0 10px 0 0;
}
}
.groupTourOrder_tickets_red {
color: #FF0000;
.groupTourOrder_tickets_red {
color: #ff0000;
text-decoration: underline;
}
}
.groupTourOrder_tickets_blue {
color: #0000FF;
.groupTourOrder_tickets_blue {
color: #0000ff;
text-decoration: underline;
}
}
.groupTourOrder_tickets_green {
.groupTourOrder_tickets_green {
color: #008000;
text-decoration: underline;
}
}
.groupTourOrder_tickets_black {
.groupTourOrder_tickets_black {
color: #000000;
text-decoration: underline;
}
}
.groupTourOrderByTuan_ico {
.groupTourOrderByTuan_ico {
margin: 0 10px 0 0;
}
}
.groupTourOrderByTuan_ico > i {
.groupTourOrderByTuan_ico > i {
display: inline-block;
margin: 0 2px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
}
.groupTourOrderByTuan_ico > span {
.groupTourOrderByTuan_ico > span {
vertical-align: middle;
}
}
/* 出团通知书打印选择 */
.travelControlTripLayer {
/* 出团通知书打印选择 */
.travelControlTripLayer {
position: fixed;
z-index: 99;
width: 100%;
......@@ -816,9 +825,9 @@ export default {
background: rgba(0, 0, 0, 0.3);
left: 0;
top: 0;
}
}
.travelControlTripLayerCont {
.travelControlTripLayerCont {
position: absolute;
left: 50%;
margin-left: -300px;
......@@ -826,33 +835,33 @@ export default {
top: 50%;
margin-top: -180px;
width: 600px;
}
}
.travelControlTripLayerCont > div {
.travelControlTripLayerCont > div {
padding: 0 30px;
}
}
.travelControlTripLayerCont > div label {
.travelControlTripLayerCont > div label {
cursor: pointer;
vertical-align: middle;
}
}
.travelControlTripLayerCont > div label input {
.travelControlTripLayerCont > div label input {
vertical-align: middle;
}
}
.travelControlTripBtn {
.travelControlTripBtn {
color: #fff;
width: 90px;
height: 30px;
background: #E95252;
border: 1px solid #E95252;
background: #e95252;
border: 1px solid #e95252;
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
}
}
.travelControlTripLayer input[type="checkbox"] + label::before {
.travelControlTripLayer input[type="checkbox"] + label::before {
content: "\A0";
display: inline-block;
width: 15px;
......@@ -860,33 +869,33 @@ export default {
margin-right: 5px;
border-radius: 4px;
background-color: white;
text-indent: .15em;
text-indent: 0.15em;
line-height: 15px;
color: white;
border: 1px solid #e95252;
}
}
.travelControlTripLayer input[type="checkbox"]:checked + label::before {
.travelControlTripLayer input[type="checkbox"]:checked + label::before {
content: "\2713";
background-color: #e95252;
}
}
.travelControlTripLayer input[type="checkbox"] {
.travelControlTripLayer input[type="checkbox"] {
position: absolute;
clip: rect(0, 0, 0, 0);
}
}
.travelControlTripLayer input[type="checkbox"]:focus + label::before {
.travelControlTripLayer input[type="checkbox"]:focus + label::before {
box-shadow: none;
}
}
.travelControlTripLayer input[type="checkbox"]:disabled + label::before {
.travelControlTripLayer input[type="checkbox"]:disabled + label::before {
background-color: gray;
box-shadow: none;
color: #555;
}
}
.groupTourOrder_transfer {
.groupTourOrder_transfer {
position: fixed;
z-index: 50;
bottom: 0;
......@@ -898,15 +907,15 @@ export default {
border-top: 3px solid #38425d;
background-color: #ffffff;
overflow-y: auto;
}
}
.groupTourOrder_transfer > .transfer_header {
.groupTourOrder_transfer > .transfer_header {
position: relative;
width: 100%;
height: 30px;
}
}
.groupTourOrder_transfer > .transfer_header > div:nth-child(1) {
.groupTourOrder_transfer > .transfer_header > div:nth-child(1) {
display: inline-block;
padding: 0 10px;
width: 200px;
......@@ -916,30 +925,36 @@ export default {
text-indent: 10px;
font-size: 16px;
color: #000000;
}
}
.groupTourOrder_transfer > .transfer_header > div:nth-child(2) {
.groupTourOrder_transfer > .transfer_header > div:nth-child(2) {
position: absolute;
top: 0px;
right: 80px;
height: 30px;
}
}
.groupTourOrder_transfer > .transfer_header > div:nth-child(2) > div:nth-child(1) {
.groupTourOrder_transfer
> .transfer_header
> div:nth-child(2)
> div:nth-child(1) {
display: inline-block;
padding: 0 15px;
height: 30px;
line-height: 28px;
font-size: 14px;
color: #E95252;
border: 1px solid #E95252;
color: #e95252;
border: 1px solid #e95252;
background: #fff;
border-radius: 15px;
cursor: pointer;
vertical-align: top;
}
}
.groupTourOrder_transfer > .transfer_header > div:nth-child(2) > div:nth-child(2) {
.groupTourOrder_transfer
> .transfer_header
> div:nth-child(2)
> div:nth-child(2) {
display: inline-block;
margin: 0 0 0 10px;
padding: 0 15px;
......@@ -947,29 +962,29 @@ export default {
line-height: 28px;
font-size: 14px;
color: #fff;
border: 1px solid #E95252;
background: #E95252;
border: 1px solid #e95252;
background: #e95252;
border-radius: 15px;
cursor: pointer;
vertical-align: top;
}
}
.groupTourOrder_transfer > .transfer_info {
.groupTourOrder_transfer > .transfer_info {
padding: 20px 0;
width: 100%;
font-size: 0px;
border-bottom: 1px dashed #999999;
}
}
.groupTourOrder_transfer > .transfer_info > div {
.groupTourOrder_transfer > .transfer_info > div {
display: inline-block;
padding: 0 10px;
width: 25%;
height: 30px;
vertical-align: top;
}
}
.groupTourOrder_transfer > .transfer_info > div > em {
.groupTourOrder_transfer > .transfer_info > div > em {
display: inline-block;
padding: 0 10px;
width: 35%;
......@@ -978,9 +993,9 @@ export default {
text-align: right;
font-size: 16px;
vertical-align: top;
}
}
.groupTourOrder_transfer > .transfer_info > div > span {
.groupTourOrder_transfer > .transfer_info > div > span {
display: inline-block;
padding: 0 10px;
width: 65%;
......@@ -989,25 +1004,25 @@ export default {
text-align: left;
font-size: 16px;
border-radius: 3px;
background-color: #E5E5E5;
background-color: #e5e5e5;
vertical-align: top;
}
}
.groupTourOrder_transfer > .transfer_input {
.groupTourOrder_transfer > .transfer_input {
padding: 20px 0;
width: 100%;
font-size: 0px;
}
}
.groupTourOrder_transfer > .transfer_input > div {
.groupTourOrder_transfer > .transfer_input > div {
display: inline-block;
padding: 0 10px;
width: 25%;
height: 30px;
vertical-align: top;
}
}
.groupTourOrder_transfer > .transfer_input > div > em {
.groupTourOrder_transfer > .transfer_input > div > em {
display: inline-block;
padding: 0 10px;
width: 35%;
......@@ -1016,9 +1031,9 @@ export default {
text-align: right;
font-size: 16px;
vertical-align: top;
}
}
.groupTourOrder_transfer > .transfer_input > div > .el-input {
.groupTourOrder_transfer > .transfer_input > div > .el-input {
display: inline-block;
width: 65%;
height: 30px;
......@@ -1026,5 +1041,5 @@ export default {
text-align: left;
font-size: 14px;
vertical-align: top;
}
}
</style>
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