Skip to content

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

no message

parent 49cd2fab
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 @@
<span>包车日期：</span>
<div>
<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>
</div>
</div>
......@@ -310,7 +310,7 @@
<div style="display: flex;">
<template v-for="x in AirportTypes">
<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>
</el-tag>
</template>
......@@ -406,7 +406,7 @@
v-model="msg.OrderDate"
type="datetime"
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-form-item>
</li>
......@@ -581,12 +581,6 @@
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:{
AirportTerminal: [{
required: true,
......@@ -655,6 +649,9 @@
};
},
methods: {
getTime(){
this.SetOutTime = this.msg.OrderDate
},
submit(){
this.$refs['msg'].validate((valid) => {
if (valid) {
......@@ -690,10 +687,10 @@
if (res.data.resultCode == 1) {
this.Success('下单成功');
this.$router.push({
path: "/CharterOrderList",
path: `/CharterOrderList?OrderType=${this.msg.OrderType}`,
});
} else {
this.Error('下单失败')
this.Error(res.data.message)
}
},
err => {
......@@ -746,10 +743,11 @@
let types = this.types.filter(x => x.checked)
if(types&&types[0]){
this.msg.CarId = types[0].Id
}
this.getQuotation()
this.isCheck = this.types.findIndex(x => x.checked) > -1
}
this.getQuotation()
this.changePeople()
this.$forceUpdate()
},
......@@ -767,10 +765,12 @@
if (res.data.resultCode == 1) {
let newData = res.data.data.filter(x=>x.Date==this.SetOutTime)
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){
item.B2BPrice = newData[0].Price
this.msg.Unit_Price = newData[0].Price
}else{
item.B2BPrice = 0.0
}
});
if(this.isCheck){
......@@ -810,9 +810,6 @@
if(this.types&&this.types.length==0){
message.errorMsg(`${t('v102.ticket.nobj')}`)
}
if(this.msg.OrderId){
this.getOrderInfo()
}
}else{
this.Error(res.data.message)
......@@ -830,10 +827,11 @@
},
res => {
if (res.data.resultCode == 1) {
this.SetOutTime = res.data.data.OrderDate
this.msg = {
OrderId: res.data.data.OrderId,
OrderType: String(res.data.data.OrderType),
OrderDate:res.data.data.OrderDate,//预定日期
OrderDate: res.data.data.OrderDate,//预定日期
Unit_Price: res.data.data.Unit_Price,//单价
Num: res.data.data.Num,//数量
Money: res.data.data.Money,
......@@ -858,6 +856,7 @@
ProductId: res.data.data.ProductId,
CarId: res.data.data.CarId,//产品类型ID
}
this.getQuotation()
this.AirportTypes.forEach(x=>{
if(x.AirportId==res.data.data.AirportId){
this.changeDetailListHandler(x,1)
......@@ -865,9 +864,12 @@
})
this.types.forEach(x=>{
if(x.Id==res.data.data.CarId){
x.num = res.data.data.Num
x.B2BPrice = res.data.data.Unit_Price
this.changeDetailListHandler(x,3)
}
})
}
})
......@@ -876,43 +878,20 @@
this.detailsRow = JSON.parse(JSON.stringify(this.detailsObj))
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() {
},
created() {
this.msg.OrderId = this.$route.query.OrderId
this.msg.ProductId = this.$route.query.id
this.SetOutTime = this.$route.query.OrderDate
// this.msg.OrderDate = this.$route.query.OrderDate+ ' 00:00'
this.getInfo()
if(this.msg.OrderId){
this.getOrderInfo()
}
}
};
......
src/components/busManagement/BookAcar/components/BookAcarOrder.vue
View file @ c6259316
......@@ -52,7 +52,7 @@
</span>
</li>
<li>
<span><em>客人名称</em>
<span><em>客人姓/名</em>
<el-input clearable v-model="msg.SurName" placeholder="客人姓" class="w110"/>
<el-input clearable v-model="msg.Name" placeholder="客人名" class="w110"/>
</span>
......@@ -90,15 +90,29 @@
</el-date-picker>
</span>
</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>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="msg.pageIndex=1,currentPage=1,GetList()" />
</li>
</ul>
</div>
<template>
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="GetList"> </OrderList>
<div v-if="OrderList.length==0" style="text-align: center;">暂无数据</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
<div v-if="OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
<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>
</template>
......@@ -123,7 +137,6 @@
msg:{
pageIndex: 1,
pageSize: 5,
Mobile: '',//电话
OrderType: '1',
OrderId: '',
......@@ -137,6 +150,7 @@
OrderETime: '',
ProductName: '',
Mobile: '',//电话
EnterID: '',//业务员
},
total: 0,
currentPage: 1,
......@@ -158,6 +172,14 @@
Datelist:'',
DatelistUse:'',
Title:'',
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
};
},
watch: {
......@@ -170,6 +192,13 @@
},
},
methods: {
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
getDatesUse(){
if(this.DatelistUse){
this.msg.OrderSTime = this.DatelistUse[0]
......@@ -199,19 +228,6 @@
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
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(){
let myDate = new Date()
let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????)
......@@ -240,7 +256,7 @@
if(this.pagesTitle=='销售'){
url = "CarSingle_post_GetSaleMyCarOrderPageList"
}else{
url = "ticket_post_GetAdminTicketOrderPageList"
url = "CarSingle_post_GetAdminCarOrderPageList"
}
this.apipost(url, this.msg,
res => {
......@@ -276,14 +292,19 @@
if(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() {
this.Title = this.pagesTitle
if(this.Title!='销售'){
this.getEmployee()
}
this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage();
this.GetList();
this.initHotels();//酒店名称下拉
//自适应高度调节
this.com_onresize();
window.onresize = () => {
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ c6259316
......@@ -538,7 +538,7 @@
</el-table>
</div>
<div class="row justify-sb mt mb20">
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="column px15 bgf5 radius5 flex-g pa relative">
<div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF">
<span
......@@ -652,53 +652,21 @@
<i v-loading="msg.OrderId==item.OrderId&&loading1"></i>
<span class="c20C997">确认订单</span>
</div>
<div
v-if="item.OrderStatus == 2&&item.MailingState == 2&&pagesTitle!='销售'"
class="row-c cursor-pointer radius5 cancel py5"
@click="clickRightButtom(item, 2)"
>
<i v-loading="msg.OrderId==item.OrderId&&loading1"></i>
<span class="cF1416C">邮寄</span>
</div>
<div
v-if="item.OrderStatus == 2&&item.MailingState == 1&&pagesTitle!='销售'"
class="row-c cursor-pointer radius5 cancel py5"
@click="clickRightButtom(item, 3)"
>
<i v-loading="loading1"></i>
<span class="cF1416C">设置自提地址</span>
</div>
<!-- <div
v-if="item.OrderStatus == 2 || item.OrderStatus == 4"
class="row-c cursor-pointer radius5 change py5"
@click="goRoomDetails(item, '订房详情')"
>
<span class="c059FF6">明细/编辑</span>
</div> -->
<div
v-if="item.OrderStatus == 1&&pagesTitle=='销售'"
class="row-c cursor-pointer radius5 change py5"
@click="goRoomDetails(item, '预定变更')"
@click="goRoomDetails(item, '变更订单')"
>
<span class="c059FF6">订单变更</span>
</div>
<div
v-if="item.OrderStatus > 1"
class="row-c cursor-pointer radius5 change1 py5"
@click="clickRightButtom(item, 4)"
@click="clickRightButtom(item, 2)"
>
<i v-loading="msg.OrderId==item.OrderId&&loading2"></i>
<span class="c20C997">收损</span>
</div>
<!-- <template v-if="item.OrderStatus==2">
<div class="column-jac fz12 flex-s c20C997">
<div class="mb5">已支付</div>
<div>
<span class="fbold fz14">{{item.Money.toFixed(2)}}</span>
<span>日元</span>
</div>
</div>
</template> -->
</div>
</div>
<div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
......@@ -712,25 +680,13 @@
<el-dialog
custom-class="w400"
:title="typeState==3?'设置自提地址':'设置收损金额'"
title="设置收损金额"
:visible.sync="outerVisible"
>
<div>
<el-form label-width="80px" :model="msg" :rules="rules" ref="msg">
<el-row :gutter="20">
<!-- <el-col :span="20">
<el-form-item label="订单状态" prop="State">
<el-select v-model="msg.State" class="w110 HworkInput">
<el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="20" v-if="typeState==3">
<el-form-item label="自提地址" prop="SelffetchAddress">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" v-model="msg.SelffetchAddress"></el-input>
</el-form-item>
</el-col>
<el-col :span="20" v-if="typeState==4">
<el-col :span="20">
<el-form-item label="收损金额" prop="LossMoney">
<el-input-number
class="w200"
......@@ -792,93 +748,6 @@
</el-row>
</div>
</el-dialog>
<!-- 变更订单 -->
<el-dialog
custom-class="w800"
title="变更订单"
:visible.sync="ChangeOrderDialog"
>
<div style="padding-bottom:20px">
<div class="flexOne-form-bj">
<h3>取票方式</h3>
<div class="flexOne-type">
<b>取票方式：</b>
<div>
<el-radio v-model="msgParameter.MailingState" label="1">自行取票</el-radio>
<el-radio v-model="msgParameter.MailingState" label="2" >邮寄票券</el-radio>
</div>
</div>
<div class="flexOne-description">
<b>自行取票说明</b>
<p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p>
</div>
<div class="flexOne-infor-box">
<b>客人讯息 邮寄讯息</b>
<el-form label-width="80px" :model="msgParameter" :rules="rules2" ref="msgParameter">
<div class="infor-list">
<!-- <div class="list-title">
<li>中文姓名</li>
<li>英文姓名</li>
<li>性别</li>
<li>联络电话</li>
<li>收件地址</li>
</div> -->
</span>
<div class="list-centent" :class="{'active':msg.MailingState==1}">
<li>
<el-form-item label="中文名" prop="Name">
<el-input v-model="msgParameter.Name" placeholder="请输入名称"/>
</el-form-item>
</li>
<li>
<el-form-item label="英文名" prop="EName">
<el-input v-model="msgParameter.EName" placeholder="请输入英文名"/>
</el-form-item>
</li>
<li>
<el-form-item label="电话" prop="Mobile">
<el-input type="Number" v-model="msgParameter.Mobile" placeholder="请输入电话"/>
</el-form-item>
</li>
<li v-if="msgParameter.MailingState==2">
<el-form-item label="地址" prop="MailingAddress">
<el-input style="border-radius: 3px;" v-model="msgParameter.MailingAddress" placeholder="请输入邮寄地址"/>
</el-form-item>
</li>
<li class="bottom">
<el-form-item label="性别" prop="Sex">
<el-radio v-model="msgParameter.Sex" label="1">男</el-radio>
<el-radio v-model="msgParameter.Sex" label="2" >女</el-radio>
</el-form-item>
</li>
</div>
</div>
</el-form>
<div style="margin-top: 20px;">
<el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}"
v-model="msgParameter.Remark" placeholder="订单备注"/>
</div>
</div>
</div>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<input
type="button"
class="normalBtn"
value="取消"
@click="ChangeOrderDialog=false"
/>
<input
type="button"
class="hollowFixedBtn"
value="确定"
@click="submit2"
/>
</el-col>
</el-row>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -1141,15 +1010,21 @@
tab: title
}
});
}else{//变更门票预定
this.msgParameter = JSON.parse(JSON.stringify(obj))
this.msgParameter.MailingState = JSON.stringify(this.msgParameter.MailingState)
this.msgParameter.Sex = JSON.stringify(this.msgParameter.Sex)
this.ChangeOrderDialog = true
}else{//变更预定
console.log()
this.$router.push({
name: 'CharterPreview',
query: {
OrderId: obj.OrderId,
id: obj.ProductId,
blank: "y",
tab: title
}
});
}
},
clickRightButtom(item, type) {
// 0取消订单 1确认订单 2已邮寄 3设置自提地址 4收损
// 0取消订单 1确认订单 2收损
this.msg.OrderId = item.OrderId;
this.msg.SelffetchAddress = item.SelffetchAddress
this.items = item
......@@ -1167,7 +1042,6 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.loading0 = true
this.cancelOrderHandler()
}).catch(err=>{
this.loading0= false
......@@ -1178,15 +1052,7 @@
if (!this.loading1) {
this.confirmFun(item, type);
}
} else if (type == 2) {
if (!this.loading1) {
this.confirmFun(item, type);
}
} else if (type == 3) {
if (!this.loading1) {
this.outerVisible = true;
}
} else if (type == 4) {
}else if (type == 2) {
if (!this.loading2) {
this.outerVisible = true;
this.msg.LossMoney = item.LossMoney ? item.LossMoney : 0;
......@@ -1245,7 +1111,7 @@
if (this.loading0) return;
this.loading0 = true
this.apipost(
"ticket_post_CancelSaleTicketOrder",
"CarSingle_post_CancelSaleCarOrder",
{
OrderId: this.cancelOrderId,
IsOPCancel: this.Title!='销售'?1:0,
......@@ -1271,13 +1137,7 @@
},
saveUpdate() {
let text
if(this.typeState==3){
text = '是否确认设置自取地址?'
}
if(this.typeState==4){
text = '是否确认设置收损?'
}
let text = '是否确认设置收损?'
this.$confirm(text, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -1286,12 +1146,11 @@
.then(() => {
this.loading2 = true;
this.apipost(
"ticket_post_SetSaleTicketOrderState",
"CarSingle_post_SetAdminCarOrderState",
{
OrderId: this.msg.OrderId,
State: this.typeState,
SelffetchAddress: this.typeState==3?this.msg.SelffetchAddress:'',
LossMoney: this.typeState==4?this.msg.LossMoney:'',
LossMoney: this.msg.LossMoney,
},
res => {
if (res.data.resultCode == 1) {
......@@ -1311,13 +1170,7 @@
.catch(() => {});
},
confirmFun(item,type) {
let text
if(type==1){
text = '是否确认订单?'
}
if(type==2){
text = '是否确认邮寄?'
}
let text = '是否确认订单?'
this.$confirm(text, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -1326,12 +1179,11 @@
.then(() => {
this.loading1 = true;
this.apipost(
"ticket_post_SetSaleTicketOrderState",
"CarSingle_post_SetAdminCarOrderState",
{
OrderId: item.OrderId,
State: type,
SelffetchAddress: type==3?this.msg.SelffetchAddress:'',
LossMoney: type==4?this.msg.LossMoney:'',
LossMoney: type==2?this.msg.LossMoney:'',
},
res => {
if (res.data.resultCode == 1) {
......
src/components/busManagement/BookAcar/order.vue
View file @ c6259316
<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>
<template>
......@@ -68,7 +41,11 @@
},
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 {
title: '用车订单'
},
},
{
path: '/CharterOrderListOP', //OP用车订单
name: 'CharterOrderListOP',
component: resolve => require(['@/components/busManagement/BookAcar/orderOP'], resolve),
meta: {
title: '用车订单'
},
},
{
path: '/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