Skip to content

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

no message

parent 49cd2fab
Expand all Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 266 deletions
src/components/busManagement/BookAcar/CharterPreview.vue
View file @ c6259316
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
<span>包车日期：</span> <span>包车日期：</span>
<div> <div>
<el-date-picker class="w150" v-model='SetOutTime' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" <el-date-picker class="w150" v-model='SetOutTime' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
:picker-options="beforeCheck" laceholder="包车日期" @change="getInfo"> :picker-options="beforeCheck" laceholder="包车日期" @change="getQuotation">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
<div style="display: flex;"> <div style="display: flex;">
<template v-for="x in AirportTypes"> <template v-for="x in AirportTypes">
<el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;cursor: pointer;" <el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;cursor: pointer;"
@click="changeDetailListHandler(x,1,msg.OrderId)"> @click="msg.OrderId?changeDetailListHandler():changeDetailListHandler(x,1,msg.OrderId)">
<a>{{ x.AirportName }}</a> <a>{{ x.AirportName }}</a>
</el-tag> </el-tag>
</template> </template>
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
v-model="msg.OrderDate" v-model="msg.OrderDate"
type="datetime" type="datetime"
format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
placeholder="选择预定时间" :picker-options="beforeCheck"> placeholder="选择预定时间" :picker-options="beforeCheck" @change="getTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</li> </li>
...@@ -581,12 +581,6 @@ ...@@ -581,12 +581,6 @@
return time && endTime.getTime() >= time.getTime(); return time && endTime.getTime() >= time.getTime();
} }
}, },
beforeCheckB: {
disabledDate: time => {
let endTime = new Date(this.getBeforeDate(0,new Date().Format("yyyy-MM-dd HH:mm")));
return time && endTime.getTime() >= time.getTime();
}
},
rules:{ rules:{
AirportTerminal: [{ AirportTerminal: [{
required: true, required: true,
...@@ -655,6 +649,9 @@ ...@@ -655,6 +649,9 @@
}; };
}, },
methods: { methods: {
getTime(){
this.SetOutTime = this.msg.OrderDate
},
submit(){ submit(){
this.$refs['msg'].validate((valid) => { this.$refs['msg'].validate((valid) => {
if (valid) { if (valid) {
...@@ -690,10 +687,10 @@ ...@@ -690,10 +687,10 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success('下单成功'); this.Success('下单成功');
this.$router.push({ this.$router.push({
path: "/CharterOrderList", path: `/CharterOrderList?OrderType=${this.msg.OrderType}`,
}); });
} else { } else {
this.Error('下单失败') this.Error(res.data.message)
} }
}, },
err => { err => {
...@@ -746,10 +743,11 @@ ...@@ -746,10 +743,11 @@
let types = this.types.filter(x => x.checked) let types = this.types.filter(x => x.checked)
if(types&&types[0]){ if(types&&types[0]){
this.msg.CarId = types[0].Id this.msg.CarId = types[0].Id
} }
this.getQuotation()
this.isCheck = this.types.findIndex(x => x.checked) > -1 this.isCheck = this.types.findIndex(x => x.checked) > -1
} }
this.getQuotation()
this.changePeople() this.changePeople()
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -767,10 +765,12 @@ ...@@ -767,10 +765,12 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let newData = res.data.data.filter(x=>x.Date==this.SetOutTime) let newData = res.data.data.filter(x=>x.Date==this.SetOutTime)
let types = this.types.filter(x => x.checked) let types = this.types.filter(x => x.checked)
this.types.forEach((item,index) => { newData.length>0&&this.types.forEach((item,index) => {
if(types&&types[0]&&types[0].Id==item.Id&&newData[0].Price>0){ if(types&&types[0]&&types[0].Id==item.Id&&newData[0].Price>0){
item.B2BPrice = newData[0].Price item.B2BPrice = newData[0].Price
this.msg.Unit_Price = newData[0].Price this.msg.Unit_Price = newData[0].Price
}else{
item.B2BPrice = 0.0
} }
}); });
if(this.isCheck){ if(this.isCheck){
...@@ -810,9 +810,6 @@ ...@@ -810,9 +810,6 @@
if(this.types&&this.types.length==0){ if(this.types&&this.types.length==0){
message.errorMsg(`${t('v102.ticket.nobj')}`) message.errorMsg(`${t('v102.ticket.nobj')}`)
} }
if(this.msg.OrderId){
this.getOrderInfo()
}
}else{ }else{
this.Error(res.data.message) this.Error(res.data.message)
...@@ -830,10 +827,11 @@ ...@@ -830,10 +827,11 @@
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.SetOutTime = res.data.data.OrderDate
this.msg = { this.msg = {
OrderId: res.data.data.OrderId, OrderId: res.data.data.OrderId,
OrderType: String(res.data.data.OrderType), OrderType: String(res.data.data.OrderType),
OrderDate:res.data.data.OrderDate,//预定日期 OrderDate: res.data.data.OrderDate,//预定日期
Unit_Price: res.data.data.Unit_Price,//单价 Unit_Price: res.data.data.Unit_Price,//单价
Num: res.data.data.Num,//数量 Num: res.data.data.Num,//数量
Money: res.data.data.Money, Money: res.data.data.Money,
...@@ -858,6 +856,7 @@ ...@@ -858,6 +856,7 @@
ProductId: res.data.data.ProductId, ProductId: res.data.data.ProductId,
CarId: res.data.data.CarId,//产品类型ID CarId: res.data.data.CarId,//产品类型ID
} }
this.getQuotation()
this.AirportTypes.forEach(x=>{ this.AirportTypes.forEach(x=>{
if(x.AirportId==res.data.data.AirportId){ if(x.AirportId==res.data.data.AirportId){
this.changeDetailListHandler(x,1) this.changeDetailListHandler(x,1)
...@@ -865,9 +864,12 @@ ...@@ -865,9 +864,12 @@
}) })
this.types.forEach(x=>{ this.types.forEach(x=>{
if(x.Id==res.data.data.CarId){ if(x.Id==res.data.data.CarId){
x.num = res.data.data.Num
x.B2BPrice = res.data.data.Unit_Price
this.changeDetailListHandler(x,3) this.changeDetailListHandler(x,3)
} }
}) })
} }
}) })
...@@ -876,43 +878,20 @@ ...@@ -876,43 +878,20 @@
this.detailsRow = JSON.parse(JSON.stringify(this.detailsObj)) this.detailsRow = JSON.parse(JSON.stringify(this.detailsObj))
this.showDetails = true this.showDetails = true
}, },
getProvinceList(ID, type) {
//根据省份获取城市
let msg = {
Id: ID
};
if (type == 1) {
this.msg.QProvince = 0;
this.msg.QCity = 0;
this.provinceList = [];
this.cityList = [];
} else if (type == 2) {
this.msg.City = 0;
this.cityList = [];
}
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
if (type == 1) {
this.provinceList = res.data.data;
} else if (type == 2) {
this.cityList = res.data.data;
}
},
err => {}
);
},
}, },
mounted() { mounted() {
}, },
created() { created() {
this.msg.OrderId = this.$route.query.OrderId
this.msg.ProductId = this.$route.query.id this.msg.ProductId = this.$route.query.id
this.SetOutTime = this.$route.query.OrderDate this.SetOutTime = this.$route.query.OrderDate
// this.msg.OrderDate = this.$route.query.OrderDate+ ' 00:00' // this.msg.OrderDate = this.$route.query.OrderDate+ ' 00:00'
this.getInfo() this.getInfo()
if(this.msg.OrderId){
this.getOrderInfo()
}
} }
}; };
......
src/components/busManagement/BookAcar/components/BookAcarOrder.vue
View file @ c6259316
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</span> </span>
</li> </li>
<li> <li>
<span><em>客人名称</em> <span><em>客人姓/名</em>
<el-input clearable v-model="msg.SurName" placeholder="客人姓" class="w110"/> <el-input clearable v-model="msg.SurName" placeholder="客人姓" class="w110"/>
<el-input clearable v-model="msg.Name" placeholder="客人名" class="w110"/> <el-input clearable v-model="msg.Name" placeholder="客人名" class="w110"/>
</span> </span>
...@@ -90,15 +90,29 @@ ...@@ -90,15 +90,29 @@
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li v-if="Title!='销售'">
<span>
<em>业务员</em>
<el-select filterable v-model='msg.EnterID' class="">
<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>
</li>
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="msg.pageIndex=1,currentPage=1,GetList()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="msg.pageIndex=1,currentPage=1,GetList()" />
</li> </li>
</ul> </ul>
</div> </div>
<template> <template>
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="GetList"> </OrderList> <OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
<div v-if="OrderList.length==0" style="text-align: center;">暂无数据</div> <div v-if="OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total> <el-pagination v-if="OrderList.length>0" background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination> </el-pagination>
</template> </template>
...@@ -123,7 +137,6 @@ ...@@ -123,7 +137,6 @@
msg:{ msg:{
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
Mobile: '',//电话
OrderType: '1', OrderType: '1',
OrderId: '', OrderId: '',
...@@ -137,6 +150,7 @@ ...@@ -137,6 +150,7 @@
OrderETime: '', OrderETime: '',
ProductName: '', ProductName: '',
Mobile: '',//电话 Mobile: '',//电话
EnterID: '',//业务员
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
...@@ -158,6 +172,14 @@ ...@@ -158,6 +172,14 @@
Datelist:'', Datelist:'',
DatelistUse:'', DatelistUse:'',
Title:'', Title:'',
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
}; };
}, },
watch: { watch: {
...@@ -170,6 +192,13 @@ ...@@ -170,6 +192,13 @@
}, },
}, },
methods: { methods: {
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
getDatesUse(){ getDatesUse(){
if(this.DatelistUse){ if(this.DatelistUse){
this.msg.OrderSTime = this.DatelistUse[0] this.msg.OrderSTime = this.DatelistUse[0]
...@@ -199,19 +228,6 @@ ...@@ -199,19 +228,6 @@
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d); d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
return d.toLocaleDateString().match(/\d+/g).join('-') return d.toLocaleDateString().match(/\d+/g).join('-')
}, },
// 获取酒店下拉
initHotels() {
this.apipost("hotel_post_GetHasStockHotelList", {},
res => {
if (res.data.resultCode == 1) {
this.HotelList = res.data.data;
} else {
message.errorMsg(res.data.message);
}
},
err => {}
);
},
getyMDOne(){ getyMDOne(){
let myDate = new Date() let myDate = new Date()
let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????) let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????)
...@@ -240,7 +256,7 @@ ...@@ -240,7 +256,7 @@
if(this.pagesTitle=='销售'){ if(this.pagesTitle=='销售'){
url = "CarSingle_post_GetSaleMyCarOrderPageList" url = "CarSingle_post_GetSaleMyCarOrderPageList"
}else{ }else{
url = "ticket_post_GetAdminTicketOrderPageList" url = "CarSingle_post_GetAdminCarOrderPageList"
} }
this.apipost(url, this.msg, this.apipost(url, this.msg,
res => { res => {
...@@ -276,14 +292,19 @@ ...@@ -276,14 +292,19 @@
if(this.$route.query.OrderId){ if(this.$route.query.OrderId){
this.msg.OrderId=this.$route.query.OrderId this.msg.OrderId=this.$route.query.OrderId
} }
let userInfo=this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
this.msg.EnterID = userInfo.EmployeeId;
}, },
mounted() { mounted() {
this.Title = this.pagesTitle this.Title = this.pagesTitle
if(this.Title!='销售'){
this.getEmployee()
}
this.Datelist = this.getyMDOne() this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.GetList(); this.GetList();
this.initHotels();//酒店名称下拉
//自适应高度调节 //自适应高度调节
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
......
src/components/busManagement/BookAcar/order.vue
View file @ c6259316
<style> <style>
.HotelWorkList .has-gutter tr th,
.el-table th.is-leaf {
background-color: #EAEAEA !important;
}
.HotelWorkList .HW_hotelDialog {
width: 900px;
}
.HotelWorkList .Hw_tableOne {
width: 100%;
height: 40px;
background-color: #EAEAEA;
}
.HotelWorkList .Hw_tableOne th {
text-align: center;
}
.HotelWorkList .HotelWorkInput .el-input {
width: 223px;
}
.HotelWorkList .HworkInput .el-input {
width: 110px;
}
</style> </style>
<template> <template>
...@@ -68,7 +41,11 @@ ...@@ -68,7 +41,11 @@
}, },
mounted() { mounted() {
if(this.$route.query.OrderType){
this.tab = this.$route.query.OrderType
}else{
this.tab = '0'
}
}, },
}; };
......
src/components/busManagement/BookAcar/orderOP.vue 0 → 100644
View file @ c6259316
<style>
</style>
<template>
<div>
<el-tabs v-model="tab" @tab-click="handleClick">
<el-tab-pane label="团队订单" name="0">用户管理</el-tab-pane>
<el-tab-pane label="接机订单" name="1">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
</el-tab-pane>
<el-tab-pane label="送机订单" name="2">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
</el-tab-pane>
<el-tab-pane label="包车订单" name="3">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import BookAcarOrder from './components/BookAcarOrder.vue';
export default {
components: { BookAcarOrder },
data() {
return {
pagesTitle: 'OP',
tab:'1'
};
},
watch: {
pagesTitle(val,oldval){
}
},
methods: {
handleClick(tab, event){
this.tab = tab.name
}
},
created() {
},
mounted() {
if(this.$route.query.OrderType){
this.tab = this.$route.query.OrderType
}else{
this.tab = '0'
}
},
};
</script>
<style>
</style>
src/router/config.js
View file @ c6259316
...@@ -2101,6 +2101,14 @@ export default { ...@@ -2101,6 +2101,14 @@ export default {
title: '用车订单' title: '用车订单'
}, },
}, },
{
path: '/CharterOrderListOP', //OP用车订单
name: 'CharterOrderListOP',
component: resolve => require(['@/components/busManagement/BookAcar/orderOP'], resolve),
meta: {
title: '用车订单'
},
},
{ {
path: '/CharterAddEditVehicle', //新增/编辑团订 path: '/CharterAddEditVehicle', //新增/编辑团订
name: 'CharterAddEditVehicle', name: 'CharterAddEditVehicle',
......
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