Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 5bebbdc5 ada0a9a7
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 22 deletions
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList.vue
View file @ 06ca0b1b
......@@ -65,11 +65,17 @@
</td>
<td>{{priceFlight.DepartureAirPortName}}</td>
<td>
{{priceFlight.DepartureTime}}
<el-input v-if="priceFlight.IsShowTime||priceFlight.IsShow" placeholder="起飞时间" class="w120"
v-model="priceFlight.DepartureTime">
</el-input>
<span v-else>{{priceFlight.DepartureTime}}</span>
</td>
<td>{{priceFlight.ArrivalAirPortName}}</td>
<td>
{{priceFlight.ArrivalTime}}
<el-input v-if="priceFlight.IsShowTime||priceFlight.IsShow" placeholder="到达时间" class="w120"
v-model="priceFlight.ArrivalTime">
</el-input>
<span v-else> {{priceFlight.ArrivalTime}}</span>
</td>
<td>
<el-date-picker v-if="priceFlight.IsShow" class="w110" :clearable="false" v-model="priceFlight.StartDate"
......@@ -86,6 +92,18 @@
<span v-else>{{priceFlight.TicketType==1?'去程':'回程'}}</span>
</td>
<td>
<el-tooltip class="item" effect="dark" content="修改时间" placement="top-start"
v-if="!priceFlight.IsShowTime">
<el-button v-if="IsBindFlight" type="primary" icon="el-icon-edit" @click="TimeStatusChange(priceFlight)"
circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="保存时间" placement="top-start" v-if="priceFlight.IsShowTime">
<el-button v-if="IsBindFlight" type="primary" icon="iconfont icon-baocun"
@click="saveAirticketFlightTime(priceFlight)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start" v-if="!priceFlight.IsShow">
<el-button v-if="!IsBindFlight" type="primary" icon="el-icon-edit" @click="StatusChange(priceFlight)"
circle></el-button>
......@@ -190,6 +208,10 @@
StatusChange (item) {
item.IsShow = !item.IsShow
},
//状态切换
TimeStatusChange (item) {
item.IsShowTime = !item.IsShowTime
},
//初始化航空公司下拉
initAirlines () {
this.apipost(
......@@ -253,7 +275,9 @@
res => {
if (res.data.resultCode == 1) {
if (res.data.data != null) {
console.log('res.data.data', res.data.data)
res.data.data.forEach(x => {
x['IsShowTime'] = false
this.priceFlightList.push(x)
})
this.headCallBack()
......@@ -306,6 +330,26 @@
)
this.headCallBack()
},
//保存时间信息
saveAirticketFlightTime (item) {
item.IsShowTime = false
let msg = {
id: item.ID,
departureTime: item.DepartureTime,
arriveTime: item.ArrivalTime,
}
console.log('msg', msg)
this.apipost('travel_post_ModifyAirticketFlightTimeById', msg, res => {
if (res.data.resultCode == 1) {
} else {
this.Warning(res.data.message)
}
},
err => {
}
)
},
//删除航班信息
removePriceFlight (index, item, type) {
var that = this
......
src/components/systemManagement/LessPriceManagement.vue
View file @ 06ca0b1b
......@@ -6,12 +6,12 @@
.LP_table {
margin-top: 10px;
background-color: #fff;
border-top: 1px solid #d1d1d1;
border-left: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
border-top: 1px solid #d1d1d1;
/*border-left: 1px solid #d1d1d1;*/
/* border-right: 1px solid #d1d1d1; */
font-size: 14px;
width:100%;
min-width: 1500px;
min-width: 1200px;
padding-bottom: 5px;
}
......@@ -19,19 +19,29 @@
height: 40px;
}
.LP_table tr th {
border-left: 1px solid #d1d1d1;
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
/* border-right: 1px solid #d1d1d1; */
position: relative;
background-color: #E6E6E6;
}
.LP_table tr th:last-child{
border-right: 1px solid #d1d1d1;
}
.LP_table td {
border-left: 1px solid #d1d1d1;
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
/* border-right: 1px solid #d1d1d1; */
text-align: center;
padding: 5px 0;
}
.LP_table td:last-child{
border-right: 1px solid #d1d1d1;
}
.LP_table .el-button--primary {
padding: 5px;
}
......@@ -49,7 +59,7 @@
}
.comLessDiv{
width:100%;
height:40px;
/* height:40px; */
margin-top:5px;
padding-bottom:5px;
border-bottom:1px solid #d1d1d1;
......@@ -58,6 +68,13 @@
border:0;
padding-bottom:0;
}
.comLessDiv input{
padding: 0 5px;
}
.comLessDiv .el-input-group__append,.comLessDiv .el-input-group__append button{
padding: 0 8px;
cursor: pointer;
}
.addLessPrice{
margin-left:10px;
color:seagreen;
......@@ -74,13 +91,13 @@
<!--保存-->
<table border="0" cellspacing="0" cellpadding="0" class="LP_table" v-loading="this.loading">
<tr>
<th width="200">公司</th>
<th width="350">线路/系列</th>
<th width="150">公司</th>
<th width="255">线路/系列</th>
<th>所有人</th>
<th>部门主管</th>
<th>分公司总经理</th>
<th>当团op</th>
<th width="200">操作</th>
<th width="150">操作</th>
</tr>
<tr v-for="(item,index) in dataList">
<td>
......@@ -88,12 +105,12 @@
</td>
<td>
<div v-for="subItem in item.LessPriceList" class="comLessDiv">
<el-select class='w150' v-model="subItem.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(subItem),resetLineTeamId(subItem)">
<el-select class='w120' v-model="subItem.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(subItem),resetLineTeamId(subItem)">
<el-option label="不限" :value='commonSelect'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
<el-select class='w150' v-model="subItem.LineTeamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-select class='w120' v-model="subItem.LineTeamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='commonSelect'></el-option>
<el-option v-for="sitem in subItem.LineTeamList" :label='sitem.LtName' :value='sitem.LtID' :key='sitem.LtID'>
</el-option>
......@@ -102,26 +119,33 @@
</td>
<td>
<div v-for="subItem in item.LessPriceList" class="comLessDiv">
<el-input class="w80" placeholder="少价金額" v-model="subItem.LessMoney" @keyup.native="checkPrice(subItem,'LessMoney')"></el-input>
<el-input class="w80" placeholder="减少提成百分比" v-model="subItem.LessPercent" @keyup.native="checkPrice(subItem,'LessPercent')"></el-input>
<el-input class="w80" size="mini" placeholder="少价金額" v-model="subItem.LessMoney" @keyup.native="checkPrice(subItem,'LessMoney')"> <el-button slot="append">元</el-button></el-input>
<el-input class="w80" size="mini" placeholder="减少提成" v-model="subItem.LessPercent" @keyup.native="checkPrice(subItem,'LessPercent')">
<el-button slot="append">%</el-button>
</el-input>
</div>
</td>
<td>
<div v-for="subItem in item.LessPriceList" class="comLessDiv">
<el-input class="w80" placeholder="少价金額" v-model="subItem.DeptLessMoney" @keyup.native="checkPrice(subItem,'DeptLessMoney')"></el-input>
<el-input class="w80" placeholder="减少提成百分比" v-model="subItem.DeptLessPercent" @keyup.native="checkPrice(subItem,'DeptLessPercent')"></el-input>
<el-input class="w80" size="mini" placeholder="少价金額" v-model="subItem.DeptLessMoney" @keyup.native="checkPrice(subItem,'DeptLessMoney')"> <el-button slot="append">元</el-button></el-input>
<el-input class="w80" size="mini" placeholder="减少提成" v-model="subItem.DeptLessPercent" @keyup.native="checkPrice(subItem,'DeptLessPercent')">
<el-button slot="append">%</el-button></el-input>
</div>
</td>
<td>
<div v-for="subItem in item.LessPriceList" class="comLessDiv">
<el-input class="w80" placeholder="少价金額" v-model="subItem.FilialeLessMoney" @keyup.native="checkPrice(subItem,'FilialeLessMoney')"></el-input>
<el-input class="w80" placeholder="减少提成百分比" v-model="subItem.FilialeLessPercent" @keyup.native="checkPrice(subItem,'FilialeLessPercent')"></el-input>
<el-input class="w80" size="mini" placeholder="少价金額" v-model="subItem.FilialeLessMoney" @keyup.native="checkPrice(subItem,'FilialeLessMoney')"> <el-button slot="append">元</el-button></el-input>
<el-input class="w80" size="mini" placeholder="减少提成" v-model="subItem.FilialeLessPercent" @keyup.native="checkPrice(subItem,'FilialeLessPercent')">
<el-button slot="append">%</el-button>
</el-input>
</div>
</td>
<td>
<div v-for="subItem in item.LessPriceList" class="comLessDiv">
<el-input class="w80" placeholder="少价金額" v-model="subItem.OPLessMoney" @keyup.native="checkPrice(subItem,'OPLessMoney')"></el-input>
<el-input class="w80" placeholder="减少提成百分比" v-model="subItem.OPLessPercent" @keyup.native="checkPrice(subItem,'OPLessPercent')"></el-input>
<el-input class="w80" size="mini" placeholder="少价金額" v-model="subItem.OPLessMoney" @keyup.native="checkPrice(subItem,'OPLessMoney')"> <el-button slot="append">元</el-button></el-input>
<el-input class="w80" size="mini" placeholder="减少提成" v-model="subItem.OPLessPercent" @keyup.native="checkPrice(subItem,'OPLessPercent')">
<el-button slot="append">%</el-button>
</el-input>
</div>
</td>
<td>
......
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