Skip to content

Commit 4b043f7

Browse files
zhaotodayzhaotoday
committed
i
1 parent 77e4173 commit 4b043f7

File tree

2 files changed

+98
-144
lines changed

2 files changed

+98
-144
lines changed

‎src/utils/consts/sidebar-menu.js‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,21 @@ export default [
1515
]
1616
},
1717
{
18-
icon: "ios-folder-open",
19-
name: "orders",
20-
title: "订单管理",
18+
icon: "logo-bitcoin",
19+
name: "finances",
20+
title: "财务管理",
2121
children: [
2222
{
2323
title: "订单列表",
24-
route: "/orders/orders/list"
24+
route: "/finances/orders/list"
25+
},
26+
{
27+
title: "分销员佣金",
28+
route: "/finances/commissions/list"
29+
},
30+
{
31+
title: "分销员提现",
32+
route: "/finances/withdraws/list"
2533
}
2634
]
2735
},
@@ -40,25 +48,6 @@ export default [
4048
}
4149
]
4250
},
43-
{
44-
icon: "logo-bitcoin",
45-
name: "finances",
46-
title: "财务管理",
47-
children: [
48-
{
49-
title: "订单列表",
50-
route: "/finances/orders/list"
51-
},
52-
{
53-
title: "分销员佣金",
54-
route: "/finances/commissions/list"
55-
},
56-
{
57-
title: "分销员提现",
58-
route: "/finances/withdraws/list"
59-
}
60-
]
61-
},
6251
{
6352
icon: "md-document",
6453
name: "articles",

‎src/views/orders/list/index.vue‎

Lines changed: 86 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,92 @@
11
<template>
2-
<div>
3-
<c-list
4-
:data="list.items"
5-
:columns="cList.columns"
6-
:total="list.total"
7-
:page-current="listPageCurrent"
8-
:search-where="listSearchWhere"
9-
@selection-change="handleListSelectionChange"
10-
>
11-
<c-list-header>
12-
<c-list-operations>
13-
<Button v-if="false" type="primary" @click="deliver">
14-
配送订单
15-
</Button>
16-
<c-bulk-delete
17-
:selected-items="listSelectedItems"
18-
@ok="confirmDelete"
19-
>
20-
</c-bulk-delete>
21-
</c-list-operations>
22-
<c-list-search>
23-
<Form
24-
class="c-form c-form--search"
25-
inline
26-
@submit.native.prevent="search"
27-
>
28-
<Form-item prop="dateRange">
29-
<c-date-range
30-
class="c-form__input"
31-
:value="cList.cSearch.where.dateRange.$eq"
32-
@change="
33-
date => {
34-
cList.cSearch.where.dateRange.$eq = date;
35-
}
36-
"
37-
></c-date-range>
38-
</Form-item>
39-
<Form-item prop="status">
40-
<Select
41-
class="c-form__input"
42-
placeholder="请选择状态"
43-
clearable
44-
v-model="cList.cSearch.where.status.$eq"
45-
>
46-
<Option
47-
v-for="item in dicts.OrderStatus"
48-
:key="item.value"
49-
:value="item.value"
50-
:label="item.label"
51-
>
52-
{{ item.label }}
53-
</Option>
54-
</Select>
55-
</Form-item>
56-
<Form-item prop="payment">
57-
<Select
58-
class="c-form__input"
59-
placeholder="请选择支付方式"
60-
clearable
61-
v-model="cList.cSearch.where.payment.$eq"
2+
<c-list
3+
:data="list.items"
4+
:columns="cList.columns"
5+
:total="list.total"
6+
:page-current="listPageCurrent"
7+
:search-where="listSearchWhere"
8+
@selection-change="handleListSelectionChange"
9+
>
10+
<c-list-header>
11+
<c-list-operations>
12+
<Button v-if="false" type="primary" @click="deliver">
13+
配送订单
14+
</Button>
15+
<c-bulk-delete :selected-items="listSelectedItems" @ok="confirmDelete">
16+
</c-bulk-delete>
17+
</c-list-operations>
18+
<c-list-search>
19+
<Form
20+
class="c-form c-form--search"
21+
inline
22+
@submit.native.prevent="search"
23+
>
24+
<Form-item prop="status">
25+
<Select
26+
class="c-form__input"
27+
placeholder="请选择状态"
28+
clearable
29+
v-model="cList.cSearch.where.status.$eq"
30+
>
31+
<Option
32+
v-for="item in dicts.OrderStatus"
33+
:key="item.value"
34+
:value="item.value"
35+
:label="item.label"
6236
>
63-
<Option
64-
v-for="item in dicts.OrderPayment"
65-
:key="item.value"
66-
:value="item.value"
67-
:label="item.label"
68-
>
69-
{{ item.label }}
70-
</Option>
71-
</Select>
72-
</Form-item>
73-
<Form-item prop="wxUserId">
74-
<c-school-wx-user-select
75-
:school-id="getSchoolId()"
76-
:value="cList.cSearch.where.wxUserId.$eq"
77-
@change="
78-
value => {
79-
this.cList.cSearch.where.wxUserId.$eq = value;
80-
}
81-
"
37+
{{ item.label }}
38+
</Option>
39+
</Select>
40+
</Form-item>
41+
<Form-item prop="payment">
42+
<Select
43+
class="c-form__input"
44+
placeholder="请选择支付方式"
45+
clearable
46+
v-model="cList.cSearch.where.payment.$eq"
47+
>
48+
<Option
49+
v-for="item in dicts.OrderPayment"
50+
:key="item.value"
51+
:value="item.value"
52+
:label="item.label"
8253
>
83-
</c-school-wx-user-select>
84-
</Form-item>
85-
<Form-item v-if="false" prop="no">
86-
<Input
87-
class="c-form__input"
88-
placeholder="请输入订单号"
89-
v-model="cList.cSearch.where.no.$like"
90-
/>
91-
</Form-item>
92-
<Form-item>
93-
<Button type="primary" @click="search">
94-
查询
95-
</Button>
96-
</Form-item>
97-
<Form-item>
98-
<Button type="primary" @click="exportXLSX">
99-
导出
100-
</Button>
101-
</Form-item>
102-
</Form>
103-
</c-list-search>
104-
</c-list-header>
105-
</c-list>
106-
<Modal width="350" v-model.trim="cList.cFormData.modal" title="表单信息">
107-
<Row
108-
v-for="item in getFormData(
109-
cList.cFormData.data,
110-
cList.cFormData.fields
111-
)"
112-
:key="item.key"
113-
>
114-
<Col span="6">{{ item.label }}：</Col>
115-
<Col span="18">{{ item.value }}</Col>
116-
</Row>
117-
</Modal>
118-
</div>
54+
{{ item.label }}
55+
</Option>
56+
</Select>
57+
</Form-item>
58+
<Form-item prop="wxUserId">
59+
<c-wx-user-select
60+
:value="cList.cSearch.where.wxUserId.$eq"
61+
@change="
62+
value => {
63+
this.cList.cSearch.where.wxUserId.$eq = value;
64+
}
65+
"
66+
>
67+
</c-wx-user-select>
68+
</Form-item>
69+
<Form-item v-if="false" prop="no">
70+
<Input
71+
class="c-form__input"
72+
placeholder="请输入订单号"
73+
v-model="cList.cSearch.where.no.$like"
74+
/>
75+
</Form-item>
76+
<Form-item>
77+
<Button type="primary" @click="search">
78+
查询
79+
</Button>
80+
</Form-item>
81+
<Form-item>
82+
<Button type="primary" @click="exportXLSX">
83+
导出
84+
</Button>
85+
</Form-item>
86+
</Form>
87+
</c-list-search>
88+
</c-list-header>
89+
</c-list>
11990
</template>
12091

12192
<script>
@@ -128,12 +99,6 @@ import Model from "@/models/admin/orders";
12899
129100
const module = "orders";
130101
const initWhere = {
131-
dateRange: {
132-
$eq: []
133-
},
134-
no: {
135-
$like: ""
136-
},
137102
payment: {
138103
$eq: ""
139104
},

0 commit comments

Comments
 (0)