|
|
@@ -1,98 +1,23 @@
|
|
1
|
1
|
<template>
|
|
2
|
2
|
<div class="app-container">
|
|
3
|
3
|
<div class="filter-container">
|
|
4
|
|
- <el-date-picker
|
|
5
|
|
- v-model="searchTime"
|
|
6
|
|
- :picker-options="pickerOptions"
|
|
7
|
|
- class="filter-item"
|
|
8
|
|
- type="daterange"
|
|
9
|
|
- format="yyyy年MM月dd日"
|
|
10
|
|
- value-format="yyyy-MM-dd"
|
|
11
|
|
- unlink-panels
|
|
12
|
|
- range-separator="至"
|
|
13
|
|
- start-placeholder="开始日期"
|
|
14
|
|
- end-placeholder="结束日期"
|
|
15
|
|
- />
|
|
16
|
|
- <el-date-picker
|
|
17
|
|
- v-model="waybillTime"
|
|
18
|
|
- :picker-options="pickerOptions"
|
|
19
|
|
- class="filter-item"
|
|
20
|
|
- type="daterange"
|
|
21
|
|
- format="yyyy年MM月dd日"
|
|
22
|
|
- value-format="yyyy-MM-dd"
|
|
23
|
|
- unlink-panels
|
|
24
|
|
- range-separator="至"
|
|
25
|
|
- start-placeholder="物流开始日期"
|
|
26
|
|
- end-placeholder="物流结束日期"
|
|
27
|
|
- />
|
|
28
|
|
- <el-cascader
|
|
29
|
|
- ref="myCascader"
|
|
30
|
|
- v-model="searchData.provinceCity"
|
|
31
|
|
- :options="provinceCityDatas"
|
|
32
|
|
- :props="props"
|
|
33
|
|
- placeholder="请选择地区"
|
|
34
|
|
- class="form_select area"
|
|
35
|
|
- clearable
|
|
36
|
|
- change-on-select
|
|
37
|
|
- @change="handleItemChange"
|
|
38
|
|
- />
|
|
39
|
|
- <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
|
|
40
|
|
- <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" />
|
|
41
|
|
- <el-select
|
|
42
|
|
- v-model="searchData.F_AddDes"
|
|
43
|
|
- placeholder="请选择送货说明"
|
|
44
|
|
- class="form_select"
|
|
45
|
|
- clearable
|
|
46
|
|
- >
|
|
47
|
|
- <el-option
|
|
48
|
|
- v-for="item in addDesList"
|
|
49
|
|
- :key="item.F_Value"
|
|
50
|
|
- :label="item.F_Value"
|
|
51
|
|
- :value="item.F_Value"
|
|
52
|
|
- />
|
|
|
4
|
+ <el-date-picker v-model="searchTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
|
|
|
5
|
+ <el-date-picker v-model="waybillTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="物流开始日期" end-placeholder="物流结束日期" />
|
|
|
6
|
+ <el-cascader ref="myCascader" v-model="searchData.provinceCity" :options="provinceCityDatas" :props="props" placeholder="请选择地区" class="form_select area" clearable change-on-select @change="handleItemChange" />
|
|
|
7
|
+ <!-- <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
|
|
|
8
|
+ <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" /> -->
|
|
|
9
|
+ <el-select v-model="searchData.F_AddDes" placeholder="请选择送货说明" class="form_select filter-item" clearable>
|
|
|
10
|
+ <el-option v-for="item in addDesList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
|
|
53
|
11
|
</el-select>
|
|
54
|
12
|
<el-input v-model="searchData.adFrom" placeholder="请输入消息来源" class="filter-item" />
|
|
55
|
|
- <el-select
|
|
56
|
|
- v-model="searchData.type"
|
|
57
|
|
- class="filter-item"
|
|
58
|
|
- filterable
|
|
59
|
|
- clearable
|
|
60
|
|
- placeholder="请选择订单类型"
|
|
61
|
|
- >
|
|
62
|
|
- <el-option
|
|
63
|
|
- v-for="item in orderType"
|
|
64
|
|
- :key="item.F_Value"
|
|
65
|
|
- :label="item.F_Value"
|
|
66
|
|
- :value="item.F_Value"
|
|
67
|
|
- />
|
|
|
13
|
+ <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
|
|
|
14
|
+ <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
|
|
68
|
15
|
</el-select>
|
|
69
|
|
- <el-select
|
|
70
|
|
- v-model="searchData.express"
|
|
71
|
|
- class="form_select"
|
|
72
|
|
- filterable
|
|
73
|
|
- clearable
|
|
74
|
|
- placeholder="请选择快递"
|
|
75
|
|
- >
|
|
76
|
|
- <el-option
|
|
77
|
|
- v-for="item in expressList"
|
|
78
|
|
- :key="item.F_Value"
|
|
79
|
|
- :label="item.F_Value"
|
|
80
|
|
- :value="item.F_Value"
|
|
81
|
|
- />
|
|
|
16
|
+ <el-select v-model="searchData.express" class="form_select filter-item" filterable clearable placeholder="请选择快递">
|
|
|
17
|
+ <el-option v-for="item in expressList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
|
|
82
|
18
|
</el-select>
|
|
83
|
|
- <el-select
|
|
84
|
|
- v-model="searchData.logisticsStatus"
|
|
85
|
|
- class="form_select"
|
|
86
|
|
- filterable
|
|
87
|
|
- clearable
|
|
88
|
|
- placeholder="请选择物流状态"
|
|
89
|
|
- >
|
|
90
|
|
- <el-option
|
|
91
|
|
- v-for="item in logisticsList"
|
|
92
|
|
- :key="item.F_Value"
|
|
93
|
|
- :label="item.F_Remark"
|
|
94
|
|
- :value="item.F_Value"
|
|
95
|
|
- />
|
|
|
19
|
+ <el-select v-model="searchData.logisticsStatus" class="form_select filter-item" filterable clearable placeholder="请选择物流状态">
|
|
|
20
|
+ <el-option v-for="item in logisticsList" :key="item.F_Value" :label="item.F_Remark" :value="item.F_Value" />
|
|
96
|
21
|
</el-select>
|
|
97
|
22
|
<el-input v-model="searchData.id" placeholder="请输入订单编号" class="filter-item" />
|
|
98
|
23
|
<!-- <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
|
|
|
@@ -124,29 +49,18 @@
|
|
124
|
49
|
<div>
|
|
125
|
50
|
<span>订单数量：{{ pageParams.total }}</span>
|
|
126
|
51
|
</div>
|
|
127
|
|
- <el-table
|
|
128
|
|
- v-loading="loading"
|
|
129
|
|
- :data="dataLists"
|
|
130
|
|
- border
|
|
131
|
|
- stripe
|
|
132
|
|
- @selection-change="handleSelectionChange"
|
|
133
|
|
- row-key="F_Id"
|
|
134
|
|
- >
|
|
|
52
|
+ <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange" row-key="F_Id">
|
|
135
|
53
|
<el-table-column type="selection" :reserve-selection="true"></el-table-column>
|
|
136
|
54
|
<el-table-column type="index" label="编号" align="center" fixed width="80" />
|
|
137
|
55
|
<el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
|
|
138
|
56
|
<template slot-scope="scope">
|
|
139
|
|
- <el-button
|
|
140
|
|
- type="text"
|
|
141
|
|
- size="small"
|
|
142
|
|
- @click="hadndleOrderCode(scope.row.F_Id)"
|
|
143
|
|
- >{{ scope.row.F_Id }}</el-button>
|
|
|
57
|
+ <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
|
|
144
|
58
|
</template>
|
|
145
|
59
|
</el-table-column>
|
|
146
|
60
|
<el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
|
|
147
|
61
|
<el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
|
|
148
|
62
|
<el-table-column label="订购商品" align="center" min-width>
|
|
149
|
|
- <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods}}</template>
|
|
|
63
|
+ <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods }}</template>
|
|
150
|
64
|
</el-table-column>
|
|
151
|
65
|
<el-table-column prop="F_AddTime" label="下单日期" align="center" />
|
|
152
|
66
|
<!-- <el-table-column label="订单状态" align="center">
|
|
|
@@ -155,31 +69,23 @@
|
|
155
|
69
|
<el-table-column label="地址" align="center">
|
|
156
|
70
|
<template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
|
|
157
|
71
|
</el-table-column>
|
|
158
|
|
- <el-table-column prop="F_PayType" label="付款类型" align="center"/>
|
|
159
|
|
- <el-table-column prop="F_RealPrice" label="付款金额" align="center"/>
|
|
160
|
|
- <el-table-column prop="F_AddDes" label="送货说明" align="center"/>
|
|
|
72
|
+ <el-table-column prop="F_PayType" label="付款类型" align="center" />
|
|
|
73
|
+ <el-table-column prop="F_RealPrice" label="付款金额" align="center" sortable min-width="100"/>
|
|
|
74
|
+ <el-table-column prop="F_AddDes" label="送货说明" align="center" />
|
|
161
|
75
|
<el-table-column prop="F_AddUserName" label="下单员工" align="center" />
|
|
162
|
76
|
<!-- <el-table-column prop="F_BelongName" label="归属员工" align="center" /> -->
|
|
163
|
77
|
<el-table-column prop="F_Type" label="订单类型" align="center" />
|
|
164
|
78
|
<el-table-column prop="F_TrackingNo" label="运单号" align="center" />
|
|
165
|
79
|
<el-table-column prop="F_Waybill" label="物流操作时间" align="center" />
|
|
166
|
|
- <el-table-column label="物流状态" align="center" >
|
|
|
80
|
+ <el-table-column label="物流状态" align="center">
|
|
167
|
81
|
<template slot-scope="scope">
|
|
168
|
82
|
{{ scope.row.F_Status | judgmentStatusName }}
|
|
169
|
83
|
</template>
|
|
170
|
84
|
</el-table-column>
|
|
171
|
85
|
<el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
|
|
172
|
86
|
<template slot-scope="scope">
|
|
173
|
|
- <el-button
|
|
174
|
|
- v-permission="'HY_express'"
|
|
175
|
|
- type="text"
|
|
176
|
|
- @click="btn_express(scope.row.F_Id)"
|
|
177
|
|
- >快递信息</el-button>
|
|
178
|
|
- <el-button
|
|
179
|
|
- v-permission="'HY_goback'"
|
|
180
|
|
- type="text"
|
|
181
|
|
- @click="btn_goback(scope.row.F_Id)"
|
|
182
|
|
- >退回</el-button>
|
|
|
87
|
+ <el-button v-permission="'HY_express'" type="text" @click="btn_express(scope.row.F_Id)">快递信息</el-button>
|
|
|
88
|
+ <el-button v-permission="'HY_goback'" type="text" @click="btn_goback(scope.row.F_Id)">退回</el-button>
|
|
183
|
89
|
</template>
|
|
184
|
90
|
</el-table-column>
|
|
185
|
91
|
</el-table>
|
|
|
@@ -195,82 +101,82 @@
|
|
195
|
101
|
</template>
|
|
196
|
102
|
|
|
197
|
103
|
<script>
|
|
198
|
|
-import { getDictionaryValueList, getProviceCityById } from '@/api/commonAPI'
|
|
199
|
|
-import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
|
|
200
|
|
-import { pickerOptions, formatterContent } from "@/utils";
|
|
201
|
|
-import importExpress from './importExpress';
|
|
202
|
|
-import goback from "./goback";
|
|
203
|
|
-import express from './express';
|
|
|
104
|
+import { getDictionaryValueList, getProviceCityById } from "@/api/commonAPI"
|
|
|
105
|
+import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
|
|
|
106
|
+import { pickerOptions, formatterContent } from "@/utils"
|
|
|
107
|
+import importExpress from "./importExpress"
|
|
|
108
|
+import goback from "./goback"
|
|
|
109
|
+import express from "./express"
|
|
204
|
110
|
import detail from "@/views/orderManagement/orderList/detail"
|
|
205
|
|
-import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
|
|
|
111
|
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
|
|
206
|
112
|
|
|
207
|
113
|
export default {
|
|
208
|
114
|
name: "OrderListCustomerService",
|
|
209
|
115
|
components: {
|
|
210
|
|
- Pagination
|
|
|
116
|
+ Pagination,
|
|
211
|
117
|
},
|
|
212
|
118
|
filters: {
|
|
213
|
|
- judgmentStateName (status) {
|
|
|
119
|
+ judgmentStateName(status) {
|
|
214
|
120
|
const statusMap = {
|
|
215
|
|
- '0': "未提交",
|
|
216
|
|
- '1': "待分仓",
|
|
217
|
|
- '2': "已退回",
|
|
218
|
|
- '3': "已分仓",
|
|
219
|
|
- '4': "无货",
|
|
220
|
|
- '5': "仓库待审核",
|
|
221
|
|
- '6': "已发货",
|
|
222
|
|
- '7': "付款待审核",
|
|
223
|
|
- '8': "待分物流",
|
|
224
|
|
- '9': "物流未通过",
|
|
|
121
|
+ 0: "未提交",
|
|
|
122
|
+ 1: "待分仓",
|
|
|
123
|
+ 2: "已退回",
|
|
|
124
|
+ 3: "已分仓",
|
|
|
125
|
+ 4: "无货",
|
|
|
126
|
+ 5: "仓库待审核",
|
|
|
127
|
+ 6: "已发货",
|
|
|
128
|
+ 7: "付款待审核",
|
|
|
129
|
+ 8: "待分物流",
|
|
|
130
|
+ 9: "物流未通过",
|
|
225
|
131
|
}
|
|
226
|
132
|
return statusMap[status]
|
|
227
|
133
|
},
|
|
228
|
|
- judgmentOrderGoods (status) {
|
|
229
|
|
- let orderGoodsNameQuantity = ''
|
|
|
134
|
+ judgmentOrderGoods(status) {
|
|
|
135
|
+ let orderGoodsNameQuantity = ""
|
|
230
|
136
|
for (let i = 0; i < status.length; i++) {
|
|
231
|
137
|
orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
|
|
232
|
138
|
}
|
|
233
|
139
|
orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
|
|
234
|
140
|
return orderGoodsNameQuantity
|
|
235
|
141
|
},
|
|
236
|
|
- judgmentAddress (data) {
|
|
237
|
|
- let addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince //省
|
|
238
|
|
- let addCity = data.F_AddCity === null ? '' : data.F_AddCity //市
|
|
239
|
|
- let addArea = data.F_AddArea === null ? '' : data.F_AddArea //县/区
|
|
240
|
|
- let addTown = data.F_AddTown === null ? '' : data.F_AddTown //乡/镇
|
|
241
|
|
- let address = data.F_Address === null ? '' : data.F_Address //详细地址
|
|
|
142
|
+ judgmentAddress(data) {
|
|
|
143
|
+ let addProvince = data.F_AddProvince === null ? "" : data.F_AddProvince //省
|
|
|
144
|
+ let addCity = data.F_AddCity === null ? "" : data.F_AddCity //市
|
|
|
145
|
+ let addArea = data.F_AddArea === null ? "" : data.F_AddArea //县/区
|
|
|
146
|
+ let addTown = data.F_AddTown === null ? "" : data.F_AddTown //乡/镇
|
|
|
147
|
+ let address = data.F_Address === null ? "" : data.F_Address //详细地址
|
|
242
|
148
|
let addressStr = addProvince + addCity + addArea + addTown + address // 地址
|
|
243
|
149
|
return addressStr
|
|
244
|
150
|
},
|
|
245
|
151
|
judgmentStatusName(status) {
|
|
246
|
152
|
const statusMap = {
|
|
247
|
|
- '0': '未发出',
|
|
248
|
|
- '1': '未签收',
|
|
249
|
|
- '2': '签收',
|
|
250
|
|
- '3': '改代收',
|
|
251
|
|
- '4': '拒收',
|
|
|
153
|
+ 0: "未发出",
|
|
|
154
|
+ 1: "未签收",
|
|
|
155
|
+ 2: "签收",
|
|
|
156
|
+ 3: "改代收",
|
|
|
157
|
+ 4: "拒收",
|
|
252
|
158
|
}
|
|
253
|
159
|
return statusMap[status]
|
|
254
|
160
|
},
|
|
255
|
161
|
},
|
|
256
|
|
- data () {
|
|
|
162
|
+ data() {
|
|
257
|
163
|
return {
|
|
258
|
164
|
loading: false,
|
|
259
|
165
|
searchData: {
|
|
260
|
|
- adFrom: '', //消息/广告媒体来源
|
|
261
|
|
- type: '', //订单类型
|
|
262
|
|
- id: '', //订单号
|
|
263
|
|
- customer: '', //客户姓名
|
|
264
|
|
- customerPhone: '', //客户手机号
|
|
265
|
|
- trackingNo: '', //运单号
|
|
266
|
|
- payState: '', //交易状态
|
|
|
166
|
+ adFrom: "", //消息/广告媒体来源
|
|
|
167
|
+ type: "", //订单类型
|
|
|
168
|
+ id: "", //订单号
|
|
|
169
|
+ customer: "", //客户姓名
|
|
|
170
|
+ customerPhone: "", //客户手机号
|
|
|
171
|
+ trackingNo: "", //运单号
|
|
|
172
|
+ payState: "", //交易状态
|
|
267
|
173
|
provinceCity: [], // 省市县
|
|
268
|
|
- minprice: '', // 最低金额
|
|
269
|
|
- maxprice: '', // 最高金额
|
|
270
|
|
- F_AddDes: '', // 送货说明
|
|
271
|
|
- express: '', //快递
|
|
272
|
|
- logisticsStatus: '', //物流状态
|
|
273
|
|
- warehousing: '', // 是否入库
|
|
|
174
|
+ minprice: "", // 最低金额
|
|
|
175
|
+ maxprice: "", // 最高金额
|
|
|
176
|
+ F_AddDes: "", // 送货说明
|
|
|
177
|
+ express: "", //快递
|
|
|
178
|
+ logisticsStatus: "", //物流状态
|
|
|
179
|
+ warehousing: "", // 是否入库
|
|
274
|
180
|
},
|
|
275
|
181
|
searchTime: [], //订单时间
|
|
276
|
182
|
waybillTime: [], //物流时间
|
|
|
@@ -279,32 +185,32 @@ export default {
|
|
279
|
185
|
provinceCityText: [], // 省市下拉绑定的值
|
|
280
|
186
|
props: {
|
|
281
|
187
|
// 自定义省市下拉数据的key值
|
|
282
|
|
- value: 'id',
|
|
283
|
|
- label: 'text',
|
|
284
|
|
- children: 'children'
|
|
|
188
|
+ value: "id",
|
|
|
189
|
+ label: "text",
|
|
|
190
|
+ children: "children",
|
|
285
|
191
|
},
|
|
286
|
192
|
addDesList: [], // 送货说明
|
|
287
|
193
|
pickerOptions, // 日期数据
|
|
288
|
194
|
pageParams: {
|
|
289
|
195
|
pageindex: 1, // 当前第几页
|
|
290
|
196
|
pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
|
|
291
|
|
- total: 0 // 总共多少数据
|
|
|
197
|
+ total: 0, // 总共多少数据
|
|
292
|
198
|
},
|
|
293
|
199
|
dataLists: [], // 列表数据
|
|
294
|
200
|
multipleSelection: [], // 选中的数据
|
|
295
|
201
|
selectedId: [], // 选中的数据的id
|
|
296
|
|
- orderType: [],//订单类型
|
|
|
202
|
+ orderType: [], //订单类型
|
|
297
|
203
|
logisticsList: [], //物流状态
|
|
298
|
204
|
expressList: [], //快递
|
|
299
|
205
|
selectOrderId: [], //合并订单id
|
|
300
|
|
- };
|
|
|
206
|
+ }
|
|
301
|
207
|
},
|
|
302
|
208
|
watch: {
|
|
303
|
209
|
searchTime(newVal, oldVal) {
|
|
304
|
210
|
!newVal && (this.searchTime = [])
|
|
305
|
|
- }
|
|
|
211
|
+ },
|
|
306
|
212
|
},
|
|
307
|
|
- created () {
|
|
|
213
|
+ created() {
|
|
308
|
214
|
if (this.$route.params.id) {
|
|
309
|
215
|
this.activeName = this.$route.params.id
|
|
310
|
216
|
}
|
|
|
@@ -315,16 +221,16 @@ export default {
|
|
315
|
221
|
this.getAddDesList()
|
|
316
|
222
|
this.getLogistics()
|
|
317
|
223
|
this.getExpress()
|
|
318
|
|
- document.onkeyup = e => {
|
|
|
224
|
+ document.onkeyup = (e) => {
|
|
319
|
225
|
if (e.keyCode === 13) {
|
|
320
|
|
- this.getList();
|
|
|
226
|
+ this.getList()
|
|
321
|
227
|
}
|
|
322
|
|
- };
|
|
|
228
|
+ }
|
|
323
|
229
|
},
|
|
324
|
230
|
methods: {
|
|
325
|
|
- getList () {
|
|
326
|
|
- this.loading = true;
|
|
327
|
|
- return new Promise(resolve => {
|
|
|
231
|
+ getList() {
|
|
|
232
|
+ this.loading = true
|
|
|
233
|
+ return new Promise((resolve) => {
|
|
328
|
234
|
const params = {
|
|
329
|
235
|
F_State: this.activeName, //订单状态
|
|
330
|
236
|
pageindex: 1, // int 第几页
|
|
|
@@ -335,11 +241,11 @@ export default {
|
|
335
|
241
|
F_Customer: this.searchData.customer, //客户姓名
|
|
336
|
242
|
F_CustomerPhone: this.searchData.customerPhone, //客户手机号
|
|
337
|
243
|
F_TrackingNo: this.searchData.trackingNo, //运单号
|
|
338
|
|
- SearchStartTime: this.searchTime[0] == null ? '' : this.searchTime[0], //添加开始时间
|
|
339
|
|
- SearchEndTime: this.searchTime[1] == null ? '' : this.searchTime[1], //添加结束时间
|
|
|
244
|
+ SearchStartTime: this.searchTime[0] == null ? "" : this.searchTime[0], //添加开始时间
|
|
|
245
|
+ SearchEndTime: this.searchTime[1] == null ? "" : this.searchTime[1], //添加结束时间
|
|
340
|
246
|
PayState: this.searchData.payState, //交易状态
|
|
341
|
247
|
F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
|
|
342
|
|
- state: '',
|
|
|
248
|
+ state: "",
|
|
343
|
249
|
F_AddProvince: this.provinceCityText && this.provinceCityText[0], // 省份
|
|
344
|
250
|
F_AddCity: this.provinceCityText[1] && this.provinceCityText[1], // 市
|
|
345
|
251
|
F_AddArea: this.provinceCityText[2] && this.provinceCityText[2], // 县区
|
|
|
@@ -350,54 +256,54 @@ export default {
|
|
350
|
256
|
F_Express: this.searchData.express, //快递
|
|
351
|
257
|
F_Status: this.searchData.logisticsStatus, //物流状态
|
|
352
|
258
|
Warehousing: this.searchData.warehousing, //是否入库
|
|
353
|
|
- startWaybill: this.waybillTime[0] == null ? '' : this.waybillTime[0],
|
|
354
|
|
- endWaybill: this.waybillTime[1] == null ? '' : this.waybillTime[1],
|
|
355
|
|
- };
|
|
356
|
|
- getOrderListCustomerService(params).then(response => {
|
|
357
|
|
- this.loading = false;
|
|
|
259
|
+ startWaybill: this.waybillTime && this.waybillTime[0],
|
|
|
260
|
+ endWaybill: this.waybillTime && this.waybillTime[1],
|
|
|
261
|
+ }
|
|
|
262
|
+ getOrderListCustomerService(params).then((response) => {
|
|
|
263
|
+ this.loading = false
|
|
358
|
264
|
if (response.state.toLowerCase() === "success") {
|
|
359
|
|
- this.pageParams.total = response.data.Totals;
|
|
360
|
|
- this.dataLists = response.data.Rows;
|
|
|
265
|
+ this.pageParams.total = response.data.Totals
|
|
|
266
|
+ this.dataLists = response.data.Rows
|
|
361
|
267
|
}
|
|
362
|
|
- });
|
|
363
|
|
- resolve();
|
|
364
|
|
- });
|
|
|
268
|
+ })
|
|
|
269
|
+ resolve()
|
|
|
270
|
+ })
|
|
365
|
271
|
},
|
|
366
|
272
|
//处理默认选中当前日期
|
|
367
|
273
|
getNowTime() {
|
|
368
|
|
- let now = new Date();
|
|
369
|
|
- let year = now.getFullYear(); //得到年份
|
|
370
|
|
- let month = now.getMonth() + 1; //得到月份
|
|
371
|
|
- let date = now.getDate(); //得到日期
|
|
372
|
|
- let hour =" 00:00:00"; //默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
|
|
373
|
|
- month = month.toString().padStart(2, "0");
|
|
374
|
|
- date = date.toString().padStart(2, "0");
|
|
375
|
|
- let defaultDate = `${year}-${month}-${date}`;
|
|
|
274
|
+ let now = new Date()
|
|
|
275
|
+ let year = now.getFullYear() //得到年份
|
|
|
276
|
+ let month = now.getMonth() + 1 //得到月份
|
|
|
277
|
+ let date = now.getDate() //得到日期
|
|
|
278
|
+ let hour = " 00:00:00" //默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
|
|
|
279
|
+ month = month.toString().padStart(2, "0")
|
|
|
280
|
+ date = date.toString().padStart(2, "0")
|
|
|
281
|
+ let defaultDate = `${year}-${month}-${date}`
|
|
376
|
282
|
this.searchTime = [defaultDate, defaultDate]
|
|
377
|
283
|
},
|
|
378
|
284
|
// 获取订单类型
|
|
379
|
|
- getOrderType () {
|
|
380
|
|
- return new Promise(resolve => {
|
|
|
285
|
+ getOrderType() {
|
|
|
286
|
+ return new Promise((resolve) => {
|
|
381
|
287
|
const params = {
|
|
382
|
288
|
isleaf: true,
|
|
383
|
|
- code: 'ORDERTYPE'
|
|
|
289
|
+ code: "ORDERTYPE",
|
|
384
|
290
|
}
|
|
385
|
|
- getDictionaryValueList(params).then(response => {
|
|
386
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
|
291
|
+ getDictionaryValueList(params).then((response) => {
|
|
|
292
|
+ if (response.state.toLowerCase() === "success") {
|
|
387
|
293
|
this.orderType = response.data.Rows
|
|
388
|
294
|
}
|
|
389
|
295
|
})
|
|
390
|
296
|
})
|
|
391
|
297
|
},
|
|
392
|
298
|
// 物流状态
|
|
393
|
|
- getLogistics () {
|
|
394
|
|
- return new Promise(resolve => {
|
|
|
299
|
+ getLogistics() {
|
|
|
300
|
+ return new Promise((resolve) => {
|
|
395
|
301
|
const params = {
|
|
396
|
302
|
isleaf: true,
|
|
397
|
|
- code: 'OrderF_State'
|
|
|
303
|
+ code: "OrderF_State",
|
|
398
|
304
|
}
|
|
399
|
|
- getDictionaryValueList(params).then(response => {
|
|
400
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
|
305
|
+ getDictionaryValueList(params).then((response) => {
|
|
|
306
|
+ if (response.state.toLowerCase() === "success") {
|
|
401
|
307
|
const res = response.data.Rows
|
|
402
|
308
|
res.forEach((e, i) => {
|
|
403
|
309
|
if (e.F_Remark === "未签收") {
|
|
|
@@ -415,14 +321,14 @@ export default {
|
|
415
|
321
|
})
|
|
416
|
322
|
},
|
|
417
|
323
|
// 快递
|
|
418
|
|
- getExpress () {
|
|
419
|
|
- return new Promise(resolve => {
|
|
|
324
|
+ getExpress() {
|
|
|
325
|
+ return new Promise((resolve) => {
|
|
420
|
326
|
const params = {
|
|
421
|
327
|
isleaf: true,
|
|
422
|
|
- code: 'EXPRESS'
|
|
|
328
|
+ code: "EXPRESS",
|
|
423
|
329
|
}
|
|
424
|
|
- getDictionaryValueList(params).then(response => {
|
|
425
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
|
330
|
+ getDictionaryValueList(params).then((response) => {
|
|
|
331
|
+ if (response.state.toLowerCase() === "success") {
|
|
426
|
332
|
this.expressList = response.data.Rows
|
|
427
|
333
|
}
|
|
428
|
334
|
})
|
|
|
@@ -433,120 +339,119 @@ export default {
|
|
433
|
339
|
return new Promise((resolve) => {
|
|
434
|
340
|
const params = {
|
|
435
|
341
|
isleaf: true,
|
|
436
|
|
- code: 'DELIVERYDES'
|
|
|
342
|
+ code: "DELIVERYDES",
|
|
437
|
343
|
}
|
|
438
|
344
|
getDictionaryValueList(params).then((response) => {
|
|
439
|
|
- if (response.state.toLowerCase() === 'success') {
|
|
|
345
|
+ if (response.state.toLowerCase() === "success") {
|
|
440
|
346
|
this.addDesList = response.data.Rows
|
|
441
|
347
|
}
|
|
442
|
348
|
})
|
|
443
|
349
|
})
|
|
444
|
350
|
},
|
|
445
|
|
- handleTabClick (tab, event) {
|
|
446
|
|
- this.pageParams.pageindex=1
|
|
|
351
|
+ handleTabClick(tab, event) {
|
|
|
352
|
+ this.pageParams.pageindex = 1
|
|
447
|
353
|
if (this.activeName == "6") {
|
|
448
|
354
|
this.searchData.F_State = this.activeName
|
|
449
|
|
- this.searchData.warehousing = ''
|
|
|
355
|
+ this.searchData.warehousing = ""
|
|
450
|
356
|
} else if (this.activeName == "warehousing") {
|
|
451
|
|
- this.searchData.F_State =
|
|
452
|
|
- this.searchData.warehousing = "1"
|
|
|
357
|
+ this.searchData.F_State = this.searchData.warehousing = "1"
|
|
453
|
358
|
}
|
|
454
|
|
- this.getList();
|
|
|
359
|
+ this.getList()
|
|
455
|
360
|
},
|
|
456
|
|
- btn_search () {
|
|
457
|
|
- this.pageParams.pageindex = 1;
|
|
458
|
|
- this.getList();
|
|
|
361
|
+ btn_search() {
|
|
|
362
|
+ this.pageParams.pageindex = 1
|
|
|
363
|
+ this.getList()
|
|
459
|
364
|
},
|
|
460
|
365
|
// 批量退回
|
|
461
|
|
- btn_bulk_goback () {
|
|
|
366
|
+ btn_bulk_goback() {
|
|
462
|
367
|
if (this.selectOrderId.length < 1) {
|
|
463
|
368
|
this.$message({
|
|
464
|
369
|
message: "请选择订单！",
|
|
465
|
370
|
type: "warning",
|
|
466
|
|
- });
|
|
467
|
|
- return;
|
|
|
371
|
+ })
|
|
|
372
|
+ return
|
|
468
|
373
|
}
|
|
469
|
|
- let orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
|
|
|
374
|
+ let orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
|
|
470
|
375
|
this.$layer.iframe({
|
|
471
|
376
|
content: {
|
|
472
|
377
|
content: goback, // 传递的组件对象
|
|
473
|
378
|
parent: this, // 当前的vue对象
|
|
474
|
|
- data: { rowid: orderids } // props
|
|
|
379
|
+ data: { rowid: orderids }, // props
|
|
475
|
380
|
},
|
|
476
|
381
|
area: ["30%", "30%"],
|
|
477
|
|
- title: "退回订单"
|
|
478
|
|
- });
|
|
|
382
|
+ title: "退回订单",
|
|
|
383
|
+ })
|
|
479
|
384
|
},
|
|
480
|
385
|
//退回订单
|
|
481
|
|
- btn_goback (orderid) {
|
|
|
386
|
+ btn_goback(orderid) {
|
|
482
|
387
|
this.$layer.iframe({
|
|
483
|
388
|
content: {
|
|
484
|
389
|
content: goback, // 传递的组件对象
|
|
485
|
390
|
parent: this, // 当前的vue对象
|
|
486
|
|
- data: { rowid: orderid } // props
|
|
|
391
|
+ data: { rowid: orderid }, // props
|
|
487
|
392
|
},
|
|
488
|
393
|
area: ["30%", "30%"],
|
|
489
|
|
- title: "退回订单"
|
|
490
|
|
- });
|
|
|
394
|
+ title: "退回订单",
|
|
|
395
|
+ })
|
|
491
|
396
|
},
|
|
492
|
397
|
// 快递信息
|
|
493
|
|
- btn_bulk_express () {
|
|
|
398
|
+ btn_bulk_express() {
|
|
494
|
399
|
if (this.selectOrderId.length < 1) {
|
|
495
|
400
|
this.$message({
|
|
496
|
401
|
message: "请选择订单！",
|
|
497
|
402
|
type: "warning",
|
|
498
|
|
- });
|
|
499
|
|
- return;
|
|
|
403
|
+ })
|
|
|
404
|
+ return
|
|
500
|
405
|
}
|
|
501
|
|
- let orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
|
|
|
406
|
+ let orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
|
|
502
|
407
|
this.$layer.iframe({
|
|
503
|
408
|
content: {
|
|
504
|
409
|
content: express, // 传递的组件对象
|
|
505
|
410
|
parent: this, // 当前的vue对象
|
|
506
|
|
- data: { rowid: orderids } // props
|
|
|
411
|
+ data: { rowid: orderids }, // props
|
|
507
|
412
|
},
|
|
508
|
413
|
area: ["30%", "30%"],
|
|
509
|
|
- title: "快递信息"
|
|
510
|
|
- });
|
|
|
414
|
+ title: "快递信息",
|
|
|
415
|
+ })
|
|
511
|
416
|
},
|
|
512
|
417
|
// 快递信息
|
|
513
|
|
- btn_express (orderid) {
|
|
|
418
|
+ btn_express(orderid) {
|
|
514
|
419
|
this.$layer.iframe({
|
|
515
|
420
|
content: {
|
|
516
|
421
|
content: express, // 传递的组件对象
|
|
517
|
422
|
parent: this, // 当前的vue对象
|
|
518
|
|
- data: { rowid: orderid } // props
|
|
|
423
|
+ data: { rowid: orderid }, // props
|
|
519
|
424
|
},
|
|
520
|
425
|
area: ["30%", "30%"],
|
|
521
|
|
- title: "快递信息"
|
|
522
|
|
- });
|
|
|
426
|
+ title: "快递信息",
|
|
|
427
|
+ })
|
|
523
|
428
|
},
|
|
524
|
429
|
// 导入快递信息
|
|
525
|
|
- btn_import_express () {
|
|
|
430
|
+ btn_import_express() {
|
|
526
|
431
|
this.$layer.iframe({
|
|
527
|
432
|
content: {
|
|
528
|
433
|
content: importExpress, // 传递的组件对象
|
|
529
|
434
|
parent: this, // 当前的vue对象
|
|
530
|
|
- data: { rowid: '' } // props
|
|
|
435
|
+ data: { rowid: "" }, // props
|
|
531
|
436
|
},
|
|
532
|
437
|
area: ["30%", "30%"],
|
|
533
|
|
- title: "导入快递信息"
|
|
534
|
|
- });
|
|
|
438
|
+ title: "导入快递信息",
|
|
|
439
|
+ })
|
|
535
|
440
|
},
|
|
536
|
441
|
//订单详情
|
|
537
|
|
- hadndleOrderCode (ordercode) {
|
|
|
442
|
+ hadndleOrderCode(ordercode) {
|
|
538
|
443
|
this.$layer.iframe({
|
|
539
|
444
|
content: {
|
|
540
|
445
|
content: detail, // 传递的组件对象
|
|
541
|
446
|
parent: this, // 当前的vue对象
|
|
542
|
|
- data: { 'rowid': ordercode }// props
|
|
|
447
|
+ data: { rowid: ordercode }, // props
|
|
543
|
448
|
},
|
|
544
|
|
- area: ['80%', '90%'],
|
|
545
|
|
- title: '订单详情'
|
|
|
449
|
+ area: ["80%", "90%"],
|
|
|
450
|
+ title: "订单详情",
|
|
546
|
451
|
})
|
|
547
|
452
|
},
|
|
548
|
453
|
//选择多个
|
|
549
|
|
- handleSelectionChange (val) {
|
|
|
454
|
+ handleSelectionChange(val) {
|
|
550
|
455
|
const ids = []
|
|
551
|
456
|
this.multipleSelection = val
|
|
552
|
457
|
for (let i = 0; i < this.multipleSelection.length; i++) {
|
|
|
@@ -562,19 +467,15 @@ export default {
|
|
562
|
467
|
.catch((err) => {})
|
|
563
|
468
|
},
|
|
564
|
469
|
handleItemChange(val) {
|
|
565
|
|
- this.provinceCityText = this.$refs['myCascader'].currentLabels
|
|
|
470
|
+ this.provinceCityText = this.$refs["myCascader"].currentLabels
|
|
566
|
471
|
const pid = val ? val[val.length - 1] : 1 // id值
|
|
567
|
472
|
this.level = val.length + 1 // 判断第几级
|
|
568
|
|
- this.provinceCityDatas = this.handleData(
|
|
569
|
|
- this.provinceCityDatas,
|
|
570
|
|
- pid,
|
|
571
|
|
- this.level
|
|
572
|
|
- )
|
|
|
473
|
+ this.provinceCityDatas = this.handleData(this.provinceCityDatas, pid, this.level)
|
|
573
|
474
|
},
|
|
574
|
475
|
handleData(data, val, level) {
|
|
575
|
476
|
for (let i = 0; i < data.length; i++) {
|
|
576
|
477
|
if (!data[i].children) {
|
|
577
|
|
- this.$set(data[i], 'children', [])
|
|
|
478
|
+ this.$set(data[i], "children", [])
|
|
578
|
479
|
}
|
|
579
|
480
|
if (data[i].id === val) {
|
|
580
|
481
|
getProviceCityById({ pid: val })
|
|
|
@@ -583,7 +484,7 @@ export default {
|
|
583
|
484
|
data[i].children = res.data
|
|
584
|
485
|
if (this.level !== 4) {
|
|
585
|
486
|
data[i].children.forEach((ele) => {
|
|
586
|
|
- this.$set(ele, 'children', [])
|
|
|
487
|
+ this.$set(ele, "children", [])
|
|
587
|
488
|
})
|
|
588
|
489
|
}
|
|
589
|
490
|
} else {
|
|
|
@@ -599,12 +500,26 @@ export default {
|
|
599
|
500
|
}
|
|
600
|
501
|
return data
|
|
601
|
502
|
},
|
|
602
|
|
- }
|
|
603
|
|
-};
|
|
|
503
|
+ },
|
|
|
504
|
+}
|
|
604
|
505
|
</script>
|
|
605
|
506
|
|
|
606
|
507
|
<style rel="stylesheet/scss" lang="scss" scoped>
|
|
|
508
|
+.filter-container {
|
|
|
509
|
+ .el-select {
|
|
|
510
|
+ margin-right: 10px;
|
|
|
511
|
+ }
|
|
|
512
|
+ .el-date-editor {
|
|
|
513
|
+ margin-right: 10px;
|
|
|
514
|
+ }
|
|
|
515
|
+ .el-cascader {
|
|
|
516
|
+ margin-right: 10px;
|
|
|
517
|
+ }
|
|
|
518
|
+ .filter-item {
|
|
|
519
|
+ vertical-align: top;
|
|
|
520
|
+ }
|
|
|
521
|
+}
|
|
607
|
522
|
.el {
|
|
608
|
523
|
cursor: pointer;
|
|
609
|
524
|
}
|
|
610
|
|
-</style>
|
|
|
525
|
+</style>
|
