Skip to content

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

no message

parent d28ea6e1
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 20 deletions
src/components/busManagement/BookAcar/addEditVehicle.vue
View file @ e5d6a705
...@@ -170,6 +170,9 @@ ...@@ -170,6 +170,9 @@
font-size: 12px; font-size: 12px;
padding: 10px 0 0 0; padding: 10px 0 0 0;
} }
.c9e{
color: #9e9e9e;
}
...@@ -366,17 +369,13 @@ ...@@ -366,17 +369,13 @@
<b></b> <b></b>
<div class="infor-list"> <div class="infor-list">
<el-table :data="msg.details" style="width:100%" border> <el-table :data="msg.details" style="width:100%" border>
<el-table-column fixed label="日期" min-width="180"> <el-table-column fixed label="日期" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.UseDate}} {{scope.row.UseDate}}
<span class="c9e">第{{scope.row.DayNum}}天</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="第几天" min-width="180"> <el-table-column label="用车类型" width="300">
<template slot-scope="scope">
第{{scope.row.DayNum}}天
</template>
</el-table-column>
<el-table-column label="用车类型" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item label="用车类型" :prop="'details.'+scope.$index+'.UseType'" :rules="rules.UseType"> <el-form-item label="用车类型" :prop="'details.'+scope.$index+'.UseType'" :rules="rules.UseType">
<el-select v-model='scope.row.UseType' > <el-select v-model='scope.row.UseType' >
...@@ -389,14 +388,22 @@ ...@@ -389,14 +388,22 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="行程信息" min-width="180"> <el-table-column label="行程信息">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item label="行程信息" :prop="'details.'+scope.$index+'.TripInfo'" :rules="rules.TripInfo"> <el-popover trigger="click" placement="top">
<el-input v-model="scope.row.TripInfo" placeholder="输入行程信息"/> <el-input type="textarea" v-model="scope.row.TripInfo"
</el-form-item> :autosize="{ minRows: 3, maxRows: 100}"
placeholder="输入行程信息"/>
<div slot="reference" class="name-wrapper">
<el-form-item label="行程信息" :prop="'details.'+scope.$index+'.TripInfo'" :rules="rules.TripInfo">
<el-input v-model="scope.row.TripInfo" placeholder="输入行程信息" disabled/>
</el-form-item>
</div>
</el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" min-width="180"> <el-table-column label="操作" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small" type="primary" @click="deleteLine(scope.$index)">删除</el-button> <el-button size="small" type="primary" @click="deleteLine(scope.$index)">删除</el-button>
</template> </template>
...@@ -405,7 +412,9 @@ ...@@ -405,7 +412,9 @@
</div> </div>
</div> </div>
<div class="flexOne-infor-box"> <div class="flexOne-infor-box">
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<div style="margin-bottom: 10px;">备注：</div>
<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.CreateRemark" placeholder="订单备注"/> v-model="msg.CreateRemark" placeholder="订单备注"/>
</div> </div>
...@@ -465,6 +474,7 @@ ...@@ -465,6 +474,7 @@
components: { }, components: { },
data() { data() {
return { return {
showTripInfo: false,
EmpId: 0, EmpId: 0,
AirportTypes:[], AirportTypes:[],
isCheck:true, isCheck:true,
...@@ -515,56 +525,67 @@ ...@@ -515,56 +525,67 @@
PickUpInfo: [{ PickUpInfo: [{
required: true, required: true,
// message: '请输入接机信息', // message: '请输入接机信息',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
GoFlightInfo: [{ GoFlightInfo: [{
required: true, required: true,
// message: '请输入去程航班', // message: '请输入去程航班',
message: '',
trigger: 'change' trigger: 'change'
}], }],
BackFlightInfo: [{ BackFlightInfo: [{
required: true, required: true,
// message: '请输入回程航班', // message: '请输入回程航班',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
PeopleNum: [{ PeopleNum: [{
required: true, required: true,
// message: '请输入用车人数', // message: '请输入用车人数',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
UseDayNum: [{ UseDayNum: [{
required: true, required: true,
// message: '请输入行程天数', // message: '请输入行程天数',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
StartDate:[{ StartDate:[{
required: true, required: true,
// message: '请选择开始日期', // message: '请选择开始日期',
message: '',
trigger: 'change' trigger: 'change'
}], }],
BusType: [{ BusType: [{
required: true, required: true,
// message: '请选择用车类型', // message: '请选择用车类型',
message: '',
trigger: 'change' trigger: 'change'
}], }],
GuideInfo: [{ GuideInfo: [{
required: true, required: true,
// message: '请输入导游信息', // message: '请输入导游信息',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
TeamName: [{ TeamName: [{
required: true, required: true,
// message: '请输入团队信息', // message: '请输入团队信息',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
UseType: [{ UseType: [{
required: true, required: true,
// message: '请选择用车类型', // message: '请选择用车类型',
message: '',
trigger: 'change' trigger: 'change'
}], }],
TripInfo: [{ TripInfo: [{
required: true, required: true,
// message: '请输入行程信息', // message: '请输入行程信息',
message: '',
trigger: 'blur' trigger: 'blur'
}], }],
}, },
...@@ -581,7 +602,6 @@ ...@@ -581,7 +602,6 @@
// 删除 // 删除
deleteLine(index){ deleteLine(index){
this.msg.details.splice(index,1) this.msg.details.splice(index,1)
console.log(this.msg.details.length,'==-----')
this.msg.UseDayNum = this.msg.details.length this.msg.UseDayNum = this.msg.details.length
}, },
// 获取车型座位数 // 获取车型座位数
...@@ -774,7 +794,8 @@ ...@@ -774,7 +794,8 @@
BusType: res.data.data.BusType,//用车类型(接口返下拉列表) BusType: res.data.data.BusType,//用车类型(接口返下拉列表)
GuideInfo: res.data.data.GuideInfo,//导游信息 GuideInfo: res.data.data.GuideInfo,//导游信息
TeamName: res.data.data.TeamName,//团队信息 TeamName: res.data.data.TeamName,//团队信息
details: res.data.data.details details: res.data.data.details,
CreateRemark: res.data.data.CreateRemark
} }
this.isCheck = true this.isCheck = true
this.getBusType() this.getBusType()
......
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ e5d6a705
...@@ -361,8 +361,15 @@ ...@@ -361,8 +361,15 @@
> >
</div> </div>
</div> </div>
<div class="c9e fz12" v-if="item.CustomerName"> <div class="c9e fz12" v-if="item.UseCompName||item.CustomerName">
<span>客人信息：{{ item.UseCompName }}({{ item.UseName }})</span> <span>客人信息：
<template v-if="item.EmpId>0">
{{ item.UseCompName }}({{ item.UseName }})
</template>
<template v-else>
{{ item.CustomerName }}({{ item.CustomerContact }})
</template>
<span v-if="item.CustomerTel">/{{item.CustomerTel}}</span> </span>
</div> </div>
<div class="row c9e fz12"> <div class="row c9e fz12">
<template v-if="item.EmName"> <template v-if="item.EmName">
...@@ -489,9 +496,10 @@ ...@@ -489,9 +496,10 @@
{{ item.ShouPeiFee }} {{ item.ShouPeiFee }}
</template> </template>
</el-table-column> </el-table-column>
<template slot="append" v-if="item.CreateRemark"> <template slot="append" v-if="item.CreateRemark||item.Remark">
<div style="padding:10px;color:#f1416c">客户备注：{{item.CreateRemark}}</div> <div v-if="item.CreateRemark" style="padding:10px;color:#f1416c">客户备注：{{item.CreateRemark}}</div>
<div style="padding:0 10px 10px 10px;color:#f1416c"> <div v-if="item.Remark" style="padding:10px;color:#f1416c"
:style="{'padding':!item.CreateRemark?'10px':'0 10px 10px 10px'}">
<template v-if="item.Remark||item.OfferState!=3">OP备注：{{item.Remark}}</template> <template v-if="item.Remark||item.OfferState!=3">OP备注：{{item.Remark}}</template>
<i v-if="item.OfferState!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i> <i v-if="item.OfferState!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
</div> </div>
......
src/components/busManagement/tripBusOrder.vue
View file @ e5d6a705
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>订单流水号</em> <em>订单Id</em>
<el-input v-model='msg.OrderId' class="w200"></el-input> <el-input v-model='msg.OrderId' class="w200"></el-input>
</span> </span>
</li> </li>
......
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