Commit f9b4a97c authored by youjie's avatar youjie

no message

parent 07d127f8
...@@ -170,21 +170,21 @@ ...@@ -170,21 +170,21 @@
font-size: 12px; font-size: 12px;
padding: 10px 0 0 0; padding: 10px 0 0 0;
} }
.flexOne-right{ .flexOne-right{
width: 300px; width: 300px;
flex-shrink: 0; flex-shrink: 0;
...@@ -281,13 +281,13 @@ ...@@ -281,13 +281,13 @@
/deep/.el-date-editor.el-input, .el-date-editor.el-input__inner{ /deep/.el-date-editor.el-input, .el-date-editor.el-input__inner{
width: auto; width: auto;
} }
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne">
<div class="flexOne-left"> <div class="flexOne-left">
<div class="flexOne-form-bj"> <div class="flexOne-form-bj">
<h3> <h3>
<template v-if="detailsObj.CarType==1">接机</template><template v-if="detailsObj.CarType==2">送机</template><template v-if="detailsObj.CarType==3">包车</template>信息 <template v-if="detailsObj.CarType==1">接机</template><template v-if="detailsObj.CarType==2">送机</template><template v-if="detailsObj.CarType==3">包车</template>信息
</h3> </h3>
<div class="listone-form"> <div class="listone-form">
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
<div class="time-box center"> <div class="time-box center">
<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="getQuotation"> :picker-options="beforeCheck" laceholder="包车日期" @change="getQuotation">
</el-date-picker> </el-date-picker>
</div> </div>
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
<span>选择机场:</span> <span>选择机场:</span>
<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="msg.OrderId?changeDetailListHandler():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>
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
<span>上车范围:</span> <span>上车范围:</span>
<div style="display: flex;"> <div style="display: flex;">
<template v-for="x in PlaceTypes"> <template v-for="x in PlaceTypes">
<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="msg.OrderId?changeDetailListHandler(x,2,msg.OrderId):changeDetailListHandler(x,2,msg.OrderId)"> @click="msg.OrderId?changeDetailListHandler(x,2,msg.OrderId):changeDetailListHandler(x,2,msg.OrderId)">
<a>{{ x.Address }}</a> <a>{{ x.Address }}</a>
<span>{{ x.Range }}m范围</span> <span>{{ x.Range }}m范围</span>
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
<span>下车范围:</span> <span>下车范围:</span>
<div style="display: flex;"> <div style="display: flex;">
<template v-for="x in PlaceTypes2"> <template v-for="x in PlaceTypes2">
<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="msg.OrderId?changeDetailListHandler(x,4,msg.OrderId):changeDetailListHandler(x,4,msg.OrderId)"> @click="msg.OrderId?changeDetailListHandler(x,4,msg.OrderId):changeDetailListHandler(x,4,msg.OrderId)">
<a>{{ x.Address }}</a> <a>{{ x.Address }}</a>
<span>{{ x.Range }}m范围</span> <span>{{ x.Range }}m范围</span>
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
<span>选择车型:</span> <span>选择车型:</span>
<div style="display: flex;"> <div style="display: flex;">
<template v-for="x in types"> <template v-for="x in types">
<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,3)"> @click="changeDetailListHandler(x,3)">
<a>{{ x.CarName }}</a> <a>{{ x.CarName }}</a>
<span v-if="x.B2BPrice>0">{{ x.B2BPrice.toFixed(2) }}</span> <span v-if="x.B2BPrice>0">{{ x.B2BPrice.toFixed(2) }}</span>
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
<el-date-picker <el-date-picker
v-model="msg.FlightTime" v-model="msg.FlightTime"
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="msg.OrderType==1?'选择抵达时间':'选择送机时间'" :picker-options="beforeCheck"> :placeholder="msg.OrderType==1?'选择抵达时间':'选择送机时间'" :picker-options="beforeCheck">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -438,9 +438,9 @@ ...@@ -438,9 +438,9 @@
<div class="list-centent active"> <div class="list-centent active">
<li v-if="msg.OrderType!=1"> <li v-if="msg.OrderType!=1">
<el-form-item label="上车地点" prop="GetonAddress"> <el-form-item label="上车地点" prop="GetonAddress">
<el-input type="textarea" :autosize="{ minRows: 1, maxRows: 4}" v-model="msg.GetonAddress" <el-input type="textarea" :autosize="{ minRows: 1, maxRows: 4}" v-model="msg.GetonAddress"
placeholder="请输入上车地点"> placeholder="请输入上车地点">
</el-input> </el-input>
<!-- <span @click="clickMapAddress(1,1,msg.GetonAddress)" <!-- <span @click="clickMapAddress(1,1,msg.GetonAddress)"
class="el-icon-location" style="font-size: 16px;color: #E95252;position: absolute;right: 10px;top: 15px;"></span> --> class="el-icon-location" style="font-size: 16px;color: #E95252;position: absolute;right: 10px;top: 15px;"></span> -->
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
</li> </li>
<li v-if="msg.OrderType!=2"> <li v-if="msg.OrderType!=2">
<el-form-item label="下车地点" prop="GetoffAddress" > <el-form-item label="下车地点" prop="GetoffAddress" >
<el-input type="textarea" :autosize="{ minRows: 1, maxRows: 4}" v-model="msg.GetoffAddress" <el-input type="textarea" :autosize="{ minRows: 1, maxRows: 4}" v-model="msg.GetoffAddress"
placeholder="请输入下车地点"> placeholder="请输入下车地点">
</el-input> </el-input>
<!-- <span @click="clickMapAddress(2,2,msg.GetoffAddress)" <!-- <span @click="clickMapAddress(2,2,msg.GetoffAddress)"
...@@ -531,18 +531,18 @@ ...@@ -531,18 +531,18 @@
</div> </div>
</div> </div>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" <el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}"
v-model="msg.Remark" placeholder="订单备注"/> v-model="msg.Remark" placeholder="订单备注"/>
</div> </div>
</div> </div>
</el-form> </el-form>
</div> </div>
<div class="notice"> <div class="notice">
<b>预定须知</b> <b>预定须知</b>
<p>{{detailsObj.BuyNotes}}</p> <p>{{detailsObj.BuyNotes}}</p>
</div> </div>
</div> </div>
<div class="flexOne-right"> <div class="flexOne-right">
<h4>结算账单</h4> <h4>结算账单</h4>
...@@ -575,12 +575,14 @@ ...@@ -575,12 +575,14 @@
</div> </div>
</div> </div>
<div class="right-Submit"> <div class="right-Submit">
<button v-if="!isCheck" class="hollowFixedBtn" type="primary"> <!-- <el-button v-if="!isCheck" class="hollowFixedBtn" type="primary">
提交订单 提交订单
</button> </el-button> -->
<button v-else class="normalBtn" type="primary" @click="submit"> <el-button :disabled="!isCheck"
:loading="loading"
class="normalBtn" type="primary" @click="submit">
提交订单 提交订单
</button> </el-button>
</div> </div>
</div> </div>
<!-- 选择地址 --> <!-- 选择地址 -->
...@@ -592,7 +594,7 @@ ...@@ -592,7 +594,7 @@
<el-dialog custom-class="w1000" title="包车产品详情" :visible.sync="showDetails" center @close="showDetails=false"> <el-dialog custom-class="w1000" title="包车产品详情" :visible.sync="showDetails" center @close="showDetails=false">
<Details :detailsObj="detailsRow"></Details> <Details :detailsObj="detailsRow"></Details>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -755,6 +757,7 @@ ...@@ -755,6 +757,7 @@
this.msg.Num = x.num this.msg.Num = x.num
} }
}) })
this.loading = true
this.apipost("CarSingle_post_SetSaleCarOrder", this.msg, this.apipost("CarSingle_post_SetSaleCarOrder", this.msg,
res => { res => {
this.loading = false; this.loading = false;
...@@ -768,7 +771,7 @@ ...@@ -768,7 +771,7 @@
} }
}, },
err => { err => {
this.Error(err.message) this.Error(err.message)
}); });
}, },
changePeople(val) { changePeople(val) {
...@@ -832,7 +835,9 @@ ...@@ -832,7 +835,9 @@
} }
if(i==3){ if(i==3){
this.types.forEach(x=>{ this.types.forEach(x=>{
if(x.Id!=e.Id){
x.checked = false x.checked = false
}
}) })
if (e.checked) { if (e.checked) {
e.num = 1 e.num = 1
...@@ -841,11 +846,11 @@ ...@@ -841,11 +846,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.getQuotation()
this.isCheck = this.types.findIndex(x => x.checked) > -1 this.isCheck = this.types.findIndex(x => x.checked) > -1
} }
this.changePeople() this.changePeople()
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -861,7 +866,10 @@ ...@@ -861,7 +866,10 @@
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let newData = res.data.data.filter(x=>x.Date==this.SetOutTime) let SetOutTime = this.SetOutTime.length>9?this.SetOutTime.slice(0,10):this.SetOutTime
// console.log(SetOutTime,'=====')
let newData = res.data.data.filter(x=>x.Date==SetOutTime)
console.log(newData,'=======0000')
let types = this.types.filter(x => x.checked) let types = this.types.filter(x => x.checked)
newData.length>0&&this.types.forEach((item,index) => { newData.length>0&&this.types.forEach((item,index) => {
if(this.msg.CarId==item.Id&&newData[0].Price){ if(this.msg.CarId==item.Id&&newData[0].Price){
...@@ -871,13 +879,9 @@ ...@@ -871,13 +879,9 @@
item.B2BPrice = 0.0 item.B2BPrice = 0.0
} }
}); });
if(this.isCheck){ this.calcMoneyHandler()
this.calcMoneyHandler()
}else{
this.msg.Money=0.0
}
} }
}) })
}, },
getInfo(){ getInfo(){
...@@ -916,7 +920,7 @@ ...@@ -916,7 +920,7 @@
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')}`)
} }
}else{ }else{
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -937,7 +941,7 @@ ...@@ -937,7 +941,7 @@
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,
...@@ -975,16 +979,16 @@ ...@@ -975,16 +979,16 @@
this.changeDetailListHandler(x,3) this.changeDetailListHandler(x,3)
} }
}) })
} }
}) })
}, },
showCardHandler() { showCardHandler() {
this.detailsRow = JSON.parse(JSON.stringify(this.detailsObj)) this.detailsRow = JSON.parse(JSON.stringify(this.detailsObj))
this.showDetails = true this.showDetails = true
}, },
}, },
mounted() { mounted() {
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
...@@ -1005,6 +1009,5 @@ ...@@ -1005,6 +1009,5 @@
} }
} }
}; };
</script> </script>
\ No newline at end of file
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