|
|
@@ -15,26 +15,54 @@
|
|
15
|
15
|
end-placeholder="结束日期"
|
|
16
|
16
|
/>
|
|
17
|
17
|
<el-input v-model="searchData.adFrom" placeholder="请输入消息来源" class="filter-item" />
|
|
18
|
|
- <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
|
|
19
|
|
- <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
|
|
|
18
|
+ <el-select
|
|
|
19
|
+ v-model="searchData.type"
|
|
|
20
|
+ class="filter-item"
|
|
|
21
|
+ filterable
|
|
|
22
|
+ clearable
|
|
|
23
|
+ placeholder="请选择订单类型"
|
|
|
24
|
+ >
|
|
|
25
|
+ <el-option
|
|
|
26
|
+ v-for="item in orderType"
|
|
|
27
|
+ :key="item.F_Value"
|
|
|
28
|
+ :label="item.F_Value"
|
|
|
29
|
+ :value="item.F_Value"
|
|
|
30
|
+ />
|
|
20
|
31
|
</el-select>
|
|
21
|
32
|
<el-input v-model="searchData.id" placeholder="请输入订单编号" class="filter-item" />
|
|
22
|
33
|
<el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
|
|
23
|
34
|
<el-input v-model="searchData.customerPhone" placeholder="请输入手机号码" class="filter-item" />
|
|
24
|
35
|
<el-input v-model="searchData.trackingNo" placeholder="请输入快递单号" class="filter-item" />
|
|
25
|
|
- <el-select v-model="searchData.payState" class="filter-item" filterable clearable placeholder="请选择交易状态">
|
|
|
36
|
+ <el-select
|
|
|
37
|
+ v-model="searchData.payState"
|
|
|
38
|
+ class="filter-item"
|
|
|
39
|
+ filterable
|
|
|
40
|
+ clearable
|
|
|
41
|
+ placeholder="请选择交易状态"
|
|
|
42
|
+ >
|
|
26
|
43
|
<el-option label="待回款" value="0"></el-option>
|
|
27
|
44
|
<el-option label="已支付" value="1"></el-option>
|
|
28
|
45
|
<el-option label="待退款" value="2"></el-option>
|
|
29
|
46
|
<el-option label="已退款" value="3"></el-option>
|
|
30
|
47
|
</el-select>
|
|
31
|
48
|
<el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
|
|
32
|
|
- <el-button v-permission="'HY_export'" type="primary" class="filter-item" icon="el-icon-upload2" @click="btn_export">导出</el-button>
|
|
33
|
|
- <el-button v-permission="'HY_waybill_number_import'" type="primary" class="filter-item" @click="btn_waybill_number_import">运单号导入</el-button>
|
|
|
49
|
+ <el-button
|
|
|
50
|
+ v-permission="'HY_export'"
|
|
|
51
|
+ type="primary"
|
|
|
52
|
+ class="filter-item"
|
|
|
53
|
+ icon="el-icon-upload2"
|
|
|
54
|
+ @click="btn_export"
|
|
|
55
|
+ >导出</el-button>
|
|
|
56
|
+ <el-button
|
|
|
57
|
+ v-permission="'HY_waybill_number_import'"
|
|
|
58
|
+ type="primary"
|
|
|
59
|
+ class="filter-item"
|
|
|
60
|
+ @click="btn_waybill_number_import"
|
|
|
61
|
+ >运单号导入</el-button>
|
|
34
|
62
|
<!-- <el-button v-permission="'HY_merge'" type="primary" class="filter-item" @click="btn_merge">合并</el-button> -->
|
|
35
|
63
|
<el-button v-permission="'HY_split'" type="primary" class="filter-item" @click="btn_split">拆分</el-button>
|
|
36
|
64
|
</div>
|
|
37
|
|
- <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
|
|
|
65
|
+ <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
|
|
38
|
66
|
<el-tab-pane label="全部" name="-2"></el-tab-pane>
|
|
39
|
67
|
<el-tab-pane label="无效" name="-1"></el-tab-pane>
|
|
40
|
68
|
<!-- <el-tab-pane label="暂存" name="0"></el-tab-pane> -->
|
|
|
@@ -43,45 +71,70 @@
|
|
43
|
71
|
<!-- <el-tab-pane label="通过" name="3"></el-tab-pane>
|
|
44
|
72
|
<el-tab-pane label="无货" name="4"></el-tab-pane>
|
|
45
|
73
|
<el-tab-pane label="已分拣" name="5"></el-tab-pane>
|
|
46
|
|
- <el-tab-pane label="已发货" name="6"></el-tab-pane> -->
|
|
|
74
|
+ <el-tab-pane label="已发货" name="6"></el-tab-pane>-->
|
|
47
|
75
|
</el-tabs>
|
|
48
|
|
- <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange" row-key="F_Id">
|
|
|
76
|
+ <el-table
|
|
|
77
|
+ v-loading="loading"
|
|
|
78
|
+ :data="dataLists"
|
|
|
79
|
+ border
|
|
|
80
|
+ stripe
|
|
|
81
|
+ @selection-change="handleSelectionChange"
|
|
|
82
|
+ row-key="F_Id"
|
|
|
83
|
+ >
|
|
49
|
84
|
<el-table-column type="selection" :reserve-selection="true"></el-table-column>
|
|
50
|
85
|
<el-table-column type="index" label="编号" align="center" fixed width="80" />
|
|
51
|
86
|
<el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
|
|
52
|
87
|
<template slot-scope="scope">
|
|
53
|
|
- <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
|
|
|
88
|
+ <el-button
|
|
|
89
|
+ type="text"
|
|
|
90
|
+ size="small"
|
|
|
91
|
+ @click="hadndleOrderCode(scope.row.F_Id)"
|
|
|
92
|
+ >{{ scope.row.F_Id }}</el-button>
|
|
54
|
93
|
</template>
|
|
55
|
94
|
</el-table-column>
|
|
56
|
95
|
<el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
|
|
57
|
96
|
<el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
|
|
58
|
97
|
<el-table-column label="订购商品" align="center" min-width>
|
|
59
|
|
- <template slot-scope="scope">
|
|
60
|
|
- {{ scope.row.OrderDetailList | judgmentOrderGoods}}
|
|
61
|
|
- </template>
|
|
|
98
|
+ <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods}}</template>
|
|
62
|
99
|
</el-table-column>
|
|
63
|
100
|
<el-table-column prop="F_AddTime" label="下单日期" align="center" />
|
|
64
|
|
- <el-table-column label="订单状态" align="center" >
|
|
65
|
|
- <template slot-scope="scope">
|
|
66
|
|
- {{ scope.row.F_State | judgmentStateName }}
|
|
67
|
|
- </template>
|
|
|
101
|
+ <el-table-column label="订单状态" align="center">
|
|
|
102
|
+ <template slot-scope="scope">{{ scope.row.F_State | judgmentStateName }}</template>
|
|
68
|
103
|
</el-table-column>
|
|
69
|
104
|
<el-table-column prop="F_AddUserName" label="下单员工" align="center" />
|
|
70
|
105
|
<el-table-column prop="F_BelongName" label="归属员工" align="center" />
|
|
71
|
106
|
<el-table-column prop="F_Type" label="订单类型" align="center" />
|
|
72
|
107
|
<el-table-column prop="F_Express" label="快递公司" align="center" />
|
|
73
|
|
- <el-table-column label="物流状态" align="center" >
|
|
74
|
|
- <template slot-scope="scope">
|
|
75
|
|
- {{ scope.row.F_Status | judgmentStatusName }}
|
|
76
|
|
- </template>
|
|
|
108
|
+ <el-table-column label="物流状态" align="center">
|
|
|
109
|
+ <template slot-scope="scope">{{ scope.row.F_Status | judgmentStatusName }}</template>
|
|
77
|
110
|
</el-table-column>
|
|
78
|
111
|
<el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
|
|
79
|
112
|
<template slot-scope="scope">
|
|
80
|
|
- <el-button v-permission="'HY_edit'" v-if="authority_edit(scope.row.F_State)" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
|
|
81
|
|
- <el-button v-permission="'HY_goback'" v-if="authority_goback(scope.row.F_State)" type="text" @click="btn_goback(scope.row.F_Id)">退回</el-button>
|
|
82
|
|
- <el-button v-permission="'HY_through'" v-if="authority_through(scope.row.F_State)" type="text" @click="btn_through(scope.row.F_Id)">通过</el-button>
|
|
|
113
|
+ <el-button
|
|
|
114
|
+ v-permission="'HY_edit'"
|
|
|
115
|
+ v-if="authority_edit(scope.row.F_State)"
|
|
|
116
|
+ type="text"
|
|
|
117
|
+ @click="btn_edit(scope.row.F_Id)"
|
|
|
118
|
+ >编辑</el-button>
|
|
|
119
|
+ <el-button
|
|
|
120
|
+ v-permission="'HY_goback'"
|
|
|
121
|
+ v-if="authority_goback(scope.row.F_State)"
|
|
|
122
|
+ type="text"
|
|
|
123
|
+ @click="btn_goback(scope.row.F_Id)"
|
|
|
124
|
+ >退回</el-button>
|
|
|
125
|
+ <el-button
|
|
|
126
|
+ v-permission="'HY_through'"
|
|
|
127
|
+ v-if="authority_through(scope.row.F_State)"
|
|
|
128
|
+ type="text"
|
|
|
129
|
+ @click="btn_through(scope.row.F_Id)"
|
|
|
130
|
+ >通过</el-button>
|
|
83
|
131
|
<el-button v-permission="'HY_label'" type="text" @click="btn_label(scope.row.F_Id)">标签</el-button>
|
|
84
|
|
- <el-button v-permission="'HY_logistics_status'" v-if="authority_logistics_status(scope.row.F_Status,scope.row.F_State)" type="text" @click="btn_logistics_status(scope.row.F_Id)">物流状态</el-button>
|
|
|
132
|
+ <el-button
|
|
|
133
|
+ v-permission="'HY_logistics_status'"
|
|
|
134
|
+ v-if="authority_logistics_status(scope.row.F_Status,scope.row.F_State)"
|
|
|
135
|
+ type="text"
|
|
|
136
|
+ @click="btn_logistics_status(scope.row.F_Id)"
|
|
|
137
|
+ >物流状态</el-button>
|
|
85
|
138
|
</template>
|
|
86
|
139
|
</el-table-column>
|
|
87
|
140
|
</el-table>
|
|
|
@@ -116,7 +169,7 @@ export default {
|
|
116
|
169
|
Pagination
|
|
117
|
170
|
},
|
|
118
|
171
|
filters: {
|
|
119
|
|
- judgmentStateName(status) {
|
|
|
172
|
+ judgmentStateName (status) {
|
|
120
|
173
|
const statusMap = {
|
|
121
|
174
|
'-1': '无效',
|
|
122
|
175
|
'0': '暂存',
|
|
|
@@ -129,7 +182,7 @@ export default {
|
|
129
|
182
|
}
|
|
130
|
183
|
return statusMap[status]
|
|
131
|
184
|
},
|
|
132
|
|
- judgmentStatusName(status) {
|
|
|
185
|
+ judgmentStatusName (status) {
|
|
133
|
186
|
const statusMap = {
|
|
134
|
187
|
'0': '未发出',
|
|
135
|
188
|
'1': '未签收',
|
|
|
@@ -139,7 +192,7 @@ export default {
|
|
139
|
192
|
}
|
|
140
|
193
|
return statusMap[status]
|
|
141
|
194
|
},
|
|
142
|
|
- judgmentOrderGoods(status) {
|
|
|
195
|
+ judgmentOrderGoods (status) {
|
|
143
|
196
|
let orderGoodsNameQuantity = ''
|
|
144
|
197
|
for (let i = 0; i < status.length; i++) {
|
|
145
|
198
|
orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
|
|
|
@@ -148,7 +201,7 @@ export default {
|
|
148
|
201
|
return orderGoodsNameQuantity
|
|
149
|
202
|
},
|
|
150
|
203
|
},
|
|
151
|
|
- data() {
|
|
|
204
|
+ data () {
|
|
152
|
205
|
return {
|
|
153
|
206
|
loading: false,
|
|
154
|
207
|
searchData: {
|
|
|
@@ -175,9 +228,9 @@ export default {
|
|
175
|
228
|
mergeOrderId: [], //合并订单id
|
|
176
|
229
|
};
|
|
177
|
230
|
},
|
|
178
|
|
- created() {
|
|
179
|
|
- if(this.$route.params.id){
|
|
180
|
|
- this.activeName=this.$route.params.id
|
|
|
231
|
+ created () {
|
|
|
232
|
+ if (this.$route.params.id) {
|
|
|
233
|
+ this.activeName = this.$route.params.id
|
|
181
|
234
|
}
|
|
182
|
235
|
this.getOrderType()
|
|
183
|
236
|
this.getList()
|
|
|
@@ -188,7 +241,7 @@ export default {
|
|
188
|
241
|
};
|
|
189
|
242
|
},
|
|
190
|
243
|
methods: {
|
|
191
|
|
- getList() {
|
|
|
244
|
+ getList () {
|
|
192
|
245
|
this.loading = true;
|
|
193
|
246
|
return new Promise(resolve => {
|
|
194
|
247
|
const params = {
|
|
|
@@ -203,7 +256,7 @@ export default {
|
|
203
|
256
|
F_TrackingNo: this.searchData.trackingNo, //运单号
|
|
204
|
257
|
SearchStartTime: this.searchData.searchTime[0], //添加开始时间
|
|
205
|
258
|
SearchEndTime: this.searchData.searchTime[1], //添加结束时间
|
|
206
|
|
- F_PayState: this.searchData.payState, //交易状态
|
|
|
259
|
+ F_PayState: -2, //交易状态
|
|
207
|
260
|
F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
|
|
208
|
261
|
};
|
|
209
|
262
|
getOrderListCustomerService(params).then(response => {
|
|
|
@@ -217,27 +270,27 @@ export default {
|
|
217
|
270
|
});
|
|
218
|
271
|
},
|
|
219
|
272
|
// 获取订单类型
|
|
220
|
|
- getOrderType() {
|
|
221
|
|
- return new Promise(resolve=>{
|
|
222
|
|
- const params={
|
|
223
|
|
- isleaf:true,
|
|
224
|
|
- code:'ORDERTYPE'
|
|
|
273
|
+ getOrderType () {
|
|
|
274
|
+ return new Promise(resolve => {
|
|
|
275
|
+ const params = {
|
|
|
276
|
+ isleaf: true,
|
|
|
277
|
+ code: 'ORDERTYPE'
|
|
225
|
278
|
}
|
|
226
|
|
- getDictionaryValueList(params).then(response=>{
|
|
227
|
|
- if(response.state.toLowerCase() === 'success'){
|
|
|
279
|
+ getDictionaryValueList(params).then(response => {
|
|
|
280
|
+ if (response.state.toLowerCase() === 'success') {
|
|
228
|
281
|
this.orderType = response.data.Rows
|
|
229
|
282
|
}
|
|
230
|
283
|
})
|
|
231
|
284
|
})
|
|
232
|
285
|
},
|
|
233
|
|
- handleTabClick(tab, event) {
|
|
|
286
|
+ handleTabClick (tab, event) {
|
|
234
|
287
|
this.getList()
|
|
235
|
288
|
},
|
|
236
|
|
- btn_search() {
|
|
|
289
|
+ btn_search () {
|
|
237
|
290
|
this.pageParams.pageindex = 1;
|
|
238
|
291
|
this.getList();
|
|
239
|
292
|
},
|
|
240
|
|
- btn_edit(editId) {
|
|
|
293
|
+ btn_edit (editId) {
|
|
241
|
294
|
this.$layer.iframe({
|
|
242
|
295
|
content: {
|
|
243
|
296
|
content: edit, // 传递的组件对象
|
|
|
@@ -249,9 +302,9 @@ export default {
|
|
249
|
302
|
});
|
|
250
|
303
|
},
|
|
251
|
304
|
//导出
|
|
252
|
|
- btn_export() {},
|
|
|
305
|
+ btn_export () { },
|
|
253
|
306
|
//导入
|
|
254
|
|
- btn_waybill_number_import(){
|
|
|
307
|
+ btn_waybill_number_import () {
|
|
255
|
308
|
this.$layer.iframe({
|
|
256
|
309
|
content: {
|
|
257
|
310
|
content: importWaybillNumber, // 传递的组件对象
|
|
|
@@ -264,7 +317,7 @@ export default {
|
|
264
|
317
|
})
|
|
265
|
318
|
},
|
|
266
|
319
|
//退回订单
|
|
267
|
|
- btn_goback(orderid) {
|
|
|
320
|
+ btn_goback (orderid) {
|
|
268
|
321
|
this.$layer.iframe({
|
|
269
|
322
|
content: {
|
|
270
|
323
|
content: goback, // 传递的组件对象
|
|
|
@@ -276,7 +329,7 @@ export default {
|
|
276
|
329
|
});
|
|
277
|
330
|
},
|
|
278
|
331
|
//通过订单
|
|
279
|
|
- btn_through(orderid) {
|
|
|
332
|
+ btn_through (orderid) {
|
|
280
|
333
|
this.$layer.iframe({
|
|
281
|
334
|
content: {
|
|
282
|
335
|
content: through, // 传递的组件对象
|
|
|
@@ -288,7 +341,7 @@ export default {
|
|
288
|
341
|
});
|
|
289
|
342
|
},
|
|
290
|
343
|
//标签订单
|
|
291
|
|
- btn_label(orderid) {
|
|
|
344
|
+ btn_label (orderid) {
|
|
292
|
345
|
this.$layer.iframe({
|
|
293
|
346
|
content: {
|
|
294
|
347
|
content: label, // 传递的组件对象
|
|
|
@@ -300,7 +353,7 @@ export default {
|
|
300
|
353
|
});
|
|
301
|
354
|
},
|
|
302
|
355
|
//标签订单
|
|
303
|
|
- btn_logistics_status(orderid) {
|
|
|
356
|
+ btn_logistics_status (orderid) {
|
|
304
|
357
|
this.$layer.iframe({
|
|
305
|
358
|
content: {
|
|
306
|
359
|
content: logistics, // 传递的组件对象
|
|
|
@@ -310,7 +363,7 @@ export default {
|
|
310
|
363
|
area: ["30%", "30%"],
|
|
311
|
364
|
title: "物流状态"
|
|
312
|
365
|
});
|
|
313
|
|
- },
|
|
|
366
|
+ },
|
|
314
|
367
|
//合并
|
|
315
|
368
|
// btn_merge() {
|
|
316
|
369
|
// if (this.mergeOrderId.length < 2) {
|
|
|
@@ -331,9 +384,9 @@ export default {
|
|
331
|
384
|
// });
|
|
332
|
385
|
// },
|
|
333
|
386
|
//拆分
|
|
334
|
|
- btn_split() {},
|
|
|
387
|
+ btn_split () { },
|
|
335
|
388
|
//订单详情
|
|
336
|
|
- hadndleOrderCode(ordercode){
|
|
|
389
|
+ hadndleOrderCode (ordercode) {
|
|
337
|
390
|
this.$layer.iframe({
|
|
338
|
391
|
content: {
|
|
339
|
392
|
content: detail, // 传递的组件对象
|
|
|
@@ -345,24 +398,24 @@ export default {
|
|
345
|
398
|
})
|
|
346
|
399
|
},
|
|
347
|
400
|
//选择多个
|
|
348
|
|
- handleSelectionChange(val) {
|
|
|
401
|
+ handleSelectionChange (val) {
|
|
349
|
402
|
const ids = []
|
|
350
|
403
|
this.multipleSelection = val
|
|
351
|
|
- for (let i=0; i<this.multipleSelection.length; i++) {
|
|
|
404
|
+ for (let i = 0; i < this.multipleSelection.length; i++) {
|
|
352
|
405
|
ids.push(this.multipleSelection[i].F_Id)
|
|
353
|
406
|
}
|
|
354
|
407
|
this.mergeOrderId = ids
|
|
355
|
408
|
},
|
|
356
|
409
|
//编辑权限
|
|
357
|
|
- authority_edit(state) {
|
|
358
|
|
- if (state == 6||state==3) {
|
|
|
410
|
+ authority_edit (state) {
|
|
|
411
|
+ if (state == 6 || state == 3) {
|
|
359
|
412
|
return false
|
|
360
|
413
|
} else {
|
|
361
|
414
|
return true
|
|
362
|
415
|
}
|
|
363
|
416
|
},
|
|
364
|
417
|
//退回权限
|
|
365
|
|
- authority_goback(state) {
|
|
|
418
|
+ authority_goback (state) {
|
|
366
|
419
|
if (state == 6) {
|
|
367
|
420
|
return false
|
|
368
|
421
|
} else {
|
|
|
@@ -370,19 +423,19 @@ export default {
|
|
370
|
423
|
}
|
|
371
|
424
|
},
|
|
372
|
425
|
//通过权限
|
|
373
|
|
- authority_through(state) {
|
|
374
|
|
- if (state == 6||state==3) {
|
|
|
426
|
+ authority_through (state) {
|
|
|
427
|
+ if (state == 6 || state == 3) {
|
|
375
|
428
|
return false
|
|
376
|
429
|
} else {
|
|
377
|
430
|
return true
|
|
378
|
431
|
}
|
|
379
|
432
|
},
|
|
380
|
433
|
//物流状态权限
|
|
381
|
|
- authority_logistics_status(status,state) {
|
|
|
434
|
+ authority_logistics_status (status, state) {
|
|
382
|
435
|
if (status == 0 || status == 1) {
|
|
383
|
|
- if(state==6){
|
|
|
436
|
+ if (state == 6) {
|
|
384
|
437
|
return true
|
|
385
|
|
- }else{
|
|
|
438
|
+ } else {
|
|
386
|
439
|
return false
|
|
387
|
440
|
}
|
|
388
|
441
|
} else {
|
|
|
@@ -394,7 +447,7 @@ export default {
|
|
394
|
447
|
</script>
|
|
395
|
448
|
|
|
396
|
449
|
<style rel="stylesheet/scss" lang="scss" scoped>
|
|
397
|
|
-.el{
|
|
|
450
|
+.el {
|
|
398
|
451
|
cursor: pointer;
|
|
399
|
452
|
}
|
|
400
|
453
|
</style>
|