Skip to content

S
SuperMan
Commit 17da0c45 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 20c3447c 1a5048d5
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 40 deletions
src/components/FinancialModule/invoicesManager.vue
View file @ 17da0c45
......@@ -123,6 +123,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="公司">
<el-select v-model="msg.RB_Branch_Id" filterable style="width: 130px">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="申请日期">
<el-date-picker
......@@ -215,7 +224,7 @@
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div v-if="dataList.length>0">
<el-pagination
background
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
......@@ -230,6 +239,8 @@ export default {
data() {
return {
active: 1,
RB_Group_Id:'',
companyList:[],
msg: {
TCID: 0,
TCNUM: '',
......@@ -243,6 +254,7 @@ export default {
eDate: '',
pageIndex: 1,
pageSize: 10,
RB_Branch_Id:-1
},
productionDate: [],
dataList: [],
......@@ -288,6 +300,7 @@ export default {
this.msg.eDate = this.productionDate[1];
},
getPageList: function () {
console.log(this.msg.BName)
this.loading = true
if (this.msg.OrderId === '') {
this.msg.OrderId = 0
......@@ -298,7 +311,7 @@ export default {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData
}
if (this.msg.OrderId === 0) {
this.msg.OrderId = ''
}
......@@ -311,7 +324,7 @@ export default {
});
},
goUrlT: function (path, obj, title){
this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})
this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})
},
goUrlO: function (OrderId) {
this.$router.push({ name: 'enrollTotal', query: { id: OrderId, blank: 'y', tab: '报名统计'} });
......@@ -324,9 +337,19 @@ export default {
this.msg.pageIndex=1;
this.currentPage = 1;
},
getBranchList(){
this.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.apipost('admin_get_BranchGetList', {RB_Group_Id:this.RB_Group_Id}, res=>{
if (res.data.resultCode == 1) {
this.companyList=res.data.data;
}
}, null)
}
},
mounted() {
this.getPageList();
this.getBranchList();
}
};
</script>
src/components/Hotel/ChangeHotel.vue
View file @ 17da0c45
<template>
<div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="changeHotelDetailsTalbe">
<table border="0" cellspacing="1" cellpadding="0" class="changeHotelDetailsTalbe" v-loading="Loading">
<tr>
<th colspan="14">酒店信息</th>
</tr>
......@@ -102,6 +102,7 @@
TCNUM: '',
TCIDs: "",
isShowBtn: 0,
Loading: false,
}
},
methods: {
......@@ -136,10 +137,12 @@
})
},
getList() {
this.Loading = true;
this.apipost('dmcstatistics_get_GetHotelStaticsDetail', {
TCIDs: this.TCIDs,
NewCombinationNum: this.TCNUM
}, res => {
this.Loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data.HotelOrderListReport;
} else {
......@@ -172,6 +175,7 @@
this.getList();
},
}
</script>
<style>
......@@ -209,4 +213,4 @@
text-align: center;
}
</style>
\ No newline at end of file
</style>
src/components/Hotel/roomQuery.vue
View file @ 17da0c45
......@@ -92,6 +92,22 @@
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li style="display:none;">
<span>
<em>酒店状态</em>
<el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option label="全部OK" :value='100'></el-option>
<el-option label="暂定一晚" :value='1'></el-option>
<el-option label="暂定二晚" :value='2'></el-option>
<el-option label="暂定三晚" :value='3'></el-option>
<el-option label="暂定四晚" :value='4'></el-option>
<el-option label="暂定五晚" :value='5'></el-option>
<el-option label="暂定六晚" :value='6'></el-option>
<el-option label="暂定七晚以上" :value='7'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
......@@ -149,8 +165,12 @@
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
{{childItem.NewHotelName}}<span
class="colorE95252">（{{childItem.HotelOrderState==1?"OK":"暂定"}}）</span>
{{childItem.NewHotelName}}
<span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
</span>
</p>
</div>
</div>
......@@ -191,7 +211,8 @@
CreateBy: 0,
TCNUM: '',
PriceStatus: 0,
CombinationNum: ''
CombinationNum: '',
HotelStatus:-1,
},
//分公司类表
companyList: [],
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 17da0c45
......@@ -305,6 +305,9 @@
subItem.HotelId = 0;
subItem.HotelName = "";
subItem.OrderID = 0;
subItem.OrderDetailsList.forEach(childItem=>{
childItem.OrderDetailsId=0;
});
item.HotelOrderList.push(subItem);
},
//删除酒店
......@@ -492,7 +495,7 @@
})
});
})
this.loading = true
this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.getList();
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 17da0c45
......@@ -149,7 +149,7 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" /> &nbsp;
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<button class="hollowFixedBtn" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button>
</li>
</ul>
......@@ -202,6 +202,17 @@
</tr>
</tbody>
</table>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div v-if="DataList.length>0">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size='queryMsg.pageSize'
:total='total'>
</el-pagination>
</div>
</div>
</template>
<script>
......@@ -232,7 +243,9 @@
QEndDate: ""
},
//数据列表
DataList: []
DataList: [],
currentPage: 0,
total:0,
};
},
methods: {
......@@ -285,8 +298,8 @@
res => {
this.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
this.total = res.data.data.count
this.DataList = res.data.data.pageData;
this.DataList.forEach(item => {
switch (item.StartCityName) {
case '成都':
......@@ -374,6 +387,14 @@
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
return d.toLocaleDateString().match(/\d+/g).join('-')
},
handleCurrentChange: function (val) { //翻页
this.queryMsg.pageIndex = val;
this.getList();
},
resetPageIndex: function (){ // 重置页码
this.queryMsg.pageIndex=1;
this.currentPage = 1;
},
},
mounted() {
let myDate = new Date();
......
src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue
View file @ 17da0c45
......@@ -81,7 +81,7 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()" /> &nbsp;
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
<button class="hollowFixedBtn" @click="DownLoadFile()">下载</button>
</li>
</ul>
......@@ -126,6 +126,18 @@
</tr>
</tbody>
</table>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div v-if="DataList.length>0">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size='queryMsg.pageSize'
:total='total'>
</el-pagination>
</div>
</div>
</template>
<script>
......@@ -156,7 +168,9 @@
QEndDate: ""
},
//数据列表
DataList: []
DataList: [],
currentPage: 0,
total:0,
};
},
methods: {
......@@ -209,7 +223,8 @@
res => {
this.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
this.total = res.data.data.count
this.DataList = res.data.data.pageData;
this.DataList.forEach(item => {
switch (item.StartCityName) {
case '成都':
......@@ -289,6 +304,14 @@
}
});
},
handleCurrentChange: function (val) { //翻页
this.queryMsg.pageIndex = val;
this.getList();
},
resetPageIndex: function (){ // 重置页码
this.queryMsg.pageIndex=1;
this.currentPage = 1;
},
},
mounted() {
this.getCompanyList();
......
src/components/busManagement/BusInfo.vue
View file @ 17da0c45
......@@ -129,6 +129,17 @@
background: #EAEAEA !important;
text-align: center;
}
.disClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.disClick:hover {
background-color: #d1d1d1 !important;
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
......@@ -209,7 +220,7 @@
@click="UseTypeClick(childItem.Id,scope.$index,subIndex);getBusPrice(scope.row)">{{childItem.Name}}</span>
</span>
<span style="width:30px;display:inline-block;">
<a v-if="subIndex>0" @click="DeleteSubItem(scope.row,subIndex)"
<a v-if="subIndex>0" @click="DeleteSubItem(scope.row,subIndex),getBusPrice(scope.row)"
style="color:blue;cursor:pointer">删除</a>
</span>
<span style="display:inline-block;width:30px;margin-left:5px;">
......@@ -339,8 +350,8 @@
</el-table-column>
</el-table>
<div class="upBtnList">
<input type="button" class="normalBtn" @click="SaveList(0)" :disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" @click="SaveList(1)" :disabled="disButton" value="保存" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)" :disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)" :disabled="disButton" value="保存" />
</div>
</el-form>
</div>
......@@ -488,7 +499,8 @@
totalFlySeat: '',
LeaderName: '',
GuideName: '',
loading: false
loading: false,
isSubmit: true,
};
},
methods: {
......@@ -497,7 +509,8 @@
let tempCostFee = 0;
var tempHighSpeedFee = 0;
if (obj.BusType) {
obj.PayType=1;
obj.PayType=2;
obj.HighSpeedPayType = 1;
let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
if (busTypeObj) {
obj.DetailList.forEach(subItem => {
......@@ -515,7 +528,7 @@
}
});
obj.HighSpeedPrice = tempHighSpeedFee;
obj.CostPrice = tempCostFee + tempHighSpeedFee;
obj.CostPrice = tempCostFee;
}
}else{
obj.PayType=null;
......@@ -590,15 +603,19 @@
item.OrderState = type
})
this.PostData.PlanList = this.PlanTableData;
this.apipost('bus_get_SetPlan', this.PostData, res => {
if (res.data.resultCode == 1) {
this.Success("保存成功！");
this.MsgBus.$emit('msg');
this.createTableData();
} else {
this.Error(res.data.message);
}
}, err => {})
if (this.isSubmit) {
this.isSubmit = false;
this.apipost('bus_get_SetPlan', this.PostData, res => {
if (res.data.resultCode == 1) {
this.Success("保存成功！");
this.MsgBus.$emit('msg');
this.createTableData();
} else {
this.Error(res.data.message);
}
this.isSubmit = true;
}, err => {})
}
},
//用车类型点击事件
UseTypeClick(value, index, subIndex) {
......@@ -699,6 +716,9 @@
newPlanData.BusType = oldPlanData.BusType;
newPlanData.PayType = oldPlanData.PayType;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.HighSpeedPrice = oldPlanData.HighSpeedPrice;
newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType;
newPlanData.CostPrice = oldPlanData.CostPrice;
}
},
mounted() {
......
src/components/busManagement/busHandBook.vue
View file @ 17da0c45
......@@ -25,11 +25,6 @@
padding-left: 20px;
}
.comTextdisClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.addHandBook{
margin-right: 5px;
color: seagreen;
......@@ -39,6 +34,17 @@
.addHandBookDIS{
visibility: visible!important;
}
.disClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.disClick:hover {
background-color: #d1d1d1 !important;
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
<div>
......@@ -122,8 +128,8 @@
<tfoot>
<tr>
<td colspan="6">
<input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="SaveData()" value="保存" />
<input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="DownLoadFile()"
<input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="SaveData()" value="保存" />
<input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="DownLoadFile()"
value="下载" />
</td>
</tr>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 17da0c45
......@@ -444,7 +444,7 @@
:false-label="UnCheckedVaule">订团
</el-checkbox>
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">可少价
:false-label="UnCheckedLessPrice">可少价
</el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true"
v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
......@@ -917,6 +917,7 @@
uploadList: [],
CheckedVaule: 1, //选中值
UnCheckedVaule: 2, //没选中
UnCheckedLessPrice: 0,//不少价
isSaved: true,
btnText: '保存',
//日期数组
......@@ -1098,7 +1099,7 @@
//是否订团，0-不订，1需要订
IsBookTeam: 0,
//少价,0-不少价，1少价
IsLessPrice: 0,
IsLessPrice: 1,
//是否重新生成行程数据
IsNew: false,
//选中的酒店数组
......
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