Skip to content

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

酒店工作表修改

parent 9d79a0ba
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 30 deletions
src/components/Hotel/HotelWorkList.vue
View file @ d54a9ade
......@@ -32,7 +32,7 @@
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')" >
<el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
......@@ -131,7 +131,8 @@
<template
v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
<template v-for="(childItem,childIndex) in scope.row.DayList[index].HotelJourneyOrderList">
<div :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1||childItem.OPState==1" slot="reference" class="w80"
<div :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1||childItem.OPState==1"
slot="reference" class="w80"
style="white-space:nowrap;color:green;cursor:pointer;text-decoration:underline;"
@click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
{{childItem.BookGroup}} </div>
......@@ -179,6 +180,9 @@
<th width="90">
地接状态
</th>
<th width="90">
操作
</th>
</tr>
</table>
<div style="height:400px;overflow:auto;border-bottom:1px solid #d1d1d1;border-left:1px solid #d1d1d1;"
......@@ -219,6 +223,9 @@
<a style="color:red">地接-未操作</a>
</template>
</td>
<td style="text-align:center;" width="90">
<a style="text-decoration:underline;color:blue;cursor:pointer;" @click="DelItem(hItem)">删除</a>
</td>
</tr>
</table>
</div>
......@@ -240,7 +247,7 @@
CountryId: 651, //只查询日本
//酒店选择数组
HotelChooseArray: [],
Province: 0,//省份编号
Province: 0, //省份编号
City: 0, //城市编号
OutBranchId: -1, //出团公司编号
//星级
......@@ -304,7 +311,7 @@
this.qMsg.DateStr = DateStr;
this.qMsg.HotelId = HotelId;
this.qMsg.TCID = TCID;
this.qMsg.TCNUM="";
this.qMsg.TCNUM = "";
this.GetChangeHotelList();
},
//获取可以改变的酒店列表
......@@ -345,7 +352,8 @@
});
}
if (newList && newList.length > 0) {
that.apipost("journeyorder_post_SaveWorkHotelOrderService", newList,
console.log("0",newList);
that.apipost("journeyorder_post_SaveWorkHotelOrderService", newList,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
......@@ -362,6 +370,24 @@
}
});
},
//删除酒店
DelItem(hItem) {
var that = this;
this.Confirm("是否删除?删除后将不能恢复!", function () {
that.apipost('dmcstatistics_post_DeleteHotelOrder', {
ID: hItem.ID,
TCID: hItem.TCID
}, res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
that.GetChangeHotelList();
} else {
that.Error(res.data.message);
}
}, err => {})
});
},
getList() {
this.loading = true;
this.isShow = false;
......@@ -461,6 +487,8 @@
mounted() {
this.GetHotelList();
this.msg.YearMonthStr = new Date().Format("yyyy-MM");
this.msg.YearMonthStr="2019-10";
this.msg.HotelChooseArray=[1489];
this.getProvinceList(651, 1);
//this.getBranchList();
this.initSupplier();
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ d54a9ade
<style>
@import "../../../assets/css/newTravelManager.css";
</style>
<template>
<div>
......@@ -9,9 +10,11 @@
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</span>
......@@ -21,7 +24,8 @@
<em>{{$t('active.ad_xlmc')}}</em>
<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 v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'>
</el-option>
</el-select>
</span>
......@@ -29,7 +33,7 @@
<li>
<span>
<em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
......@@ -47,10 +51,10 @@
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :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"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
: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" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
......@@ -58,12 +62,14 @@
</li>
</ul>
</div>
<div class="TravelTclList" v-loading="queryCommonData.loading" :element-loading-text="queryCommonData.loadingText">
<div class="TravelTclList" v-loading="queryCommonData.loading"
:element-loading-text="queryCommonData.loadingText">
<ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size='queryMsg.pageSize' :total='queryMsg.total'>
</el-pagination>
<li v-for="(item,index) in queryCommonData.dataList" :key="index" :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<li v-for="(item,index) in queryCommonData.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div :data-id="item.ID">
<div class="el-col" style="position:relative;width:200px">
<div v-if="item.IsWarning===1" class="travel_warning"></div>
......@@ -101,11 +107,15 @@
</div>
<div class="el-col">
<div class="d7">
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">
{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">{{$t('Operation.Op_tripDownLoad')}}</el-button>
<el-button style="display:none;" @click="goB2B(item.ID, 0)" type="primary">{{$t('Operation.Op_b2bView')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">
{{$t('Operation.Op_tripDownLoad')}}</el-button>
<el-button style="display:none;" @click="goB2B(item.ID, 0)" type="primary">
{{$t('Operation.Op_b2bView')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">
{{$t('system.table_delete')}}</el-button>
</div>
</div>
</div>
......@@ -114,7 +124,7 @@
<div class="TCL_remarkTitle TCL-redType">{{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content">{{item.Title}}</div>
</div>
<div class="clearfix" v-if="item.OpenTeamDescribe&&item.OpenTeamDescribe!=''">
<div class="clearfix" v-if="item.OpenTeamDescribe&&item.OpenTeamDescribe!=''">
<div class="TCL_remarkTitle TCL-redType">备注：</div>
<div class="TCL_Content">{{item.OpenTeamDescribe}}</div>
</div>
......@@ -157,13 +167,13 @@
LineId: 0,
LineteamId: 0,
CreateBy: 0,
TeamType:0,
TCNUMS:"",
TeamType: 0,
TCNUMS: "",
StartGroupDate: "",
EndGroupDate: "",
},
//当前登录人员信息
CurrentUserInfo:{},
CurrentUserInfo: {},
remarkMsg: {
TCID: 0,
OPRemark: "",
......@@ -231,7 +241,9 @@
},
//获取线路列表
getLineList() {
this.apipost("line_post_GetList", {"LineDirection":2}, res => {
this.apipost("line_post_GetList", {
"LineDirection": 2
}, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
}
......@@ -335,17 +347,16 @@
},
goB2B(ConfigId, tcid) {
var B2BDomain = this.CurrentUserInfo.B2BDomain;
var url="http://192.168.2.214:8084";
url="http://www.oytour.com";
var url = "http://192.168.2.214:8084";
url = "http://www.oytour.com";
window.open(
url+'/#/detailTwo/' +
url + '/#/detailTwo/' +
encodeURIComponent(ConfigId) + '/' + tcid +
'/preview',
'_blank'
)
},
goUrlR(path, item) {
console.log("item",item);
goUrlR(path, item) {
var cityId = item.StartCityID
if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId
......@@ -370,7 +381,7 @@
this.getLineList();
},
created() {
let userInfo = this.getLocalStorage()
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
this.getControlList();
},
......
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