Skip to content

S
SuperMan
Commit c5cb7164 authored by 黄奎's avatar 黄奎
Browse files
Options

合团查询修改

parent b7cfd0e5
Hide whitespace changes
Inline Side-by-side
Showing with 453 additions and 359 deletions
src/components/dmc/manager/tripsManager.vue
View file @ c5cb7164
<style> <style>
@import "../../../assets/css/newTravelManager.css"; @import "../../../assets/css/newTravelManager.css";
.TravelQueryList { .TravelQueryList {
width: 100%; width: 100%;
padding-left: 10px; padding-left: 10px;
} }
.TravelQueryList {
width: 100%; .TravelQueryList {
border: 1px solid #e5e5e5; width: 100%;
background: #fff; border: 1px solid #e5e5e5;
margin-bottom: 10px; background: #fff;
color: #333; margin-bottom: 10px;
font-size: 14px; color: #333;
} font-size: 14px;
.TravelQueryList i.iconfont { }
color: #bbb;
margin-right: 8px; .TravelQueryList i.iconfont {
} color: #bbb;
.TravelQueryList > div { margin-right: 8px;
height: 144px; }
border-right: 1px dashed #dcdfe6;
} .TravelQueryList>div {
.TravelQueryList > div:last-child { height: 144px;
border-right: none; border-right: 1px dashed #dcdfe6;
} }
.TravelQueryList .d11 {
float: left; .TravelQueryList>div:last-child {
width: 160px; border-right: none;
height: 120px; }
margin: 14px 14px 0 14px;
} .TravelQueryList .d11 {
.TravelQueryList .d11 > li { float: left;
width: 160px; width: 160px;
height: 120px; height: 120px;
border: none; margin: 14px 14px 0 14px;
} }
.TravelQueryList .d11 > li > img {
width: 160px; .TravelQueryList .d11>li {
height: 120px; width: 160px;
} height: 120px;
.TravelQueryList .d12 { border: none;
float: left; }
padding: 0 30px;
} .TravelQueryList .d11>li>img {
.TravelQueryList .d12 .d12p { width: 160px;
margin-top: 3px; height: 120px;
font-size: 12px; }
color: #999;
cursor: pointer; .TravelQueryList .d12 {
line-height: 20px; float: left;
display: -webkit-box; padding: 0 30px;
overflow: hidden; }
/*! autoprefixer: off */
-webkit-box-orient: vertical; .TravelQueryList .d12 .d12p {
/* autoprefixer: on */ margin-top: 3px;
text-overflow: ellipsis; font-size: 12px;
-webkit-line-clamp: 3; color: #999;
} cursor: pointer;
.TravelQueryList .d12 .d12p:hover { line-height: 20px;
text-decoration: underline; display: -webkit-box;
color: #333; overflow: hidden;
} /*! autoprefixer: off */
.TravelQueryList .d12 .d12TC { -webkit-box-orient: vertical;
margin: 10px 0 0 0; /* autoprefixer: on */
color: #666666; text-overflow: ellipsis;
font-size: 12px; -webkit-line-clamp: 3;
} }
.TravelQueryList .d2 {
text-align: center; .TravelQueryList .d12 .d12p:hover {
padding-top: 15px; text-decoration: underline;
width: 160px; color: #333;
margin: auto; }
}
.TravelQueryList .TCLflight_GO { .TravelQueryList .d12 .d12TC {
display: inline-block; margin: 10px 0 0 0;
width: 160px; color: #666666;
text-align: left; font-size: 12px;
} }
.TravelQueryList .d2 p.flightNo { .TravelQueryList .d2 {
background: #ccc; text-align: center;
width: 160px; padding-top: 15px;
margin: 5px 0; width: 160px;
padding: 0 10px; margin: auto;
height: 22px; }
line-height: 22px;
display: inline-block; .TravelQueryList .TCLflight_GO {
font-size: 14px; display: inline-block;
} width: 160px;
.TravelQueryList .d2 p.flightNo em { text-align: left;
font-style: normal; }
color: #333;
font-size: 12px; .TravelQueryList .d2 p.flightNo {
font-weight: bold; background: #ccc;
} width: 160px;
.TravelQueryList .d2 p.flightNo .flem { margin: 5px 0;
height: 22px; padding: 0 10px;
width: 70px; height: 22px;
display: inline-block; line-height: 22px;
overflow: hidden; display: inline-block;
white-space: nowrap; font-size: 14px;
text-overflow: ellipsis; }
}
.TravelQueryList .d2 p > span { .TravelQueryList .d2 p.flightNo em {
color: #fff; font-style: normal;
font-size: 12px; color: #333;
border-radius: 10px; font-size: 12px;
background: #2aaef2; font-weight: bold;
padding: 2px 5px; }
cursor: pointer;
} .TravelQueryList .d2 p.flightNo .flem {
.TravelQueryList .d2 > div > div { height: 22px;
display: inline-block; width: 70px;
line-height: 24px; display: inline-block;
font-size: 12px; overflow: hidden;
} white-space: nowrap;
.TravelQueryList .d3 { text-overflow: ellipsis;
padding: 15px 0 0 25px; }
}
.TravelQueryList .d3 p { .TravelQueryList .d2 p>span {
line-height: 24px; color: #fff;
font-size: 12px; font-size: 12px;
color: #333333; border-radius: 10px;
} background: #2aaef2;
.TravelQueryList .d3 p > span { padding: 2px 5px;
color: #666; cursor: pointer;
font-size: 12px; }
margin-right: 10px;
} .TravelQueryList .d2>div>div {
.TravelQueryList .d3 p > em { display: inline-block;
background: #ff9c00; line-height: 24px;
font-style: normal; font-size: 12px;
margin-left: 8px; }
color: #fff;
border-radius: 4px; .TravelQueryList .d3 {
padding: 2px 5px; padding: 15px 0 0 25px;
} }
.TravelQueryList .d4 {
padding-left: 25px; .TravelQueryList .d3 p {
padding-top: 15px; line-height: 24px;
} font-size: 12px;
.TravelQueryList .d4 p span.price { color: #333333;
color: #333; }
text-decoration: underline;
font-size: 12px; .TravelQueryList .d3 p>span {
} color: #666;
.TravelQueryList .d4 p span.price:hover { font-size: 12px;
color: #e95252; margin-right: 10px;
font-weight: bold; }
cursor: pointer;
} .TravelQueryList .d3 p>em {
.TravelQueryList .d5 { background: #ff9c00;
padding: 15px 0 0 25px; font-style: normal;
} margin-left: 8px;
.TravelQueryList .d5 p { color: #fff;
line-height: 26px; border-radius: 4px;
font-size: 12px; padding: 2px 5px;
} }
.TravelQueryList .d5 p > span {
color: #666; .TravelQueryList .d4 {
font-size: 12px; padding-left: 25px;
margin-right: 5px; padding-top: 15px;
} }
.TravelQueryList .d5 p > i {
font-weight: bold; .TravelQueryList .d4 p span.price {
font-style: normal; color: #333;
} text-decoration: underline;
.TravelQueryList .d6 { font-size: 12px;
padding: 20px 10px 0 15px; }
}
.TravelQueryList .d6 p { .TravelQueryList .d4 p span.price:hover {
line-height: 26px; color: #e95252;
} font-weight: bold;
.TravelQueryList .d6 p:nth-child(2) { cursor: pointer;
width: 100%; }
height: 78px;
font-size: 12px; .TravelQueryList .d5 {
overflow: hidden; padding: 15px 0 0 25px;
text-overflow: ellipsis; }
}
.TravelQueryList .d7 { .TravelQueryList .d5 p {
text-align: center; line-height: 26px;
} font-size: 12px;
.TravelQueryList .d7 button { }
height: 30px;
border-radius: 4px; .TravelQueryList .d5 p>span {
} color: #666;
.TravelQueryList .d7 .el-button--primary { font-size: 12px;
padding: 3px; margin-right: 5px;
margin: 0; }
font-size: 12px !important;
color: #fff; .TravelQueryList .d5 p>i {
} font-weight: bold;
.TravelQueryList .d7 i.iconfont { font-style: normal;
color: #fff; }
margin: 0;
} .TravelQueryList .d6 {
.TravelQueryList .disabledBtn { padding: 20px 10px 0 15px;
background: #999 !important; }
border-color: #999 !important;
} .TravelQueryList .d6 p {
.TravelQueryList .el-col { line-height: 26px;
height: 100%; }
border-right: 1px dashed #dcdfe6;
} .TravelQueryList .d6 p:nth-child(2) {
.TravelQueryList .el-col:last-child { width: 100%;
border: none; height: 78px;
} font-size: 12px;
.TCL-redType { overflow: hidden;
color: red !important; text-overflow: ellipsis;
} }
.TravelQueryList .el-dropdown {
height: 30px; .TravelQueryList .d7 {
line-height: 30px; text-align: center;
background-color: #f2f2f2; }
color: #333333;
font-size: 12px; .TravelQueryList .d7 button {
width: 70px; height: 30px;
text-align: center; border-radius: 4px;
border-top-right-radius: 4px; }
border-bottom-right-radius: 4px;
cursor: pointer; .TravelQueryList .d7 .el-button--primary {
} padding: 3px;
.TravelControlList .TC_remarkContent { margin: 0;
width: 100%; font-size: 12px !important;
height: auto !important; color: #fff;
border-top: 1px solid #e5e5e5; }
padding: 10px;
font-size: 12px; .TravelQueryList .d7 i.iconfont {
} color: #fff;
.TravelControlList .TCL_remarkTitle { margin: 0;
float: left; }
width: 65px;
text-align: right; .TravelQueryList .disabledBtn {
} background: #999 !important;
.TravelControlList .TCL_Content { border-color: #999 !important;
float: left; }
width: 92%;
} .TravelQueryList .el-col {
.TravelControlList .TCL-Opremark { height: 100%;
margin-top: 10px; border-right: 1px dashed #dcdfe6;
} }
.TC_customerInfo .elPopoverLayer {
padding: 0px 10px; .TravelQueryList .el-col:last-child {
} border: none;
.TC_customerInfo .elPopoverLayer p { }
line-height: 34px;
font-size: 12px; .TCL-redType {
} color: red !important;
.TC_customerInfo .elPopoverLayer p > i { }
font-style: normal;
border: 1px solid #999; .TravelQueryList .el-dropdown {
padding: 0 3px; height: 30px;
font-size: 12px; line-height: 30px;
margin-right: 10px; background-color: #f2f2f2;
font-weight: bold; color: #333333;
color: #333; font-size: 12px;
} width: 70px;
.TC_customerInfo .elPopoverLayer p > span { text-align: center;
display: inline-block; border-top-right-radius: 4px;
width: 130px; border-bottom-right-radius: 4px;
} cursor: pointer;
.TC_customerInfo .elPopoverLayer p > span > b { }
margin-left: 10px;
color: #2aaef2; .TravelControlList .TC_remarkContent {
} width: 100%;
.TCL-Popspan { height: auto !important;
margin-left: 48px; border-top: 1px solid #e5e5e5;
} padding: 10px;
.TC_SalePlat { font-size: 12px;
position: absolute; }
bottom: 10px;
left: 25px; .TravelControlList .TCL_remarkTitle {
} float: left;
.TC_SalePlat span { width: 65px;
display: inline-block; text-align: right;
padding: 0 3px; }
margin-right: 2px;
} .TravelControlList .TCL_Content {
.TravelControlList .Opcontent { float: left;
width: 600px; width: 92%;
} }
.OPremarkDiv {
height: 250px; .TravelControlList .TCL-Opremark {
} margin-top: 10px;
.TC-dropdown .el-dropdown-menu__item { }
width: 124px;
} .TC_customerInfo .elPopoverLayer {
.TC_tripDetails { padding: 0px 10px;
padding: 0; }
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px; .TC_customerInfo .elPopoverLayer p {
overflow-y: auto; line-height: 34px;
} font-size: 12px;
.TC_tripDetails .popper__arrow::after { }
border-bottom-color: #ededed !important;
} .TC_customerInfo .elPopoverLayer p>i {
.TC_tripDetails table { font-style: normal;
padding: 10px 0 0 20px; border: 1px solid #999;
background-color: #ededed; padding: 0 3px;
border-collapse: collapse; font-size: 12px;
border: 1px solid #d2d2d2; margin-right: 10px;
font-size: 12px; font-weight: bold;
} color: #333;
.TC_tripDetails table th { }
background-color: #ededed;
padding: 5px; .TC_customerInfo .elPopoverLayer p>span {
} display: inline-block;
.TC_tripDetails table td { width: 130px;
background-color: #ffffff; }
padding: 9px 15px;
color: #333333; .TC_customerInfo .elPopoverLayer p>span>b {
border: 1px solid #d2d2d2; margin-left: 10px;
} color: #2aaef2;
.TC_tripDetails table td._d_name { }
background-color: #ededed;
} .TCL-Popspan {
.TC_tripDetails table ._color_666 { margin-left: 48px;
color: #666666; }
}
.TC_tripDetails table tr._color_666 th { .TC_SalePlat {
padding: 9px 15px; position: absolute;
} bottom: 10px;
.TCL-TCNUM { left: 25px;
font-size: 12px; }
margin: 5px 0 0 30px;
} .TC_SalePlat span {
.TravelControlListTable{width: 100%;border-collapse:collapse;} display: inline-block;
.TravelControlListTable tr{background: #fff;} padding: 0 3px;
.TravelControlListTable tr td{font-size: 12px;border: 1px solid #E5E5E5;} margin-right: 2px;
}
.TravelControlList .Opcontent {
width: 600px;
}
.OPremarkDiv {
height: 250px;
}
.TC-dropdown .el-dropdown-menu__item {
width: 124px;
}
.TC_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px;
overflow-y: auto;
}
.TC_tripDetails .popper__arrow::after {
border-bottom-color: #ededed !important;
}
.TC_tripDetails table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.TC_tripDetails table th {
background-color: #ededed;
padding: 5px;
}
.TC_tripDetails table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.TC_tripDetails table td._d_name {
background-color: #ededed;
}
.TC_tripDetails table ._color_666 {
color: #666666;
}
.TC_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
.TCL-TCNUM {
font-size: 12px;
margin: 5px 0 0 30px;
}
.TravelControlListTable {
width: 100%;
border-collapse: collapse;
}
.TravelControlListTable tr {
background: #fff;
}
.TravelControlListTable tr td {
font-size: 12px;
border: 1px solid #E5E5E5;
}
</style> </style>
<template> <template>
<div> <div>
...@@ -340,24 +416,25 @@ ...@@ -340,24 +416,25 @@
<em>{{$t('active.ad_xlmc')}}</em> <em>{{$t('active.ad_xlmc')}}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option> <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID"
:key="item.LtID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('visa.v_tuanhao')}}</em> <em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList" <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input> @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('scen.sc_ftTime')}}</em> <em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :picker-options="pickerBeginDateBefore" <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter" <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
...@@ -375,15 +452,16 @@ ...@@ -375,15 +452,16 @@
<em>{{$t('scen.sc_cp')}}</em> <em>{{$t('scen.sc_cp')}}</em>
<el-select class="w150" v-model="queryMsg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.BranchDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.BranchDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option> <el-option v-for="item in queryCommonData.BranchList" :label="item.BName" :key="item.Id"
:value="item.Id">{{item.BName}}</el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('Operation.Op_hetuan')}}</em> <em>{{$t('Operation.Op_hetuan')}}</em>
<el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150" @keyup.native.enter="getControlList" <el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input> @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
...@@ -398,7 +476,8 @@ ...@@ -398,7 +476,8 @@
<tr height="40"> <tr height="40">
<td align="center" width="80" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3"> <td align="center" width="80" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3">
<label> <label>
<input :value="outItem.TCIDs" style="vertical-align: middle;" v-model="ArrList" type="checkbox">{{outItem.TCIDs}} <input :value="outItem.TCIDs" style="vertical-align: middle;" v-model="ArrList"
type="checkbox">{{outItem.TCIDs}}
</label> </label>
<span v-if='outItem.TravelPriceList.length>1'>合</span> <span v-if='outItem.TravelPriceList.length>1'>合</span>
</td> </td>
...@@ -433,7 +512,8 @@ ...@@ -433,7 +512,8 @@
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span> <span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="din==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span v-else-if="din==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span v-else-if="din>0 && din!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span> <span
v-else-if="din>0 && din!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td> </td>
<td> <td>
<div>{{ds.Flight_number}}</div> <div>{{ds.Flight_number}}</div>
...@@ -451,8 +531,8 @@ ...@@ -451,8 +531,8 @@
</tr> </tr>
</table> </table>
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" class="TCL-flighInfoList" <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
style="text-align: center!important"> class="TCL-flighInfoList" style="text-align: center!important">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>{{subItem.DepartureName}} <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>{{subItem.DepartureName}}
{{subItem.StopoverName==""?"":"-"+subItem.StopoverName}} {{subItem.StopoverName==""?"":"-"+subItem.StopoverName}}
...@@ -502,7 +582,8 @@ ...@@ -502,7 +582,8 @@
<td width="240"> <td width="240">
<div class="d7"> <div class="d7">
<el-button-group v-if='outItem.TravelPriceList.length>1'> <el-button-group v-if='outItem.TravelPriceList.length>1'>
<el-button @click.native='chaiTuan(item)' type="primary" style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_chaifen')}}</el-button> <el-button @click.native='chaiTuan(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_chaifen')}}</el-button>
</el-button-group> </el-button-group>
</div> </div>
</td> </td>
...@@ -519,8 +600,8 @@ ...@@ -519,8 +600,8 @@
<td colspan="6">{{$t('system.content_noData')}}</td> <td colspan="6">{{$t('system.content_noData')}}</td>
</tr> </tr>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
:page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination>
</div> </div>
</div> </div>
</template> </template>
...@@ -561,7 +642,7 @@ ...@@ -561,7 +642,7 @@
//出团公司 //出团公司
OutBranchId: -1, OutBranchId: -1,
//合团团号 //合团团号
CombinationNum:"" CombinationNum: ""
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -604,17 +685,29 @@ ...@@ -604,17 +685,29 @@
this.ArrList.forEach(item => { this.ArrList.forEach(item => {
sumArr = sumArr.concat(item.split(',')) sumArr = sumArr.concat(item.split(','))
}); });
this.apipost('travel_post_SetCombination', { var newArray = [];
Ids: sumArr if (sumArr != null && sumArr.length > 0) {
}, res => { sumArr.forEach(item => {
if (res.data.resultCode == 1) { if (item != "") {
this.$message.success(res.data.message) newArray.push(item);
this.getControlList() }
this.ArrList = []; });
} else { }
this.Error(res.data.message) if (newArray != null && newArray.length > 0) {
}
}, err => {})
this.apipost('travel_post_SetCombination', {
Ids: newArray
}, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
this.getControlList()
this.ArrList = [];
} else {
this.Error(res.data.message)
}
}, err => {});
}
}, },
goUrl(path, obj, title) { goUrl(path, obj, title) {
this.$router.push({ this.$router.push({
...@@ -711,4 +804,5 @@ ...@@ -711,4 +804,5 @@
this.getControlList(); this.getControlList();
} }
}; };
</script>
\ No newline at end of file </script>
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