hjq/aircraft-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hjq:9a7e2618cd56934dc2affbcc4b4260243dbde05e
Branches Tags
hjq:main
..
compare: hjq:4b6abbe15d852233407b4c330429d142ace41da6
Branches Tags
hjq:main

No commits in common. "9a7e2618cd56934dc2affbcc4b4260243dbde05e" and "4b6abbe15d852233407b4c330429d142ace41da6" have entirely different histories.
9a7e2618cd ... 4b6abbe15d

2 changed files with 21 additions and 26 deletions
Show Stats Expand all files Collapse all files

23
src/views/analysis/orderAnalysis/index.vue
View File

@ -143,41 +143,38 @@
<el-table <el-table
:data="orderList" :data="orderList"
style="width: 100%" style="width: 100%"
:fit="true"
:cell-style="{ textAlign: 'center' }"
v-loading="tableLoading" v-loading="tableLoading"
stripe stripe
border border
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
label="订单编号" label="订单编号"
min-width="180" width="180"
sortable sortable
/> />
<el-table-column <el-table-column
prop="orderInitiatorId" prop="orderInitiatorId"
label="客户ID" label="客户ID"
min-width="150" width="150"
/> />
<el-table-column <el-table-column
prop="attractionId" prop="attractionId"
label="景点ID" label="景点ID"
min-width="120" width="120"
/> />
<el-table-column <el-table-column
prop="amount" prop="amount"
label="金额(元)" label="金额(元)"
min-width="120" width="120"
sortable sortable
align="right" align="right"
/> />
<el-table-column <el-table-column
prop="mainOrderStatus" prop="mainOrderStatus"
label="状态" label="状态"
min-width="120" width="120"
:filters="statusFilters" :filters="statusFilters"
:filter-method="filterStatus" :filter-method="filterStatus"
> >
@ -190,17 +187,17 @@
<el-table-column <el-table-column
prop="orderCreateTime" prop="orderCreateTime"
label="下单时间" label="下单时间"
min-width="180" width="180"
sortable sortable
/> />
<el-table-column <el-table-column
prop="orderFinishTime" prop="orderFinishTime"
label="完成时间" label="完成时间"
min-width="180" width="180"
/> />
<!-- <el-table-column <el-table-column
label="操作" label="操作"
min-width="120" width="120"
fixed="right" fixed="right"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
@ -211,7 +208,7 @@
详情 详情
</el-button> </el-button>
</template> </template>
</el-table-column> --> </el-table-column>
</el-table> </el-table>
<div class="pagination-wrapper"> <div class="pagination-wrapper">
<div class="pagination-info"> <div class="pagination-info">

24
src/views/analysis/taskAnalysis/index.vue
View File

@ -81,32 +81,30 @@
<h3 class="section-title">任务详情列表</h3> <h3 class="section-title">任务详情列表</h3>
<el-table <el-table
:data="orderDetailList" :data="orderDetailList"
:fit="true"
:cell-style="{ textAlign: 'center' }"
border border
stripe stripe
class="task-detail-table" class="task-detail-table"
:header-cell-style="{background:'#f5f7fa', color:'#333'}" :header-cell-style="{background:'#f5f7fa', color:'#333'}"
> >
<el-table-column prop="id" label="ID" min-width="150" /> <el-table-column prop="id" label="ID" width="80" align="center" />
<el-table-column prop="orderId" label="订单ID" min-width="150" /> <el-table-column prop="orderId" label="订单ID" width="100" align="center" />
<el-table-column prop="deviceId" label="设备ID" min-width="150" show-overflow-tooltip /> <el-table-column prop="deviceId" label="设备ID" width="150" align="center" show-overflow-tooltip />
<el-table-column prop="operatorId" label="操作员ID" min-width="80" /> <el-table-column prop="operatorId" label="操作员ID" width="120" align="center" />
<el-table-column prop="createTime" label="创建时间" min-width="160" /> <el-table-column prop="createTime" label="创建时间" width="180" align="center" />
<el-table-column prop="orderItemStatus" label="状态" min-width="120" > <el-table-column prop="orderItemStatus" label="状态" width="120" align="center">
<template #default="{row}"> <template #default="{row}">
<el-tag :type="getStatusTagType(row.orderItemStatus)"> <el-tag :type="getStatusTagType(row.orderItemStatus)">
{{ getStatusText(row.orderItemStatus) }} {{ getStatusText(row.orderItemStatus) }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="personCount" label="人数" min-width="100" /> --> <el-table-column prop="personCount" label="人数" width="100" align="center" />
<el-table-column prop="cargoWeight" label="货物重量(kg)" min-width="80" /> <el-table-column prop="cargoWeight" label="货物重量(kg)" width="150" align="center" />
<!-- <el-table-column <el-table-column
label="操作" label="操作"
min-width="120" width="120"
fixed="right" fixed="right"
/> --> />
</el-table> </el-table>
</div> </div>
</div> </div>