|
|
@@ -78,8 +78,6 @@
|
|
78
|
78
|
class="filter-item"
|
|
79
|
79
|
/>
|
|
80
|
80
|
</el-col>
|
|
81
|
|
- </el-row>
|
|
82
|
|
- <el-row :gutter="20">
|
|
83
|
81
|
<el-col :span="3">
|
|
84
|
82
|
<el-input
|
|
85
|
83
|
v-model="searchData.trackingNo"
|
|
|
@@ -88,8 +86,15 @@
|
|
88
|
86
|
/>
|
|
89
|
87
|
</el-col>
|
|
90
|
88
|
<el-col :span="3">
|
|
|
89
|
+ <el-input
|
|
|
90
|
+ v-model="searchData.keywords"
|
|
|
91
|
+ placeholder="请输入关键字"
|
|
|
92
|
+ class="filter-item"
|
|
|
93
|
+ />
|
|
|
94
|
+ </el-col>
|
|
|
95
|
+ <el-col :span="3">
|
|
91
|
96
|
<el-select
|
|
92
|
|
- v-if="activeName==1"
|
|
|
97
|
+ v-if="activeName == 1"
|
|
93
|
98
|
v-model="searchData.logisticsStatus"
|
|
94
|
99
|
class="form_select"
|
|
95
|
100
|
filterable
|
|
|
@@ -106,7 +111,7 @@
|
|
106
|
111
|
</el-col>
|
|
107
|
112
|
<el-col :span="3">
|
|
108
|
113
|
<el-select
|
|
109
|
|
- v-if="activeName==1"
|
|
|
114
|
+ v-if="activeName == 1"
|
|
110
|
115
|
v-model="searchData.F_State"
|
|
111
|
116
|
class="form_select"
|
|
112
|
117
|
filterable
|
|
|
@@ -127,7 +132,7 @@
|
|
127
|
132
|
class="filter-item"
|
|
128
|
133
|
icon="el-icon-search"
|
|
129
|
134
|
@click="btn_search"
|
|
130
|
|
- >搜索</el-button
|
|
|
135
|
+ >搜索</el-button
|
|
131
|
136
|
>
|
|
132
|
137
|
<el-button
|
|
133
|
138
|
v-permission="'HY_export'"
|
|
|
@@ -135,7 +140,7 @@
|
|
135
|
140
|
class="filter-item"
|
|
136
|
141
|
icon="el-icon-upload2"
|
|
137
|
142
|
@click="btn_export"
|
|
138
|
|
- >导出</el-button
|
|
|
143
|
+ >导出</el-button
|
|
139
|
144
|
>
|
|
140
|
145
|
<el-button
|
|
141
|
146
|
v-permission="'HY_import'"
|
|
|
@@ -143,14 +148,14 @@
|
|
143
|
148
|
class="filter-item"
|
|
144
|
149
|
icon="el-icon-download"
|
|
145
|
150
|
@click="btn_import"
|
|
146
|
|
- >导入</el-button
|
|
|
151
|
+ >导入</el-button
|
|
147
|
152
|
>
|
|
148
|
153
|
<el-button
|
|
149
|
154
|
v-permission="'HY_merge'"
|
|
150
|
155
|
type="primary"
|
|
151
|
156
|
class="filter-item"
|
|
152
|
157
|
@click="btn_merge"
|
|
153
|
|
- >合并</el-button
|
|
|
158
|
+ >合并</el-button
|
|
154
|
159
|
>
|
|
155
|
160
|
<el-button
|
|
156
|
161
|
v-permission="'HY_bulk_submit'"
|
|
|
@@ -158,7 +163,7 @@
|
|
158
|
163
|
type="primary"
|
|
159
|
164
|
class="filter-item"
|
|
160
|
165
|
@click="btn_bulk_submit"
|
|
161
|
|
- >批量提交</el-button
|
|
|
166
|
+ >批量提交</el-button
|
|
162
|
167
|
>
|
|
163
|
168
|
</el-col>
|
|
164
|
169
|
</el-row>
|
|
|
@@ -202,7 +207,7 @@
|
|
202
|
207
|
type="text"
|
|
203
|
208
|
size="small"
|
|
204
|
209
|
@click="hadndleOrderCode(scope.row.F_Id)"
|
|
205
|
|
- >{{ scope.row.F_Id }}</el-button
|
|
|
210
|
+ >{{ scope.row.F_Id }}</el-button
|
|
206
|
211
|
>
|
|
207
|
212
|
</template>
|
|
208
|
213
|
</el-table-column>
|
|
|
@@ -238,7 +243,11 @@
|
|
238
|
243
|
scope.row.F_State | judgmentStateName
|
|
239
|
244
|
}}</template>
|
|
240
|
245
|
</el-table-column>
|
|
241
|
|
- <el-table-column prop="F_CheckRemark" label="客服退回原因" align="center" />
|
|
|
246
|
+ <el-table-column
|
|
|
247
|
+ prop="F_CheckRemark"
|
|
|
248
|
+ label="客服退回原因"
|
|
|
249
|
+ align="center"
|
|
|
250
|
+ />
|
|
242
|
251
|
<el-table-column prop="F_AddUserName" label="下单员工" align="center" />
|
|
243
|
252
|
<el-table-column prop="F_BelongName" label="归属员工" align="center" />
|
|
244
|
253
|
<el-table-column prop="F_Type" label="订单类型" align="center" />
|
|
|
@@ -262,13 +271,13 @@
|
|
262
|
271
|
:disabled="isDisable"
|
|
263
|
272
|
type="text"
|
|
264
|
273
|
@click="btn_edit(scope.row.F_Id)"
|
|
265
|
|
- >编辑</el-button
|
|
|
274
|
+ >编辑</el-button
|
|
266
|
275
|
>
|
|
267
|
276
|
<el-button
|
|
268
|
277
|
v-permission="'HY_add_remark'"
|
|
269
|
278
|
type="text"
|
|
270
|
279
|
@click="btn_add_remark(scope.row.F_Id)"
|
|
271
|
|
- >备注</el-button
|
|
|
280
|
+ >备注</el-button
|
|
272
|
281
|
>
|
|
273
|
282
|
<el-button
|
|
274
|
283
|
v-permission="'HY_submit'"
|
|
|
@@ -276,7 +285,7 @@
|
|
276
|
285
|
:disabled="isDisable"
|
|
277
|
286
|
type="text"
|
|
278
|
287
|
@click="btn_submit(scope.row.F_Id)"
|
|
279
|
|
- >提交</el-button
|
|
|
288
|
+ >提交</el-button
|
|
280
|
289
|
>
|
|
281
|
290
|
<!-- <el-button
|
|
282
|
291
|
v-permission="'HY_cancel'"
|
|
|
@@ -308,68 +317,68 @@
|
|
308
|
317
|
</template>
|
|
309
|
318
|
|
|
310
|
319
|
<script>
|
|
311
|
|
-import { getDictionaryValueList } from '@/api/commonAPI'
|
|
|
320
|
+import { getDictionaryValueList } from "@/api/commonAPI";
|
|
312
|
321
|
import {
|
|
313
|
322
|
getOrderLists,
|
|
314
|
323
|
cancelOrder,
|
|
315
|
324
|
orderBulkSubmit
|
|
316
|
|
-} from '@/api/orderManagement/orderList'
|
|
317
|
|
-import { pickerOptions, formatterContent } from '@/utils'
|
|
318
|
|
-import { Send } from '@/utils/telWebsocket'
|
|
319
|
|
-import { getCallOutprefix } from '@/api/teloperation'
|
|
320
|
|
-import { mapGetters } from 'vuex'
|
|
321
|
|
-import store from '@/store'
|
|
322
|
|
-import addOrEditRemark from './addOrEditRemark'
|
|
323
|
|
-import edit from './edit'
|
|
324
|
|
-import detail from './detail'
|
|
325
|
|
-import merge from './merge'
|
|
|
325
|
+} from "@/api/orderManagement/orderList";
|
|
|
326
|
+import { pickerOptions, formatterContent } from "@/utils";
|
|
|
327
|
+import { Send } from "@/utils/telWebsocket";
|
|
|
328
|
+import { getCallOutprefix } from "@/api/teloperation";
|
|
|
329
|
+import { mapGetters } from "vuex";
|
|
|
330
|
+import store from "@/store";
|
|
|
331
|
+import addOrEditRemark from "./addOrEditRemark";
|
|
|
332
|
+import edit from "./edit";
|
|
|
333
|
+import detail from "./detail";
|
|
|
334
|
+import merge from "./merge";
|
|
326
|
335
|
// import apply from "./apply";
|
|
327
|
|
-import importAuth from './importAuth'
|
|
328
|
|
-import afterSale from './afterSale'
|
|
329
|
|
-import payMoney from './payMoney'
|
|
330
|
|
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
|
|
|
336
|
+import importAuth from "./importAuth";
|
|
|
337
|
+import afterSale from "./afterSale";
|
|
|
338
|
+import payMoney from "./payMoney";
|
|
|
339
|
+import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
|
|
331
|
340
|
|
|
332
|
341
|
export default {
|
|
333
|
|
- name: 'OrderList',
|
|
|
342
|
+ name: "OrderList",
|
|
334
|
343
|
components: {
|
|
335
|
344
|
Pagination
|
|
336
|
345
|
},
|
|
337
|
346
|
filters: {
|
|
338
|
347
|
judgmentStateName(status) {
|
|
339
|
348
|
const statusMap = {
|
|
340
|
|
- 0: '未提交',
|
|
341
|
|
- 1: '待分仓',
|
|
342
|
|
- 2: '已退回',
|
|
343
|
|
- 3: '已分仓',
|
|
344
|
|
- 4: '无货',
|
|
345
|
|
- 5: '仓库待审核',
|
|
346
|
|
- 6: '已发货',
|
|
347
|
|
- 7: '付款待审核',
|
|
348
|
|
- 8: '待分物流',
|
|
349
|
|
- 9: '物流未通过'
|
|
350
|
|
- }
|
|
351
|
|
- return statusMap[status]
|
|
|
349
|
+ 0: "未提交",
|
|
|
350
|
+ 1: "待分仓",
|
|
|
351
|
+ 2: "已退回",
|
|
|
352
|
+ 3: "已分仓",
|
|
|
353
|
+ 4: "无货",
|
|
|
354
|
+ 5: "仓库待审核",
|
|
|
355
|
+ 6: "已发货",
|
|
|
356
|
+ 7: "付款待审核",
|
|
|
357
|
+ 8: "待分物流",
|
|
|
358
|
+ 9: "物流未通过"
|
|
|
359
|
+ };
|
|
|
360
|
+ return statusMap[status];
|
|
352
|
361
|
},
|
|
353
|
362
|
judgmentStatusName(status) {
|
|
354
|
363
|
const statusMap = {
|
|
355
|
|
- 0: '未发出',
|
|
356
|
|
- 1: '未签收',
|
|
357
|
|
- 2: '签收',
|
|
358
|
|
- 3: '改代收',
|
|
359
|
|
- 4: '拒收'
|
|
360
|
|
- }
|
|
361
|
|
- return statusMap[status]
|
|
|
364
|
+ 0: "未发出",
|
|
|
365
|
+ 1: "未签收",
|
|
|
366
|
+ 2: "签收",
|
|
|
367
|
+ 3: "改代收",
|
|
|
368
|
+ 4: "拒收"
|
|
|
369
|
+ };
|
|
|
370
|
+ return statusMap[status];
|
|
362
|
371
|
},
|
|
363
|
372
|
judgmentOrderGoods(status) {
|
|
364
|
|
- let orderGoodsNameQuantity = ''
|
|
|
373
|
+ let orderGoodsNameQuantity = "";
|
|
365
|
374
|
for (let i = 0; i < status.length; i++) {
|
|
366
|
|
- orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
|
|
|
375
|
+ orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`;
|
|
367
|
376
|
}
|
|
368
|
377
|
orderGoodsNameQuantity = orderGoodsNameQuantity.substring(
|
|
369
|
378
|
0,
|
|
370
|
379
|
orderGoodsNameQuantity.length - 1
|
|
371
|
|
- )
|
|
372
|
|
- return orderGoodsNameQuantity
|
|
|
380
|
+ );
|
|
|
381
|
+ return orderGoodsNameQuantity;
|
|
373
|
382
|
}
|
|
374
|
383
|
},
|
|
375
|
384
|
data() {
|
|
|
@@ -377,19 +386,20 @@ export default {
|
|
377
|
386
|
isDisable: false, // 防止多次点击
|
|
378
|
387
|
loading: false,
|
|
379
|
388
|
searchData: {
|
|
380
|
|
- adFrom: '', // 消息/广告媒体来源
|
|
381
|
|
- type: '', // 订单类型
|
|
382
|
|
- payType: '', // 支付方式
|
|
383
|
|
- id: '', // 订单号
|
|
384
|
|
- customer: '', // 客户姓名
|
|
385
|
|
- customerPhone: '', // 客户手机号
|
|
386
|
|
- trackingNo: '', // 运单号
|
|
387
|
|
- searchTime: '', // 订单时间
|
|
388
|
|
- logisticsStatus: '', // 物流状态
|
|
389
|
|
- F_State: '0',
|
|
390
|
|
- State: ''
|
|
|
389
|
+ adFrom: "", // 消息/广告媒体来源
|
|
|
390
|
+ type: "", // 订单类型
|
|
|
391
|
+ payType: "", // 支付方式
|
|
|
392
|
+ id: "", // 订单号
|
|
|
393
|
+ customer: "", // 客户姓名
|
|
|
394
|
+ customerPhone: "", // 客户手机号
|
|
|
395
|
+ trackingNo: "", // 运单号
|
|
|
396
|
+ keywords: "", // 关键字
|
|
|
397
|
+ searchTime: "", // 订单时间
|
|
|
398
|
+ logisticsStatus: "", // 物流状态
|
|
|
399
|
+ F_State: "0",
|
|
|
400
|
+ State: ""
|
|
391
|
401
|
},
|
|
392
|
|
- activeName: '0', // 标签切换首页
|
|
|
402
|
+ activeName: "0", // 标签切换首页
|
|
393
|
403
|
pickerOptions, // 日期数据
|
|
394
|
404
|
pageParams: {
|
|
395
|
405
|
pageindex: 1, // 当前第几页
|
|
|
@@ -405,72 +415,72 @@ export default {
|
|
405
|
415
|
selectOrderId: [], // 合并订单id
|
|
406
|
416
|
orderstate: [
|
|
407
|
417
|
{
|
|
408
|
|
- id: '1',
|
|
409
|
|
- value: '待分仓'
|
|
|
418
|
+ id: "1",
|
|
|
419
|
+ value: "待分仓"
|
|
410
|
420
|
},
|
|
411
|
421
|
// {
|
|
412
|
422
|
// id: '2',
|
|
413
|
423
|
// value: '客服退回'
|
|
414
|
424
|
// },
|
|
415
|
425
|
{
|
|
416
|
|
- id: '3',
|
|
417
|
|
- value: '已分仓'
|
|
|
426
|
+ id: "3",
|
|
|
427
|
+ value: "已分仓"
|
|
418
|
428
|
},
|
|
419
|
429
|
{
|
|
420
|
|
- id: '4',
|
|
421
|
|
- value: '无货'
|
|
|
430
|
+ id: "4",
|
|
|
431
|
+ value: "无货"
|
|
422
|
432
|
},
|
|
423
|
433
|
// {
|
|
424
|
434
|
// id: '5',
|
|
425
|
435
|
// value: '客服提交'
|
|
426
|
436
|
// },
|
|
427
|
437
|
{
|
|
428
|
|
- id: '6',
|
|
429
|
|
- value: '已发货'
|
|
|
438
|
+ id: "6",
|
|
|
439
|
+ value: "已发货"
|
|
430
|
440
|
},
|
|
431
|
441
|
{
|
|
432
|
|
- id: '7',
|
|
433
|
|
- value: '付款待审核'
|
|
|
442
|
+ id: "7",
|
|
|
443
|
+ value: "付款待审核"
|
|
434
|
444
|
},
|
|
435
|
445
|
{
|
|
436
|
|
- id: '8',
|
|
437
|
|
- value: '待分物流'
|
|
|
446
|
+ id: "8",
|
|
|
447
|
+ value: "待分物流"
|
|
438
|
448
|
},
|
|
439
|
449
|
{
|
|
440
|
|
- id: '9',
|
|
441
|
|
- value: '物流未通过'
|
|
|
450
|
+ id: "9",
|
|
|
451
|
+ value: "物流未通过"
|
|
442
|
452
|
}
|
|
443
|
453
|
]
|
|
444
|
|
- }
|
|
|
454
|
+ };
|
|
445
|
455
|
},
|
|
446
|
456
|
created() {
|
|
447
|
457
|
if (this.$route.params.id) {
|
|
448
|
458
|
// this.activeName = this.$route.params.id
|
|
449
|
459
|
}
|
|
450
|
|
- this.getOrderType()
|
|
451
|
|
- this.getOrderF_State()
|
|
452
|
|
- this.getList()
|
|
453
|
|
- this.getPayType()
|
|
454
|
|
- document.onkeyup = (e) => {
|
|
|
460
|
+ this.getOrderType();
|
|
|
461
|
+ this.getOrderF_State();
|
|
|
462
|
+ this.getList();
|
|
|
463
|
+ this.getPayType();
|
|
|
464
|
+ document.onkeyup = e => {
|
|
455
|
465
|
if (e.keyCode === 13) {
|
|
456
|
|
- this.getList()
|
|
|
466
|
+ this.getList();
|
|
457
|
467
|
}
|
|
458
|
|
- }
|
|
|
468
|
+ };
|
|
459
|
469
|
},
|
|
460
|
470
|
computed: {
|
|
461
|
471
|
...mapGetters([
|
|
462
|
|
- 'usercode', // 工号
|
|
463
|
|
- 'extension', // 分机号
|
|
464
|
|
- 'sidebar',
|
|
465
|
|
- 'avatar',
|
|
466
|
|
- 'telCallType', // 通话类型
|
|
467
|
|
- 'telIsVisCallout' // 外呼面板是否显示
|
|
|
472
|
+ "usercode", // 工号
|
|
|
473
|
+ "extension", // 分机号
|
|
|
474
|
+ "sidebar",
|
|
|
475
|
+ "avatar",
|
|
|
476
|
+ "telCallType", // 通话类型
|
|
|
477
|
+ "telIsVisCallout" // 外呼面板是否显示
|
|
468
|
478
|
])
|
|
469
|
479
|
},
|
|
470
|
480
|
methods: {
|
|
471
|
481
|
getList() {
|
|
472
|
|
- this.loading = true
|
|
473
|
|
- return new Promise((resolve) => {
|
|
|
482
|
+ this.loading = true;
|
|
|
483
|
+ return new Promise(resolve => {
|
|
474
|
484
|
const params = {
|
|
475
|
485
|
F_State: this.searchData.F_State, // 订单状态
|
|
476
|
486
|
pageindex: 1, // int 第几页
|
|
|
@@ -483,85 +493,86 @@ export default {
|
|
483
|
493
|
F_Status: this.searchData.logisticsStatus, // 物流状态
|
|
484
|
494
|
F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
|
|
485
|
495
|
F_TrackingNo: this.searchData.trackingNo, // 运单号
|
|
486
|
|
- SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
|
|
487
|
|
- SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
|
|
|
496
|
+ keywords: this.searchData.keywords, // 关键字
|
|
|
497
|
+ SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
|
|
|
498
|
+ SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
|
|
488
|
499
|
F_PayState: -2,
|
|
489
|
500
|
State: this.searchData.State
|
|
490
|
|
- }
|
|
491
|
|
- getOrderLists(params).then((response) => {
|
|
492
|
|
- this.loading = false
|
|
493
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
494
|
|
- this.pageParams.total = response.data.Totals
|
|
495
|
|
- this.dataLists = response.data.Rows
|
|
|
501
|
+ };
|
|
|
502
|
+ getOrderLists(params).then(response => {
|
|
|
503
|
+ this.loading = false;
|
|
|
504
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
505
|
+ this.pageParams.total = response.data.Totals;
|
|
|
506
|
+ this.dataLists = response.data.Rows;
|
|
496
|
507
|
}
|
|
497
|
|
- })
|
|
498
|
|
- resolve()
|
|
499
|
|
- })
|
|
|
508
|
+ });
|
|
|
509
|
+ resolve();
|
|
|
510
|
+ });
|
|
500
|
511
|
},
|
|
501
|
512
|
// 获取订单类型
|
|
502
|
513
|
getOrderType() {
|
|
503
|
|
- return new Promise((resolve) => {
|
|
|
514
|
+ return new Promise(resolve => {
|
|
504
|
515
|
const params = {
|
|
505
|
516
|
isleaf: true,
|
|
506
|
|
- code: 'ORDERTYPE'
|
|
507
|
|
- }
|
|
508
|
|
- getDictionaryValueList(params).then((response) => {
|
|
509
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
510
|
|
- this.orderType = response.data.Rows
|
|
|
517
|
+ code: "ORDERTYPE"
|
|
|
518
|
+ };
|
|
|
519
|
+ getDictionaryValueList(params).then(response => {
|
|
|
520
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
521
|
+ this.orderType = response.data.Rows;
|
|
511
|
522
|
}
|
|
512
|
|
- })
|
|
513
|
|
- })
|
|
|
523
|
+ });
|
|
|
524
|
+ });
|
|
514
|
525
|
},
|
|
515
|
526
|
// 获取支付方式
|
|
516
|
527
|
getPayType() {
|
|
517
|
|
- return new Promise((resolve) => {
|
|
|
528
|
+ return new Promise(resolve => {
|
|
518
|
529
|
const params = {
|
|
519
|
530
|
isleaf: true,
|
|
520
|
|
- code: 'PayType'
|
|
521
|
|
- }
|
|
522
|
|
- getDictionaryValueList(params).then((response) => {
|
|
523
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
524
|
|
- this.payTypeList = response.data.Rows
|
|
|
531
|
+ code: "PayType"
|
|
|
532
|
+ };
|
|
|
533
|
+ getDictionaryValueList(params).then(response => {
|
|
|
534
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
535
|
+ this.payTypeList = response.data.Rows;
|
|
525
|
536
|
}
|
|
526
|
|
- })
|
|
527
|
|
- })
|
|
|
537
|
+ });
|
|
|
538
|
+ });
|
|
528
|
539
|
},
|
|
529
|
540
|
// 获取物流状态
|
|
530
|
541
|
getOrderF_State() {
|
|
531
|
|
- return new Promise((resolve) => {
|
|
|
542
|
+ return new Promise(resolve => {
|
|
532
|
543
|
const params = {
|
|
533
|
544
|
isleaf: true,
|
|
534
|
|
- code: 'OrderF_State'
|
|
535
|
|
- }
|
|
536
|
|
- getDictionaryValueList(params).then((response) => {
|
|
537
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
538
|
|
- const res = response.data.Rows
|
|
|
545
|
+ code: "OrderF_State"
|
|
|
546
|
+ };
|
|
|
547
|
+ getDictionaryValueList(params).then(response => {
|
|
|
548
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
549
|
+ const res = response.data.Rows;
|
|
539
|
550
|
res.forEach((e, i) => {
|
|
540
|
|
- if (e.F_Remark === '未签收') {
|
|
541
|
|
- this.logisticsList.push(e)
|
|
542
|
|
- } else if (e.F_Remark === '签收') {
|
|
543
|
|
- this.logisticsList.push(e)
|
|
544
|
|
- } else if (e.F_Remark === '拒收') {
|
|
545
|
|
- this.logisticsList.push(e)
|
|
546
|
|
- } else if (e.F_Remark === '未发出') {
|
|
547
|
|
- this.logisticsList.push(e)
|
|
|
551
|
+ if (e.F_Remark === "未签收") {
|
|
|
552
|
+ this.logisticsList.push(e);
|
|
|
553
|
+ } else if (e.F_Remark === "签收") {
|
|
|
554
|
+ this.logisticsList.push(e);
|
|
|
555
|
+ } else if (e.F_Remark === "拒收") {
|
|
|
556
|
+ this.logisticsList.push(e);
|
|
|
557
|
+ } else if (e.F_Remark === "未发出") {
|
|
|
558
|
+ this.logisticsList.push(e);
|
|
548
|
559
|
}
|
|
549
|
|
- })
|
|
|
560
|
+ });
|
|
550
|
561
|
}
|
|
551
|
|
- })
|
|
552
|
|
- })
|
|
|
562
|
+ });
|
|
|
563
|
+ });
|
|
553
|
564
|
},
|
|
554
|
565
|
handleTabClick(tab, event) {
|
|
555
|
|
- this.$refs.multipleTable.clearSelection()
|
|
556
|
|
- this.pageParams.pageindex = 1
|
|
557
|
|
- if (this.activeName == '1') {
|
|
558
|
|
- this.searchData.State = this.activeName
|
|
559
|
|
- this.searchData.F_State = ''
|
|
|
566
|
+ this.$refs.multipleTable.clearSelection();
|
|
|
567
|
+ this.pageParams.pageindex = 1;
|
|
|
568
|
+ if (this.activeName == "1") {
|
|
|
569
|
+ this.searchData.State = this.activeName;
|
|
|
570
|
+ this.searchData.F_State = "";
|
|
560
|
571
|
} else {
|
|
561
|
|
- this.searchData.F_State = this.activeName
|
|
562
|
|
- this.searchData.State = ''
|
|
|
572
|
+ this.searchData.F_State = this.activeName;
|
|
|
573
|
+ this.searchData.State = "";
|
|
563
|
574
|
}
|
|
564
|
|
- this.getList()
|
|
|
575
|
+ this.getList();
|
|
565
|
576
|
},
|
|
566
|
577
|
handle(ordercode) {
|
|
567
|
578
|
this.$layer.iframe({
|
|
|
@@ -570,13 +581,13 @@ export default {
|
|
570
|
581
|
parent: this, // 当前的vue对象
|
|
571
|
582
|
data: { rowid: ordercode } // props
|
|
572
|
583
|
},
|
|
573
|
|
- area: ['80%', '90%'],
|
|
574
|
|
- title: '订单详情'
|
|
575
|
|
- })
|
|
|
584
|
+ area: ["80%", "90%"],
|
|
|
585
|
+ title: "订单详情"
|
|
|
586
|
+ });
|
|
576
|
587
|
},
|
|
577
|
588
|
btn_search() {
|
|
578
|
|
- this.pageParams.pageindex = 1
|
|
579
|
|
- this.getList()
|
|
|
589
|
+ this.pageParams.pageindex = 1;
|
|
|
590
|
+ this.getList();
|
|
580
|
591
|
},
|
|
581
|
592
|
// 添加备注
|
|
582
|
593
|
btn_add_remark(id) {
|
|
|
@@ -586,9 +597,9 @@ export default {
|
|
586
|
597
|
parent: this, // 当前的vue对象
|
|
587
|
598
|
data: { rowid: id } // props
|
|
588
|
599
|
},
|
|
589
|
|
- area: ['40%', '50%'],
|
|
590
|
|
- title: '添加备注'
|
|
591
|
|
- })
|
|
|
600
|
+ area: ["40%", "50%"],
|
|
|
601
|
+ title: "添加备注"
|
|
|
602
|
+ });
|
|
592
|
603
|
},
|
|
593
|
604
|
// 编辑
|
|
594
|
605
|
btn_edit(editId) {
|
|
|
@@ -598,9 +609,9 @@ export default {
|
|
598
|
609
|
parent: this, // 当前的vue对象
|
|
599
|
610
|
data: { rowid: editId } // props
|
|
600
|
611
|
},
|
|
601
|
|
- area: ['80%', '90%'],
|
|
602
|
|
- title: '编辑订单'
|
|
603
|
|
- })
|
|
|
612
|
+ area: ["80%", "90%"],
|
|
|
613
|
+ title: "编辑订单"
|
|
|
614
|
+ });
|
|
604
|
615
|
},
|
|
605
|
616
|
// 售后
|
|
606
|
617
|
btn_afterSale(id) {
|
|
|
@@ -610,9 +621,9 @@ export default {
|
|
610
|
621
|
parent: this, // 当前的vue对象
|
|
611
|
622
|
data: { rowid: id } // props
|
|
612
|
623
|
},
|
|
613
|
|
- area: ['80%', '90%'],
|
|
614
|
|
- title: '售后'
|
|
615
|
|
- })
|
|
|
624
|
+ area: ["80%", "90%"],
|
|
|
625
|
+ title: "售后"
|
|
|
626
|
+ });
|
|
616
|
627
|
},
|
|
617
|
628
|
// 导出
|
|
618
|
629
|
btn_export() {},
|
|
|
@@ -622,82 +633,82 @@ export default {
|
|
622
|
633
|
content: {
|
|
623
|
634
|
content: importAuth, // 传递的组件对象
|
|
624
|
635
|
parent: this, // 当前的vue对象
|
|
625
|
|
- data: { rowid: '' } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
|
|
|
636
|
+ data: { rowid: "" } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
|
|
626
|
637
|
},
|
|
627
|
|
- area: ['40%', '380px'],
|
|
|
638
|
+ area: ["40%", "380px"],
|
|
628
|
639
|
shadeClose: false,
|
|
629
|
|
- title: '导入订单信息'
|
|
630
|
|
- })
|
|
|
640
|
+ title: "导入订单信息"
|
|
|
641
|
+ });
|
|
631
|
642
|
},
|
|
632
|
643
|
// 撤回
|
|
633
|
644
|
btn_cancel(orderId) {
|
|
634
|
|
- this.isDisable = true
|
|
|
645
|
+ this.isDisable = true;
|
|
635
|
646
|
setTimeout(() => {
|
|
636
|
|
- this.$confirm('您确定撤回吗?', '提示', {
|
|
637
|
|
- confirmButtonText: '确定',
|
|
638
|
|
- cancelButtonText: '取消',
|
|
639
|
|
- type: 'warning'
|
|
|
647
|
+ this.$confirm("您确定撤回吗?", "提示", {
|
|
|
648
|
+ confirmButtonText: "确定",
|
|
|
649
|
+ cancelButtonText: "取消",
|
|
|
650
|
+ type: "warning"
|
|
640
|
651
|
})
|
|
641
|
652
|
.then(() => {
|
|
642
|
|
- this.isDisable = false
|
|
|
653
|
+ this.isDisable = false;
|
|
643
|
654
|
const data = {
|
|
644
|
655
|
orderids: orderId,
|
|
645
|
656
|
state: 0 // 撤回 0
|
|
646
|
|
- }
|
|
647
|
|
- cancelOrder(data).then((response) => {
|
|
648
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
649
|
|
- this.getList()
|
|
650
|
|
- this.$message.success('撤回成功!')
|
|
|
657
|
+ };
|
|
|
658
|
+ cancelOrder(data).then(response => {
|
|
|
659
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
660
|
+ this.getList();
|
|
|
661
|
+ this.$message.success("撤回成功!");
|
|
651
|
662
|
}
|
|
652
|
|
- })
|
|
|
663
|
+ });
|
|
653
|
664
|
})
|
|
654
|
665
|
.catch(() => {
|
|
655
|
666
|
this.$message({
|
|
656
|
|
- type: 'info',
|
|
657
|
|
- message: '已取消撤回'
|
|
658
|
|
- })
|
|
659
|
|
- })
|
|
660
|
|
- this.isDisable = false
|
|
661
|
|
- }, 300)
|
|
|
667
|
+ type: "info",
|
|
|
668
|
+ message: "已取消撤回"
|
|
|
669
|
+ });
|
|
|
670
|
+ });
|
|
|
671
|
+ this.isDisable = false;
|
|
|
672
|
+ }, 300);
|
|
662
|
673
|
},
|
|
663
|
674
|
// 提交
|
|
664
|
675
|
btn_submit(orderId) {
|
|
665
|
|
- this.isDisable = true
|
|
|
676
|
+ this.isDisable = true;
|
|
666
|
677
|
setTimeout(() => {
|
|
667
|
|
- this.$confirm('您确定提交吗?', '提示', {
|
|
668
|
|
- confirmButtonText: '确定',
|
|
669
|
|
- cancelButtonText: '取消',
|
|
670
|
|
- type: 'warning'
|
|
|
678
|
+ this.$confirm("您确定提交吗?", "提示", {
|
|
|
679
|
+ confirmButtonText: "确定",
|
|
|
680
|
+ cancelButtonText: "取消",
|
|
|
681
|
+ type: "warning"
|
|
671
|
682
|
})
|
|
672
|
683
|
.then(() => {
|
|
673
|
|
- this.isDisable = false
|
|
|
684
|
+ this.isDisable = false;
|
|
674
|
685
|
const data = {
|
|
675
|
686
|
orderids: orderId
|
|
676
|
|
- }
|
|
677
|
|
- orderBulkSubmit(data).then((response) => {
|
|
678
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
679
|
|
- this.getList()
|
|
680
|
|
- this.$message.success('提交成功!')
|
|
|
687
|
+ };
|
|
|
688
|
+ orderBulkSubmit(data).then(response => {
|
|
|
689
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
690
|
+ this.getList();
|
|
|
691
|
+ this.$message.success("提交成功!");
|
|
681
|
692
|
}
|
|
682
|
|
- })
|
|
|
693
|
+ });
|
|
683
|
694
|
})
|
|
684
|
695
|
.catch(() => {
|
|
685
|
696
|
this.$message({
|
|
686
|
|
- type: 'info',
|
|
687
|
|
- message: '已取消提交'
|
|
688
|
|
- })
|
|
689
|
|
- })
|
|
690
|
|
- this.isDisable = false
|
|
691
|
|
- }, 300)
|
|
|
697
|
+ type: "info",
|
|
|
698
|
+ message: "已取消提交"
|
|
|
699
|
+ });
|
|
|
700
|
+ });
|
|
|
701
|
+ this.isDisable = false;
|
|
|
702
|
+ }, 300);
|
|
692
|
703
|
},
|
|
693
|
704
|
// 合并
|
|
694
|
705
|
btn_merge() {
|
|
695
|
706
|
if (this.selectOrderId.length < 2) {
|
|
696
|
707
|
this.$message({
|
|
697
|
|
- message: '最少选择两条订单！',
|
|
698
|
|
- type: 'warning'
|
|
699
|
|
- })
|
|
700
|
|
- return
|
|
|
708
|
+ message: "最少选择两条订单！",
|
|
|
709
|
+ type: "warning"
|
|
|
710
|
+ });
|
|
|
711
|
+ return;
|
|
701
|
712
|
}
|
|
702
|
713
|
this.$layer.iframe({
|
|
703
|
714
|
content: {
|
|
|
@@ -705,84 +716,84 @@ export default {
|
|
705
|
716
|
parent: this, // 当前的vue对象
|
|
706
|
717
|
data: { rowid: this.selectOrderId } // props
|
|
707
|
718
|
},
|
|
708
|
|
- area: ['80%', '90%'],
|
|
709
|
|
- title: '合并订单'
|
|
710
|
|
- })
|
|
|
719
|
+ area: ["80%", "90%"],
|
|
|
720
|
+ title: "合并订单"
|
|
|
721
|
+ });
|
|
711
|
722
|
},
|
|
712
|
723
|
// 批量提交
|
|
713
|
724
|
btn_bulk_submit() {
|
|
714
|
725
|
if (this.selectOrderId.length < 1) {
|
|
715
|
726
|
this.$message({
|
|
716
|
|
- message: '请选择订单！',
|
|
717
|
|
- type: 'warning'
|
|
718
|
|
- })
|
|
719
|
|
- return
|
|
|
727
|
+ message: "请选择订单！",
|
|
|
728
|
+ type: "warning"
|
|
|
729
|
+ });
|
|
|
730
|
+ return;
|
|
720
|
731
|
}
|
|
721
|
|
- this.isDisable = true
|
|
|
732
|
+ this.isDisable = true;
|
|
722
|
733
|
setTimeout(() => {
|
|
723
|
|
- this.$confirm('您确定提交吗?', '提示', {
|
|
724
|
|
- confirmButtonText: '确定',
|
|
725
|
|
- cancelButtonText: '取消',
|
|
726
|
|
- type: 'warning'
|
|
|
734
|
+ this.$confirm("您确定提交吗?", "提示", {
|
|
|
735
|
+ confirmButtonText: "确定",
|
|
|
736
|
+ cancelButtonText: "取消",
|
|
|
737
|
+ type: "warning"
|
|
727
|
738
|
})
|
|
728
|
739
|
.then(() => {
|
|
729
|
|
- this.isDisable = false
|
|
|
740
|
+ this.isDisable = false;
|
|
730
|
741
|
const data = {
|
|
731
|
|
- orderids: this.selectOrderId.join(',').replace(/\s+/g, '')
|
|
732
|
|
- }
|
|
733
|
|
- orderBulkSubmit(data).then((response) => {
|
|
734
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
735
|
|
- this.getList()
|
|
736
|
|
- this.$message.success('提交成功!')
|
|
|
742
|
+ orderids: this.selectOrderId.join(",").replace(/\s+/g, "")
|
|
|
743
|
+ };
|
|
|
744
|
+ orderBulkSubmit(data).then(response => {
|
|
|
745
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
746
|
+ this.getList();
|
|
|
747
|
+ this.$message.success("提交成功!");
|
|
737
|
748
|
}
|
|
738
|
|
- })
|
|
|
749
|
+ });
|
|
739
|
750
|
})
|
|
740
|
751
|
.catch(() => {
|
|
741
|
752
|
this.$message({
|
|
742
|
|
- type: 'info',
|
|
743
|
|
- message: '已取消提交'
|
|
744
|
|
- })
|
|
745
|
|
- })
|
|
746
|
|
- this.isDisable = false
|
|
747
|
|
- }, 300)
|
|
|
753
|
+ type: "info",
|
|
|
754
|
+ message: "已取消提交"
|
|
|
755
|
+ });
|
|
|
756
|
+ });
|
|
|
757
|
+ this.isDisable = false;
|
|
|
758
|
+ }, 300);
|
|
748
|
759
|
},
|
|
749
|
760
|
// 批量撤回
|
|
750
|
761
|
btn_bulk_revoke() {
|
|
751
|
762
|
if (this.selectOrderId.length < 1) {
|
|
752
|
763
|
this.$message({
|
|
753
|
|
- message: '请选择订单！',
|
|
754
|
|
- type: 'warning'
|
|
755
|
|
- })
|
|
756
|
|
- return
|
|
|
764
|
+ message: "请选择订单！",
|
|
|
765
|
+ type: "warning"
|
|
|
766
|
+ });
|
|
|
767
|
+ return;
|
|
757
|
768
|
}
|
|
758
|
|
- this.isDisable = true
|
|
|
769
|
+ this.isDisable = true;
|
|
759
|
770
|
setTimeout(() => {
|
|
760
|
|
- this.$confirm('您确定撤回吗?', '提示', {
|
|
761
|
|
- confirmButtonText: '确定',
|
|
762
|
|
- cancelButtonText: '取消',
|
|
763
|
|
- type: 'warning'
|
|
|
771
|
+ this.$confirm("您确定撤回吗?", "提示", {
|
|
|
772
|
+ confirmButtonText: "确定",
|
|
|
773
|
+ cancelButtonText: "取消",
|
|
|
774
|
+ type: "warning"
|
|
764
|
775
|
})
|
|
765
|
776
|
.then(() => {
|
|
766
|
|
- this.isDisable = false
|
|
|
777
|
+ this.isDisable = false;
|
|
767
|
778
|
const data = {
|
|
768
|
|
- orderids: this.selectOrderId.join(',').replace(/\s+/g, ''),
|
|
|
779
|
+ orderids: this.selectOrderId.join(",").replace(/\s+/g, ""),
|
|
769
|
780
|
state: 0
|
|
770
|
|
- }
|
|
771
|
|
- cancelOrder(data).then((response) => {
|
|
772
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
773
|
|
- this.getList()
|
|
774
|
|
- this.$message.success('撤回成功!')
|
|
|
781
|
+ };
|
|
|
782
|
+ cancelOrder(data).then(response => {
|
|
|
783
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
784
|
+ this.getList();
|
|
|
785
|
+ this.$message.success("撤回成功!");
|
|
775
|
786
|
}
|
|
776
|
|
- })
|
|
|
787
|
+ });
|
|
777
|
788
|
})
|
|
778
|
789
|
.catch(() => {
|
|
779
|
790
|
this.$message({
|
|
780
|
|
- type: 'info',
|
|
781
|
|
- message: '已取消撤回'
|
|
782
|
|
- })
|
|
783
|
|
- })
|
|
784
|
|
- this.isDisable = false
|
|
785
|
|
- }, 300)
|
|
|
791
|
+ type: "info",
|
|
|
792
|
+ message: "已取消撤回"
|
|
|
793
|
+ });
|
|
|
794
|
+ });
|
|
|
795
|
+ this.isDisable = false;
|
|
|
796
|
+ }, 300);
|
|
786
|
797
|
},
|
|
787
|
798
|
// 支付金额
|
|
788
|
799
|
btn_pay_money(orderId) {
|
|
|
@@ -792,9 +803,9 @@ export default {
|
|
792
|
803
|
parent: this, // 当前的vue对象
|
|
793
|
804
|
data: { rowid: orderId } // props
|
|
794
|
805
|
},
|
|
795
|
|
- area: ['80%', '80%'],
|
|
796
|
|
- title: '支付金额'
|
|
797
|
|
- })
|
|
|
806
|
+ area: ["80%", "80%"],
|
|
|
807
|
+ title: "支付金额"
|
|
|
808
|
+ });
|
|
798
|
809
|
},
|
|
799
|
810
|
hadndleOrderCode(ordercode) {
|
|
800
|
811
|
this.$layer.iframe({
|
|
|
@@ -803,25 +814,25 @@ export default {
|
|
803
|
814
|
parent: this, // 当前的vue对象
|
|
804
|
815
|
data: { rowid: ordercode } // props
|
|
805
|
816
|
},
|
|
806
|
|
- area: ['80%', '90%'],
|
|
807
|
|
- title: '订单详情'
|
|
808
|
|
- })
|
|
|
817
|
+ area: ["80%", "90%"],
|
|
|
818
|
+ title: "订单详情"
|
|
|
819
|
+ });
|
|
809
|
820
|
},
|
|
810
|
821
|
// 选择多个
|
|
811
|
822
|
handleSelectionChange(val) {
|
|
812
|
|
- const ids = []
|
|
813
|
|
- this.multipleSelection = val
|
|
|
823
|
+ const ids = [];
|
|
|
824
|
+ this.multipleSelection = val;
|
|
814
|
825
|
for (let i = 0; i < this.multipleSelection.length; i++) {
|
|
815
|
|
- ids.push(this.multipleSelection[i].F_Id)
|
|
|
826
|
+ ids.push(this.multipleSelection[i].F_Id);
|
|
816
|
827
|
}
|
|
817
|
|
- this.selectOrderId = ids
|
|
|
828
|
+ this.selectOrderId = ids;
|
|
818
|
829
|
},
|
|
819
|
830
|
// 撤回权限
|
|
820
|
831
|
authority_cancel(state) {
|
|
821
|
832
|
if (state == 1) {
|
|
822
|
|
- return true
|
|
|
833
|
+ return true;
|
|
823
|
834
|
} else {
|
|
824
|
|
- return false
|
|
|
835
|
+ return false;
|
|
825
|
836
|
}
|
|
826
|
837
|
},
|
|
827
|
838
|
authority_submit() {
|
|
|
@@ -830,9 +841,9 @@ export default {
|
|
830
|
841
|
this.activeName == 2 ||
|
|
831
|
842
|
this.activeName == 9
|
|
832
|
843
|
) {
|
|
833
|
|
- return true
|
|
|
844
|
+ return true;
|
|
834
|
845
|
} else {
|
|
835
|
|
- return false
|
|
|
846
|
+ return false;
|
|
836
|
847
|
}
|
|
837
|
848
|
},
|
|
838
|
849
|
// 售后权限
|
|
|
@@ -850,51 +861,51 @@ export default {
|
|
850
|
861
|
this.activeName == 2 ||
|
|
851
|
862
|
this.activeName == 9
|
|
852
|
863
|
) {
|
|
853
|
|
- return true
|
|
|
864
|
+ return true;
|
|
854
|
865
|
} else {
|
|
855
|
|
- return false
|
|
|
866
|
+ return false;
|
|
856
|
867
|
}
|
|
857
|
868
|
},
|
|
858
|
869
|
// 外呼权限
|
|
859
|
870
|
authority_call_out(status) {
|
|
860
|
871
|
if (status == 0 || status == 1) {
|
|
861
|
|
- return true
|
|
|
872
|
+ return true;
|
|
862
|
873
|
} else {
|
|
863
|
|
- return false
|
|
|
874
|
+ return false;
|
|
864
|
875
|
}
|
|
865
|
876
|
},
|
|
866
|
877
|
// 外呼
|
|
867
|
878
|
clickCallOut(phoneNumber) {
|
|
868
|
|
- this.callOut(phoneNumber)
|
|
|
879
|
+ this.callOut(phoneNumber);
|
|
869
|
880
|
},
|
|
870
|
881
|
// 外呼
|
|
871
|
882
|
callOut(phoneNumber) {
|
|
872
|
883
|
if (phoneNumber) {
|
|
873
|
|
- getCallOutprefix(phoneNumber).then((response) => {
|
|
874
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
875
|
|
- const res = response.data
|
|
|
884
|
+ getCallOutprefix(phoneNumber).then(response => {
|
|
|
885
|
+ if (response.state.toLowerCase() === "success") {
|
|
|
886
|
+ const res = response.data;
|
|
876
|
887
|
this.scoketDatas = {
|
|
877
|
|
- Type: 'MakeCall',
|
|
|
888
|
+ Type: "MakeCall",
|
|
878
|
889
|
AgentID: this.usercode,
|
|
879
|
890
|
AgentExten: this.extension,
|
|
880
|
891
|
Header: res.fix, // 号码前缀 用于截断前缀得到真实号码
|
|
881
|
892
|
DestinationNumber: res.phone //
|
|
882
|
|
- }
|
|
883
|
|
- store.dispatch('ChangeCallNum', phoneNumber)
|
|
884
|
|
- Send(this.scoketDatas)
|
|
885
|
|
- store.dispatch('UpdateCalloutScreen', false) // 关闭外呼面板
|
|
886
|
|
- store.dispatch('UpdateOutboundScreen', false) // 关闭外呼弹屏
|
|
|
893
|
+ };
|
|
|
894
|
+ store.dispatch("ChangeCallNum", phoneNumber);
|
|
|
895
|
+ Send(this.scoketDatas);
|
|
|
896
|
+ store.dispatch("UpdateCalloutScreen", false); // 关闭外呼面板
|
|
|
897
|
+ store.dispatch("UpdateOutboundScreen", false); // 关闭外呼弹屏
|
|
887
|
898
|
}
|
|
888
|
|
- })
|
|
|
899
|
+ });
|
|
889
|
900
|
} else {
|
|
890
|
901
|
this.$message({
|
|
891
|
|
- message: '请先输入电话号码！',
|
|
892
|
|
- type: 'warning'
|
|
893
|
|
- })
|
|
|
902
|
+ message: "请先输入电话号码！",
|
|
|
903
|
+ type: "warning"
|
|
|
904
|
+ });
|
|
894
|
905
|
}
|
|
895
|
|
- }
|
|
|
906
|
+ },
|
|
896
|
907
|
}
|
|
897
|
|
-}
|
|
|
908
|
+};
|
|
898
|
909
|
</script>
|
|
899
|
910
|
|
|
900
|
911
|
<style rel="stylesheet/scss" lang="scss" scoped>
|
