Skip to content

C
cloud-platform-ui
Commit a759b071 authored by jiaorz's avatar jiaorz
Browse files
Options

修改订单列表样式

parent 8fa87be9
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 95 deletions
src/views/order/memberOrderInfo/index.vue
View file @ a759b071
...@@ -85,11 +85,6 @@ ...@@ -85,11 +85,6 @@
<span v-if="scope.row.status == '3'">待付款</span> <span v-if="scope.row.status == '3'">待付款</span>
<span v-if="scope.row.status == '6'">已完成</span> <span v-if="scope.row.status == '6'">已完成</span>
</template> </template>
</el-table-column>
<el-table-column width="200" align="center" label="流水号">
<template scope="scope">
<span>{{scope.row.outTradeNo}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="创建人"> <el-table-column width="150" align="center" label="创建人">
<template scope="scope"> <template scope="scope">
......
src/views/order/rentVehicleInfo/index.vue
View file @ a759b071
...@@ -47,32 +47,45 @@ ...@@ -47,32 +47,45 @@
<span>{{scope.row.id}}</span> <span>{{scope.row.id}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="订单号"> <el-table-column width="200" align="center" label="订单号/创建时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.no}}</span> <span>{{scope.row.no}}</span>/<span>{{scope.row.crtTime}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="名称"> <el-table-column width="180" align="center" label="名称/车牌号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.name}}</span> <span>{{scope.row.name}}</span><br/><span>{{scope.row.vehicleNumberPlat}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="用户ID/用户名">
<el-table-column width="110" align="center" label="商品价格"> <template scope="scope">
<span>{{scope.row.userId}}</span>/<span>{{scope.row.username}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="取车时间/还车时间">
<template scope="scope">
取:<span>{{dateFormat(scope.row.orderRentVehicleDetail.startTime)}}</span><br/>
还:<span>{{dateFormat(scope.row.orderRentVehicleDetail.endTime)}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="交车公司">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.goodsAmount}}</span> <span>{{scope.row.startCompanyName}}</span><br/>
<span>({{scope.row.orderRentVehicleDetail.startCityName}}{{scope.row.orderRentVehicleDetail.startAddr}})</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="还车公司">
<template scope="scope">
<span>{{scope.row.endCompanyName}}</span><br/>
<span>({{scope.row.orderRentVehicleDetail.endCityName}}{{scope.row.orderRentVehicleDetail.endAddr}})</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="订单价格"> <el-table-column width="110" align="center" label="订单价格">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.orderAmount}}</span> <span>{{scope.row.orderAmount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="实际价格">
<template scope="scope">
<span>{{scope.row.realAmount}}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="状态"> <el-table-column width="110" align="center" label="状态">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.status == '2'">取消</span> <span v-if="scope.row.status == '2'">取消</span>
...@@ -82,36 +95,8 @@ ...@@ -82,36 +95,8 @@
<span v-if="scope.row.status == '6'">已完成</span> <span v-if="scope.row.status == '6'">已完成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="流水号">
<template scope="scope">
<span>{{scope.row.outTradeNo}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="创建人">
<template scope="scope">
<span>{{scope.row.username}}</span>
</template>
</el-table-column>
<!-- <el-table-column width="150" align="center" label="手机号">
<template scope="scope">
<span>{{scope.row.telephone}}</span>
</template>
</el-table-column> -->
<el-table-column width="110" align="center" label="车牌号">
<template scope="scope">
<span>{{scope.row.vehicleNumberPlat}}</span>
</template>
</el-table-column>
<el-table-column width="180" align="center" label="创建时间">
<template scope="scope">
<span>{{scope.row.crtTime}}</span>
</template>
</el-table-column>
<el-table-column width="180" align="center" label="更新时间">
<template scope="scope">
<span>{{scope.row.updTime}}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="操作" width="150"> <!-- <el-table-column align="center" label="操作" width="150">
<template scope="scope"> <template scope="scope">
<el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">订单详情</el-button> <el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">订单详情</el-button>
...@@ -134,7 +119,9 @@ ...@@ -134,7 +119,9 @@
} from 'api/order/rentVehicle'; } from 'api/order/rentVehicle';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import rsCode from '../../../utils/rsCode'; import rsCode from '../../../utils/rsCode';
import {
formatDate
} from '../../../utils/dateFormattor';
export default { export default {
name: 'branchCompanyStock', name: 'branchCompanyStock',
data() { data() {
...@@ -312,6 +299,10 @@ ...@@ -312,6 +299,10 @@
this.listQuery.limit = val; this.listQuery.limit = val;
this.getList(); this.getList();
}, },
dateFormat(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.page = val; this.listQuery.page = val;
this.getList(); this.getList();
......
src/views/order/tourOrderInfo/index.vue
View file @ a759b071
...@@ -43,36 +43,51 @@ ...@@ -43,36 +43,51 @@
border fit highlight-current-row border fit highlight-current-row
style="width: 100%"> style="width: 100%">
<el-table-column align="center" label="ID" width="70"> <el-table-column align="center" label="ID" width="70">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.id}}</span> <span>{{scope.row.id}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="订单号"> <el-table-column width="200" align="center" label="订单号/创建时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.no}}</span> <span>{{scope.row.no}}</span><br/>
</template> <span>{{scope.row.crtTime}}</span>
</el-table-column> </template>
<el-table-column width="150" align="center" label="名称"> </el-table-column>
<template scope="scope"> <el-table-column width="200" align="center" label="名称">
<span>{{scope.row.name}}</span> <template scope="scope">
</template> <span>{{scope.row.name}}</span>
</el-table-column> </template>
</el-table-column>
<el-table-column width="150" align="center" label="用户ID/用户名">
<template scope="scope">
<span>{{scope.row.userId}}</span>/<span>{{scope.row.username}}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="商品价格"> <el-table-column width="150" align="center" label="报名人数">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.goodsAmount}}</span> <span>成人{{scope.row.orderTourDetail.adultNum}} 儿童{{scope.row.orderTourDetail.childNum}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="活动日期">
<template scope="scope">
<span>{{dateFormat(scope.row.orderTourDetail.startTime)}}</span>
-
<span>{{dateFormat(scope.row.orderTourDetail.endTime)}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="出发公司">
<template scope="scope">
<span>{{scope.row.startCompanyName}}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="订单价格"> <el-table-column width="110" align="center" label="订单价格">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.orderAmount}}</span> <span>{{scope.row.orderAmount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="实际价格">
<template scope="scope">
<span>{{scope.row.realAmount}}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="状态"> <el-table-column width="110" align="center" label="状态">
<template scope="scope"> <template scope="scope">
<span v-if="scope.row.status == '2'">取消</span> <span v-if="scope.row.status == '2'">取消</span>
...@@ -82,31 +97,6 @@ ...@@ -82,31 +97,6 @@
<span v-if="scope.row.status == '6'">已完成</span> <span v-if="scope.row.status == '6'">已完成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="流水号">
<template scope="scope">
<span>{{scope.row.outTradeNo}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="创建人">
<template scope="scope">
<span>{{scope.row.username}}</span>
</template>
</el-table-column>
<!-- <el-table-column width="150" align="center" label="手机号">
<template scope="scope">
<span>{{scope.row.telephone}}</span>
</template>
</el-table-column> -->
<el-table-column width="180" align="center" label="创建时间">
<template scope="scope">
<span>{{scope.row.crtTime}}</span>
</template>
</el-table-column>
<el-table-column width="180" align="center" label="更新时间">
<template scope="scope">
<span>{{scope.row.updTime}}</span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="操作" width="150"> <!-- <el-table-column align="center" label="操作" width="150">
<template scope="scope"> <template scope="scope">
<el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">订单详情</el-button> <el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">订单详情</el-button>
...@@ -129,7 +119,9 @@ ...@@ -129,7 +119,9 @@
} from 'api/order/rentVehicle'; } from 'api/order/rentVehicle';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import rsCode from '../../../utils/rsCode'; import rsCode from '../../../utils/rsCode';
import {
formatDate
} from '../../../utils/dateFormattor';
export default { export default {
name: 'branchCompanyStock', name: 'branchCompanyStock',
data() { data() {
...@@ -307,6 +299,10 @@ ...@@ -307,6 +299,10 @@
this.listQuery.limit = val; this.listQuery.limit = val;
this.getList(); this.getList();
}, },
dateFormat(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd');
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.listQuery.page = val; this.listQuery.page = val;
this.getList(); this.getList();
......
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