Skip to content

S
SuperMan
Commit 351cb6e3 authored by youjie's avatar youjie
Browse files
Options

优化酒店、门票、包车

parent c2f749dd
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 14 deletions
src/components/Hotel/reservation/HotelOrderList.vue
View file @ 351cb6e3
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<li> <li>
<span> <span>
<em>{{$t('OrderList.search.status')}}</em> <em>{{$t('OrderList.search.status')}}</em>
<el-select v-model="msg.OrderStatus" class="w110 HworkInput"> <el-select v-model="msg.OrderStatus">
<el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option> <el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
<el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<li> <li>
<span> <span>
<em>{{$t('OrderList.search.roomType')}}</em> <em>{{$t('OrderList.search.roomType')}}</em>
<el-select v-model="msg.RoomType" :placeholder="$t('OrderList.rooms.roomType')" class="w110 HworkInput"> <el-select v-model="msg.RoomType" :placeholder="$t('OrderList.rooms.roomType')">
<el-option :key="0" :value="0" :label="$t('OrderList.rooms.default')"></el-option> <el-option :key="0" :value="0" :label="$t('OrderList.rooms.default')"></el-option>
<el-option v-for="item in roomType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in roomType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
...@@ -63,19 +63,31 @@ ...@@ -63,19 +63,31 @@
</li> </li>
<li> <li>
<span><em>{{$t('OrderList.search.orderNum')}}</em> <span><em>{{$t('OrderList.search.orderNum')}}</em>
<el-input type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w110"/> <el-input type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')"/>
</span> </span>
</li> </li>
<li> <li>
<span><em>订单ID</em> <span><em>订单ID</em>
<el-input type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w110"/> <el-input type="Number" v-model="msg.OrderId" placeholder="订单ID"/>
</span>
</li>
<li v-if="pagesTitle!='销售'">
<span><em>业务员</em>
<el-select filterable v-model='msg.EnterID'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('hotel.hotel')}}</em> <em>{{$t('hotel.hotel')}}</em>
<!-- multiple_input w300 multiple collapse-tags--> <!-- multiple_input w300 multiple collapse-tags-->
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" class="w110" style="height: 34px;" <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" style="height: 34px;"
filterable> filterable>
<el-option :key="0" :value="0" :label="$t('OrderList.search.allHotel')"></el-option> <el-option :key="0" :value="0" :label="$t('OrderList.search.allHotel')"></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
...@@ -155,9 +167,11 @@ ...@@ -155,9 +167,11 @@
EndTime: '',//this.setEdate() EndTime: '',//this.setEdate()
OrderStatus: 0, OrderStatus: 0,
OrderNo: '', OrderNo: '',
OrderId: '' OrderId: '',
// RoomType: 0, // RoomType: 0,
// orderType: 0 // orderType: 0
IsSelectSale: 1,
EnterID: 0
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
...@@ -178,7 +192,15 @@ ...@@ -178,7 +192,15 @@
{Name: this.$t('OrderList.orderType.tour'),ID:'1'}, {Name: this.$t('OrderList.orderType.tour'),ID:'1'},
{Name: this.$t('OrderList.orderType.guest'),ID:'2'}, {Name: this.$t('OrderList.orderType.guest'),ID:'2'},
], ],
Datelist:'' Datelist:'',
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
}; };
}, },
watch: { watch: {
...@@ -187,6 +209,15 @@ ...@@ -187,6 +209,15 @@
} }
}, },
methods: { methods: {
getEmployee() { //员工
let userInfo=this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id;
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
getDates(){ getDates(){
if(this.Datelist){ if(this.Datelist){
if(this.Datelist[0]){ if(this.Datelist[0]){
...@@ -335,6 +366,7 @@ ...@@ -335,6 +366,7 @@
mounted() { mounted() {
this.Datelist = this.getyMDOne() this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.getEmployee()
this.GetList(); this.GetList();
......
src/components/busManagement/BookAcar/components/BookAcarOrder.vue
View file @ 351cb6e3
...@@ -170,6 +170,7 @@ ...@@ -170,6 +170,7 @@
OrderETime: '', OrderETime: '',
ProductName: '', ProductName: '',
Mobile: '',//电话 Mobile: '',//电话
IsSelectSale: 1,
EnterID: 0,//业务员 EnterID: 0,//业务员
}, },
total: 0, total: 0,
......
src/components/busManagement/tripBusOrder.vue
View file @ 351cb6e3
...@@ -13,31 +13,43 @@ ...@@ -13,31 +13,43 @@
<li> <li>
<span> <span>
<em>订单编号</em> <em>订单编号</em>
<el-input v-model='msg.OrderNo' class="w200"></el-input> <el-input v-model='msg.OrderNo'></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>订单Id</em> <em>订单Id</em>
<el-input v-model='msg.OrderId' class="w200"></el-input> <el-input v-model='msg.OrderId'></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>订车公司</em> <em>订车公司</em>
<el-input v-model='msg.UseCompName' class="w200"></el-input> <el-input v-model='msg.UseCompName'></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>订车人</em> <em>订车人</em>
<el-input v-model='msg.UseName' class="w200"></el-input> <el-input v-model='msg.UseName'></el-input>
</span>
</li>
<li v-if="pagesTitle!='销售'">
<span><em>业务员</em>
<el-select filterable v-model='msg.EnterID'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>团队名称</em> <em>团队名称</em>
<el-input v-model='msg.TeamName' class="w200"></el-input> <el-input v-model='msg.TeamName'></el-input>
</span> </span>
</li> </li>
<li> <li>
...@@ -341,6 +353,8 @@ ...@@ -341,6 +353,8 @@
OfferState: "-1", //报价状态 OfferState: "-1", //报价状态
OrderNo: '', OrderNo: '',
OrderId: '', OrderId: '',
IsSelectSale: 1,
EnterID: 0
}, },
boxHeight: 0, boxHeight: 0,
offsetwidth: 0, offsetwidth: 0,
...@@ -387,6 +401,14 @@ ...@@ -387,6 +401,14 @@
subRoomPrice: 0, subRoomPrice: 0,
priceType: 1, priceType: 1,
Datelist:[], Datelist:[],
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
} }
}, },
components: { components: {
...@@ -402,6 +424,15 @@ ...@@ -402,6 +424,15 @@
}, },
}, },
methods: { methods: {
getEmployee() { //员工
let userInfo=this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id;
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
clickCancel(item){ clickCancel(item){
this.CancelMsg.CancelRemark = '' this.CancelMsg.CancelRemark = ''
this.CancelMsg.Id = item.Id this.CancelMsg.Id = item.Id
...@@ -617,6 +648,7 @@ ...@@ -617,6 +648,7 @@
let height = window.innerHeight - 65 - 300; let height = window.innerHeight - 65 - 300;
this.boxHeight = height; this.boxHeight = height;
this.offsetwidth = width; this.offsetwidth = width;
this.getEmployee()
this.getList(); this.getList();
}, },
} }
......
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ 351cb6e3
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<li> <li>
<span> <span>
<em>{{ $t('OrderList.search.daterange') }}</em> <em>{{ $t('OrderList.search.daterange') }}</em>
<el-date-picker style="height: 34px;width: 212px;" value-format="yyyy-MM-dd" v-model="Datelist" type="daterange" <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="Datelist" type="daterange"
:range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDates"> :end-placeholder="$t('OrderList.end')" @change="getDates">
</el-date-picker> </el-date-picker>
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
<li> <li>
<span> <span>
<em>门票时间</em> <em>门票时间</em>
<el-date-picker style="height: 34px;width: 212px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange" <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
:range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse"> :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker> </el-date-picker>
......
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