页面更新
This commit is contained in:
parent
369a64b324
commit
3cb36d1852
|
@ -89,7 +89,7 @@ export default {
|
|||
values = [values];
|
||||
}
|
||||
this.loadApi(values).then(res => {
|
||||
this.options = res.data;
|
||||
this.options = res.data || [];
|
||||
this.total = this.options?.length;
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
|
@ -137,7 +137,7 @@ export default {
|
|||
this.loading = true;
|
||||
Object.assign(this.queryParams, this.query);
|
||||
this.listApi(this.queryParams).then(res => {
|
||||
this.options = res.rows;
|
||||
this.options = res.rows || [];
|
||||
this.total = res.total;
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
|
|
|
@ -21,17 +21,21 @@
|
|||
:default-sort="defaultSort"
|
||||
@sort-change="onSortChange"
|
||||
>
|
||||
<el-table-column label="排行" type="index" width="50" align="center">
|
||||
<el-table-column label="#" type="index" width="50" align="center">
|
||||
<template slot-scope="d">{{d.$index + 1}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="运营区" prop="areaName" align="center" />
|
||||
<el-table-column label="运营区" prop="areaName" min-width="100" align="left" show-overflow-tooltip >
|
||||
<template slot-scope="d">
|
||||
<area-link :id="d.row.areaId" :text="d.row.areaName" size="mini"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="金额" prop="actualAmount" align="center" sortable :sort-orders="orderSorts">
|
||||
<template slot-scope="d">{{d.row.actualAmount | fix2 | dv}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="count" align="center" sortable :sort-orders="orderSorts">
|
||||
<template slot-scope="d">{{d.row.count | dv}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="进行中" prop="processingCount" align="center" sortable :sort-orders="orderSorts">
|
||||
<el-table-column label="进行" prop="processingCount" align="center" sortable :sort-orders="orderSorts">
|
||||
<template slot-scope="d">{{d.row.processingCount | dv}}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
@ -43,6 +47,7 @@
|
|||
import { getOrderRank } from '@/api/dashboard/dashboardOrder'
|
||||
import { getLastDateStr } from '@/utils'
|
||||
import { DatePickerOptions } from '@/utils/constants'
|
||||
import AreaLink from '@/components/Business/Area/AreaLink.vue'
|
||||
|
||||
// 默认排序字段
|
||||
const defaultSort = {
|
||||
|
@ -51,6 +56,7 @@ const defaultSort = {
|
|||
}
|
||||
|
||||
export default {
|
||||
components: { AreaLink },
|
||||
data() {
|
||||
return {
|
||||
DatePickerOptions,
|
||||
|
|
|
@ -43,10 +43,9 @@
|
|||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="运营区" prop="areaName">
|
||||
<el-input
|
||||
v-model="queryParams.areaName"
|
||||
placeholder="请输入运营区"
|
||||
<el-form-item label="运营区" prop="areaId">
|
||||
<area-remote-select
|
||||
v-model="queryParams.areaId"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
@ -295,6 +294,7 @@ import UserLink from '@/components/Business/User/UserLink.vue';
|
|||
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
|
||||
import OrderLink from '@/components/Business/Order/OrderLink.vue'
|
||||
import AreaLink from '@/components/Business/Area/AreaLink.vue';
|
||||
import AreaRemoteSelect from '@/components/Business/Area/AreaRemoteSelect.vue'
|
||||
|
||||
// 默认排序字段
|
||||
const defaultSort = {
|
||||
|
@ -306,7 +306,7 @@ export default {
|
|||
name: "Order",
|
||||
mixins: [$showColumns],
|
||||
dicts: ['order_status', 'suit_type', 'order_return_type', 'order_return_mode', 'suit_rental_unit', 'suit_riding_rule'],
|
||||
components: {FormCol, OrderRefundDialog, OrderVerifyDialog, UserLink, DeviceLink, OrderLink, AreaLink},
|
||||
components: {FormCol, OrderRefundDialog, OrderVerifyDialog, UserLink, DeviceLink, OrderLink, AreaLink, AreaRemoteSelect},
|
||||
props: {
|
||||
query: {
|
||||
type: Object,
|
||||
|
|
Loading…
Reference in New Issue
Block a user