Skip to content

C
cloud-platform-ui
Commit 7474fa8b authored by hanfeng's avatar hanfeng
Browse files
Options

修改旅游订单页面

parent 1fb4b7a9
Show whitespace changes
Inline Side-by-side
Showing with 285 additions and 279 deletions
src/views/order/tourOrderInfo/index.vue
View file @ 7474fa8b
......@@ -7,15 +7,16 @@
<el-form-item label="所属地区" prop="zoneId">
<el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="所属公司" prop="startCompanyId">
<el-select class="filter-item" v-model="listQuery.startCompanyId" placeholder="请选择" @change="getAllBranchCompanyChange">
<el-select class="filter-item" v-model="listQuery.startCompanyId" placeholder="请选择"
@change="getAllBranchCompanyChange">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"> </el-option>
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -25,16 +26,16 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="订单号">
<el-input v-model="listQuery.no" type="text" placeholder="请输入订单号"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择状态">
<el-option :key="null" label="无" :value="null" ></el-option>
<el-option :key="null" label="无" :value="null"></el-option>
<el-option :key="2" label="取消" :value="2"></el-option>
<el-option :key="3" label="待付款" :value="3"></el-option>
<el-option :key="4" label="待出行" :value="4"></el-option>
......@@ -43,7 +44,6 @@
</el-select>
</el-form-item>
</el-col>
<el-row>
</el-row>
</el-form>
......@@ -121,7 +121,9 @@
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div>
<!--订单详情-->
<tourOrderDetailModal :tourRow="tourRow" :insureDetail="insureDetail" v-if="tourDialogVisible" :tourCostDetail="tourCostDetail" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal>
<tourOrderDetailModal :tourRow="tourRow" :insureDetail="insureDetail" v-if="tourDialogVisible"
:tourCostDetail="tourCostDetail"
v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal>
</div>
</template>
......@@ -133,7 +135,7 @@
getAllBranchCompany,
getAllBranchCompanyByZoneId
} from 'api/order/rentVehicle';
import { mapGetters } from 'vuex';
import {mapGetters} from 'vuex';
import rsCode from '../../../utils/rsCode';
import {
timestamp2Date
......@@ -144,6 +146,7 @@
import {
formatDate
} from '../../../utils/dateFormattor';
export default {
name: 'branchCompanyStock',
components: {
......@@ -203,7 +206,7 @@
refundStatus: undefined,
startCompanyName: undefined,
status: undefined,
ststusName:undefined,
ststusName: undefined,
telephone: undefined,
type: undefined,
updTime: undefined,
......@@ -212,7 +215,7 @@
vehicleNumberPlat: undefined,
version: undefined,
},
detailVisible:false,
detailVisible: false,
bannerDialogVisible: false,//添加、编辑弹框
modalTitle: '订单详情',
rules: {
......@@ -245,39 +248,39 @@
page: 1,
limit: 20,
type: 2,
no: null,
phone:null,
status:null,
no: undefined,
phone: undefined,
status: null,
startTime: undefined,
endTime:undefined,
zoneId:undefined,
endTime: undefined,
zoneId: undefined,
startCompanyId: undefined
},
tourRow: {},//旅游订单详情-当前行
//"{"key":"费用明细","val":"","children":[{"key":"成人价格","detail":"￥13800.00/人×1人","val":"￥13800.00"}]}"
costDetail:{
key:undefined,
val:undefined,
children:[
costDetail: {
key: undefined,
val: undefined,
children: [
{
key:undefined,
detail:undefined,
val:undefined
key: undefined,
detail: undefined,
val: undefined
}
]
},
baranchQuery: {
zoneId:null
zoneId: null
},
dialogFormVisible: false,
dialogStatus: '',
btn_del: true,
btn_buy: true,
btn_cancel: true,
allBranchCompany:[],
tourCostDetail:'',
insureDetail:'',//保险
allBranchCompany: [],
tourCostDetail: '',
insureDetail: '',//保险
tableKey: 0,
tourDialogVisible: false,//旅游详情
}
......@@ -294,7 +297,7 @@
return getSonRegionByCodes(1);
},
//获取大区列表
getAllZoneList(){
getAllZoneList() {
return getAllZone();
},
cityRegions() {
......@@ -308,23 +311,23 @@
/**
* 操作-查看详情按钮，显示详情弹框
*/
detailInquiry(row){
detailInquiry(row) {
this.currentRow = row;
this.detailVisible = true;
},
/**
* 关闭违章查询弹框
* */
detailEvent(params){
detailEvent(params) {
this.detailVisible = false;
if(params){
if (params) {
console.log(params);
}
},
/**
* 旅游订单详情弹框关闭
* */
tourOrderDetailDialogEvent(e){
tourOrderDetailDialogEvent(e) {
this.tourDialogVisible = false;
},
/**
......@@ -397,16 +400,16 @@
});
},
clearSearch() {
this.listQuery ={
this.listQuery = {
page: 1,
limit: 20,
type: 2,
no: null,
phone:null,
status:null,
phone: null,
status: null,
startTime: undefined,
endTime:undefined,
zoneId:undefined,
endTime: undefined,
zoneId: undefined,
startCompanyId: undefined
}
......@@ -444,21 +447,24 @@
}
</script>
<style>
.label-text{
.label-text {
margin-left: 10px;
margin-right: 20px;
}
.label-title{
.label-title {
margin-top: 10px;
}
.orderDetail tr td{
.orderDetail tr td {
width: 500px;
text-align: center;
border: 0.0625rem solid;
margin-left: 100px;
margin-right: 100px;
}
.label-value{
.label-value {
margin-left: 80px;
margin-right: 100px;
}
......
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