Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-operator-master
Commits
eb4f4e33
Commit
eb4f4e33
authored
Jun 07, 2023
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增异常
parent
3b5eb410
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
162 additions
and
26 deletions
+162
-26
detail.vue
src/views/ecw/order/detail.vue
+1
-1
index.vue
src/views/ecw/order/exception/index.vue
+8
-0
pending.vue
src/views/ecw/order/pending.vue
+17
-1
prepayDeal.vue
src/views/ecw/order/prepayDeal.vue
+136
-24
No files found.
src/views/ecw/order/detail.vue
View file @
eb4f4e33
...
...
@@ -145,7 +145,7 @@
</el-descriptions>
</el-card>
<el-card
class=
"card"
v-if=
"[3].indexOf(+order.transportId) > -1"
>
<el-card
class=
"card"
v-if=
"[3
,4
].indexOf(+order.transportId) > -1"
>
<el-descriptions
class=
"mr-10"
border
:title=
"$t('空运专线')"
:column=
"2"
:labelStyle=
"{width:'110px'}"
:contentStyle=
"{width:'150px'}"
>
<el-descriptions-item
:label=
"$t('是否双清')"
>
<dict-tag
:type=
"DICT_TYPE.ECW_DOUBLE_CLEAR"
:value=
"order.doubleClear"
/>
...
...
src/views/ecw/order/exception/index.vue
View file @
eb4f4e33
...
...
@@ -196,6 +196,14 @@
<el-button
v-else-if=
"scope.row.orderExceptionType=='order_pick_up_exception'"
v-hasPermi=
"['ecw:exception:pickUp']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='not_customer_service_exception'"
v-hasPermi=
"['ecw:exception:notCustomer']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='goods_add_exception'"
v-hasPermi=
"['ecw:exception:goodsAddException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<!-- 2.0 -->
<el-button
v-else-if=
"scope.row.orderExceptionType=='line_loop_exception'"
v-hasPermi=
"['ecw:exception:lineLoopException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='customs_fee_not_quote_exception'"
v-hasPermi=
"['ecw:exception:notQuoteException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='overweight_exception'"
v-hasPermi=
"['ecw:exception:overweightException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='not_shipping_channel_exception'"
v-hasPermi=
"['ecw:exception:notChannelException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='goods_weight_exception'"
v-hasPermi=
"['ecw:exception:goodsWeightException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='in_warehousing_diff_exception'"
v-hasPermi=
"['ecw:exception:inWarehousingException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='stock_up_exception'"
v-hasPermi=
"['ecw:exception:stockUpException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row.orderId)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
</
template
>
</el-table-column>
</el-table>
...
...
src/views/ecw/order/pending.vue
View file @
eb4f4e33
...
...
@@ -131,6 +131,14 @@
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='order_pick_up_exception'"
v-hasPermi=
"['ecw:exception:pickUp']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='not_customer_service_exception'"
v-hasPermi=
"['ecw:exception:notCustomer']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='goods_add_exception'"
v-hasPermi=
"['ecw:exception:goodsAddException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<!-- v2.0 -->
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='line_loop_exception'"
v-hasPermi=
"['ecw:exception:lineLoopException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='customs_fee_not_quote_exception'"
v-hasPermi=
"['ecw:exception:notQuoteException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='overweight_exception'"
v-hasPermi=
"['ecw:exception:overweightException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='not_shipping_channel_exception'"
v-hasPermi=
"['ecw:exception:notChannelException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='goods_weight_exception'"
v-hasPermi=
"['ecw:exception:goodsWeightException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='in_warehousing_diff_exception'"
v-hasPermi=
"['ecw:exception:inWarehousingException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='stock_up_exception'"
v-hasPermi=
"['ecw:exception:stockUpException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
查看
'
)
}}
</el-button>
<el-tag
style=
"margin-left:10px"
v-if=
"scope.row.orderExceptionStatus==2"
>
{{
$t
(
'
已完成
'
)
}}
</el-tag>
<el-button
v-else-if=
"scope.row.orderExceptionType=='order_superfluous_box_exception'"
v-hasPermi=
"['ecw:exception:superfluousBox']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
...
...
@@ -150,6 +158,14 @@
<el-button
v-else-if=
"scope.row.orderExceptionType=='order_pick_up_exception'"
v-hasPermi=
"['ecw:exception:pickUp']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='not_customer_service_exception'"
v-hasPermi=
"['ecw:exception:notCustomer']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='goods_add_exception'"
v-hasPermi=
"['ecw:exception:goodsAddException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<!-- v2.0 -->
<el-button
v-else-if=
"scope.row.orderExceptionType=='line_loop_exception'"
v-hasPermi=
"['ecw:exception:lineLoopException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='customs_fee_not_quote_exception'"
v-hasPermi=
"['ecw:exception:notQuoteException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='overweight_exception'"
v-hasPermi=
"['ecw:exception:overweightException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='not_shipping_channel_exception'"
v-hasPermi=
"['ecw:exception:notChannelException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='goods_weight_exception'"
v-hasPermi=
"['ecw:exception:goodsWeightException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='in_warehousing_diff_exception'"
v-hasPermi=
"['ecw:exception:inWarehousingException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
<el-button
v-else-if=
"scope.row.orderExceptionType=='stock_up_exception'"
v-hasPermi=
"['ecw:exception:stockUpException']"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handEdit(scope.row)"
>
{{
$t
(
'
处理
'
)
}}
</el-button>
</
template
>
</el-table-column>
</el-table>
...
...
src/views/ecw/order/prepayDeal.vue
View file @
eb4f4e33
...
...
@@ -11,7 +11,7 @@
{{
orderData
.
orderNo
||
''
}}
</el-form-item>
</el-row>
<div
v-if=
"shopData&&
orderExceptionData.orderExceptionType!='goods_add_exception'
"
>
<div
v-if=
"shopData&&
['goods_add_exception','line_loop_exception','customs_fee_not_quote_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception'].indexOf(orderExceptionData.orderExceptionType) == -1
"
>
<el-row>
<el-form-item
:label=
"$t('产品名称')+':'"
>
{{
shopData
.
prodTitleZh
||
''
}}
...
...
@@ -32,7 +32,7 @@
</el-row>
<!-- 单证异常,发货人异常,其他异常 不显示这部分内容 -->
<div
v-if=
"['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1"
>
<div
v-if=
"['order_doc_exception','order_consignor_exception', 'order_other_exception'
,'line_loop_exception','customs_fee_not_quote_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception'
].indexOf(orderExceptionData.orderExceptionType) == -1"
>
<!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
<template
v-if=
"['order_pay_exception','order_pick_up_exception', 'order_cod_exception','not_customer_service_exception'].indexOf(orderExceptionData.orderExceptionType) > -1"
>
<el-row>
...
...
@@ -97,7 +97,7 @@
<
span
>
{{
orderExceptionData
.
orderExceptionDetails
}}
<
/span
>
<
/el-form-item
>
<
/el-row
>
<
el
-
row
v
-
if
=
"
orderExceptionData.orderExceptionType=='order_pay_exception'
||orderExceptionData.orderExceptionType!='goods_add_exception'
"
>
<
el
-
row
v
-
if
=
"
orderExceptionData.orderExceptionType=='order_pay_exception'
"
>
<
el
-
form
-
item
:
label
=
"
$t('收费参数')+':'
"
>
<
span
>
{{
orderData
.
sumNum
||
0
}}
{{
$t
(
'
箱
'
)
}}
{{
orderData
.
wvolume
||
0
}}
m
³
{{
orderData
.
vweight
||
0
}}
Kg
{{
orderData
.
sumQuantity
||
0
}}
{{
$t
(
'
个
'
)
}}
<
/span
>
<
/el-form-item
>
...
...
@@ -160,7 +160,7 @@
<
/el-table
>
<!--
单证异常,发货人异常,其他异常的表格
-->
<
el
-
table
v
-
if
=
"
['order_doc_exception', 'order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) > -1
"
v
-
loading
=
"
loading
"
border
:
data
=
"
orderData.orderItemVOList
"
>
<
el
-
table
v
-
if
=
"
['order_doc_exception', 'order_consignor_exception', 'order_other_exception'
,'line_loop_exception','customs_fee_not_quote_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception'
].indexOf(orderExceptionData.orderExceptionType) > -1
"
v
-
loading
=
"
loading
"
border
:
data
=
"
orderData.orderItemVOList
"
>
<
el
-
table
-
column
:
label
=
"
$t('序号')
"
align
=
"
center
"
prop
=
"
id
"
type
=
"
index
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
scope
.
$index
+
1
}}
<
/span
>
...
...
@@ -327,6 +327,12 @@
<
/div
>
<
/template
>
<
/el-form-item
>
<!--
货物重量异常
-->
<
el
-
row
:
span
=
"
8
"
v
-
if
=
"
orderExceptionData.orderExceptionType=='goods_weight_exception'
"
>
<
el
-
form
-
item
:
label
=
"
$t('备注')+':'
"
size
=
"
medium
"
>
<
el
-
input
style
=
"
width: 500px;
"
type
=
"
textarea
"
v
-
model
=
"
handlerParams.orderExceptionHandlerRemark
"
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
/>
<
/el-form-item
>
<
/el-row
>
<!--
预付异常的备选需要根据接口数据过滤
-->
<
el
-
row
v
-
if
=
"
orderExceptionData.orderExceptionType=='order_pay_exception'||orderExceptionData.orderExceptionType=='not_customer_service_exception'
"
>
<
el
-
form
-
item
:
label
=
"
$t('处理结果')+':'
"
required
>
...
...
@@ -337,7 +343,7 @@
<
/el-select
>
<
/el-form-item
>
<
/el-row
>
<
el
-
row
v
-
else
-
if
=
"
orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'
"
>
<
el
-
row
v
-
else
-
if
=
"
['order_miss_exception','order_superfluous_goods_exception', 'order_in_water_exception','order_damage_exception','goods_weight_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) == -1
"
>
<
el
-
form
-
item
:
label
=
"
$t('处理结果')+':'
"
required
>
<
el
-
select
v
-
model
=
"
handlerParams.orderExceptionHandlerResult
"
:
placeholder
=
"
$t('请选择')
"
clearable
@
change
=
"
handlerResultChange
"
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
>
<
template
v
-
for
=
"
dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')
"
>
...
...
@@ -420,13 +426,13 @@
<
/el-select
>
<
/el-form-item
>
<
/el-row
>
<
el
-
row
:
span
=
"
8
"
v
-
if
=
"
orderExceptionData.orderExceptionType!='not_customer_service_exception'&&orderExceptionData.orderExceptionType!='goods_add_exception'
"
>
<
el
-
row
:
span
=
"
8
"
v
-
if
=
"
orderExceptionData.orderExceptionType!='not_customer_service_exception'&&orderExceptionData.orderExceptionType!='goods_add_exception'
&&orderExceptionData.orderExceptionType!='goods_weight_exception'
"
>
<
el
-
form
-
item
:
label
=
"
$t('备注')+':'
"
size
=
"
medium
"
>
<
el
-
input
style
=
"
width: 500px;
"
type
=
"
textarea
"
v
-
model
=
"
handlerParams.orderExceptionHandlerRemark
"
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
/>
<
/el-form-item
>
<
/el-row
>
<
div
v
-
if
=
"
orderExceptionData.orderExceptionType=='order_miss_exception'||orderExceptionData.orderExceptionType=='order_superfluous_goods_exception'||orderExceptionData.orderExceptionType=='order_in_water_exception'||orderExceptionData.orderExceptionType=='order_damage_exception'
"
>
<
div
v
-
if
=
"
['order_miss_exception','order_superfluous_goods_exception', 'order_in_water_exception','order_damage_exception','goods_weight_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) > -1
"
>
<
el
-
row
>
<
el
-
form
-
item
:
label
=
"
$t('状态')+':'
"
>
<
el
-
radio
-
group
v
-
model
=
"
handlerParams.orderExceptionStatus
"
@
change
=
"
changeExceptionStatus
"
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
>
...
...
@@ -444,7 +450,14 @@
<
/el-form-item
>
<
/el-row
>
<
el
-
row
>
<
el
-
form
-
item
:
label
=
"
$t('赔付金额')+':'
"
size
=
"
medium
"
required
v
-
if
=
"
handlerParams.orderExceptionStatus==2
"
>
<
el
-
form
-
item
:
label
=
"
$t('赔付金额')+':'
"
size
=
"
medium
"
required
v
-
if
=
"
orderExceptionData.orderExceptionType=='goods_weight_exception'&&handlerParams.orderExceptionStatus==2&&handlerParams.orderExceptionHandlerResult!='customer_not_pay'
"
>
<
el
-
input
style
=
"
width: 100px;
"
type
=
"
text
"
v
-
model
=
"
handlerParams.amount
"
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
/>
<
el
-
select
v
-
model
=
"
handlerParams.currency
"
style
=
"
width: 100px;margin-left: 10px;
"
clearable
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
>
<
el
-
option
v
-
for
=
"
dict in currencyList
"
:
key
=
"
dict.id
"
:
label
=
"
dict.titleZh
"
:
value
=
"
dict.id
"
/>
<
/el-select
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('赔付金额')+':'
"
size
=
"
medium
"
required
v
-
else
-
if
=
"
handlerParams.orderExceptionStatus==2&&orderExceptionData.orderExceptionType!='goods_weight_exception'&&orderExceptionData.orderExceptionType!='not_shipping_channel_exception'
"
>
<
el
-
input
style
=
"
width: 100px;
"
type
=
"
text
"
v
-
model
=
"
handlerParams.amount
"
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
/>
<
el
-
select
v
-
model
=
"
handlerParams.currency
"
style
=
"
width: 100px;margin-left: 10px;
"
clearable
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
>
<
el
-
option
v
-
for
=
"
dict in currencyList
"
...
...
@@ -452,13 +465,42 @@
<
/el-select
>
<
/el-form-item
>
<
/el-row
>
<
el
-
row
>
<
el
-
form
-
item
:
label
=
"
$t('查明原因')+':'
"
required
v
-
if
=
"
handlerParams.orderExceptionStatus==1
"
>
<
el
-
row
v
-
if
=
"
handlerParams.orderExceptionStatus==1
"
>
<
el
-
form
-
item
:
label
=
"
$t('查明原因')+':'
"
required
v
-
if
=
"
orderExceptionData.orderExceptionType!='not_shipping_channel_exception'
"
>
<
el
-
select
v
-
model
=
"
handlerParams.orderExceptionHandlerResult
"
clearable
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
>
<
el
-
option
v
-
for
=
"
dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')
"
:
key
=
"
dict.value
"
:
label
=
"
dict.label
"
:
value
=
"
dict.value
"
/>
<
/el-select
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('查明原因')+':'
"
required
v
-
if
=
"
orderExceptionData.orderExceptionType=='not_shipping_channel_exception'
"
>
<
el
-
select
v
-
model
=
"
handlerParams.orderExceptionHandlerResult
"
clearable
:
disabled
=
"
orderExceptionData.orderExceptionStatus==2
"
>
<
el
-
option
v
-
for
=
"
dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')
"
:
key
=
"
dict.value
"
:
label
=
"
dict.label
"
:
value
=
"
dict.value
"
/>
<
/el-select
>
<
/el-form-item
>
<
div
v
-
if
=
"
orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&handlerParams.orderExceptionHandlerResult=='change_channel'
"
>
<
el
-
form
-
item
:
label
=
"
$t('出货渠道')
"
prop
=
"
channelId
"
v
-
if
=
"
getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'
"
>
<!--
嵌套一个
form
来脱离
disabled
控制
-->
<
el
-
form
>
<
selector
v
-
model
=
"
handlerParams.channelId
"
:
options
=
"
channelList
"
value
-
field
=
"
channelId
"
:
label
-
field
=
"
$l(null, 'name')
"
><
/selector
>
<
/el-form
>
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('选择线路')
"
prop
=
"
lineId
"
>
<
el
-
input
:
value
=
"
selectedRouter ? $l(selectedRouter, 'startTitle') + ' > ' + $l(selectedRouter, 'destTitle') : ''
"
disabled
:
placeholder
=
"
$t('请在右侧选择线路')
"
><
/el-input
>
<
/el-form-item
>
<!--
select
是原生组件,不受
el
-
form
的
disabled
控制
-->
<
select
size
=
"
5
"
v
-
model
=
"
handlerParams.lineId
"
style
=
"
min-width: 300px; border:1px solid #DCDFE6; border-radius:4px
"
>
<
option
v
-
for
=
"
item in routerList
"
:
value
=
"
item.id
"
:
key
=
"
item.id
"
>
{{
$l
(
item
,
'
startTitle
'
)
}}
>>
{{
$l
(
item
,
'
destTitle
'
)
}}
(
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_TRANSPORT_TYPE
"
:
value
=
"
item.transportType
"
><
/dict-tag>
)
<
/option
>
<
/select
>
<
/div
>
<
/el-row
>
<
/div
>
<
/el-form
>
...
...
@@ -507,10 +549,15 @@
import
{
getCustomer
}
from
'
@/api/ecw/customer
'
import
ProductSelector
from
'
@/components/ProductSelector
'
import
{
getProductAttrList
}
from
'
@/api/ecw/productAttr
'
import
{
getChannelList
}
from
'
@/api/ecw/channel
'
import
Selector
from
'
@/components/Selector
'
import
{
openedRouterList
as
getOpenedRouterList
}
from
'
@/api/ecw/warehouse
'
import
{
getTradeCityList
}
from
'
@/api/ecw/region
'
export
default
{
name
:
"
PrepayDeal
"
,
components
:
{
FileUpload
,
WorkFlow
,
FilePreview
,
ProductSelector
FileUpload
,
WorkFlow
,
FilePreview
,
ProductSelector
,
Selector
}
,
data
()
{
return
{
...
...
@@ -547,7 +594,9 @@
productId1
:
null
,
productId2
:
null
,
productAttrList
:[],
// 商品属性
channelName
:
'
/
'
channelName
:
'
/
'
,
channelList
:
[],
// 出货取到
tradeCityList
:[]
}
;
}
,
async
created
()
{
...
...
@@ -557,11 +606,14 @@
this
.
getList
()
}
this
.
channelList
=
(
await
getChannelList
()).
data
this
.
productAttrList
=
(
await
getProductAttrList
()).
data
listServiceUser
().
then
(
r
=>
{
this
.
customerServiceList
=
r
.
data
;
}
)
getCurrencyList
().
then
(
res
=>
this
.
currencyList
=
res
.
data
)
this
.
tradeCityList
=
(
await
getTradeCityList
()).
data
}
,
watch
:{
'
handlerParams.orderExceptionHandlerResult
'
(
val
){
...
...
@@ -588,6 +640,9 @@
'
orderData.channelId
'
(){
this
.
getChannel
()
}
,
'
orderData.transportId
'
(){
this
.
getOpenedRouterList
()
}
}
,
computed
:
{
currencyMap
(){
...
...
@@ -597,6 +652,15 @@
}
)
return
map
}
,
// 是否已完成入仓
inWarehouse
(){
return
(
!!
this
.
orderData
.
inWarehouseState
&&
this
.
orderData
.
inWarehouseState
>
201
)
||
this
.
orderData
.
shipmentState
>
0
}
,
selectedRouter
(){
// otherService 1 集运服务 2 送货上门 3 非控货订单代收货款 4 海外仓 5 提货异常
if
(
!
this
.
handlerParams
.
lineId
)
return
null
return
this
.
routerList
.
find
(
item
=>
item
.
id
==
this
.
handlerParams
.
lineId
)
}
,
shopData
(){
if
(
this
.
orderExceptionData
.
orderItemId
&&
this
.
orderData
&&
this
.
orderData
.
orderItemVOList
){
if
(
this
.
orderExceptionData
.
orderExceptionType
==
'
goods_add_exception
'
&&!
this
.
handlerParams
.
productId
){
...
...
@@ -607,17 +671,30 @@
return
this
.
orderData
.
orderItemVOList
.
find
(
item
=>
item
.
orderItemId
==
this
.
orderExceptionData
.
orderItemId
)
}
}
,
getProdAtrr
(
ids
){
if
(
!
ids
)
return
''
let
attr
=
[]
let
attrIds
=
ids
.
split
(
'
,
'
)
this
.
productAttrList
.
forEach
(
item
=>
{
if
(
attrIds
.
indexOf
(
item
.
id
)
!==-
1
){
attr
.
push
(
this
.
$l
(
item
,
'
attrName
'
))
}
getDictData
(){
return
(
type
,
value
)
=>
getDictData
(
type
,
value
)
||
{
}
}
,
exportCityList
(){
return
this
.
tradeCityList
.
filter
(
item
=>
item
.
type
==
2
||
item
.
type
==
3
)
}
,
importCityList
(){
return
this
.
tradeCityList
.
filter
(
item
=>
item
.
type
==
1
||
item
.
type
==
3
)
}
,
exportCityIds
(){
let
ids
=
[]
this
.
exportCityList
.
forEach
(
item
=>
{
ids
.
push
(
item
.
id
)
}
)
return
attr
.
join
(
'
,
'
)
}
return
ids
}
,
importCityIds
(){
let
ids
=
[]
this
.
importCityList
.
forEach
(
item
=>
{
ids
.
push
(
item
.
id
)
}
)
return
ids
}
,
}
,
methods
:
{
onTableMounted
(
e
){
...
...
@@ -629,6 +706,17 @@
if
(
label
.
length
>
0
)
return
label
[
0
].
titleZh
return
''
}
,
getProdAtrr
(
ids
){
if
(
!
ids
)
return
''
let
attr
=
[]
let
attrIds
=
ids
.
split
(
'
,
'
)
this
.
productAttrList
.
forEach
(
item
=>
{
if
(
attrIds
.
indexOf
(
item
.
id
)
!==-
1
){
attr
.
push
(
this
.
$l
(
item
,
'
attrName
'
))
}
}
)
return
attr
.
join
(
'
,
'
)
}
,
getChannel
(){
if
(
!
this
.
order
||
!
this
.
order
.
channelId
||
this
.
order
.
transportId
==
1
||
this
.
order
.
transportId
==
2
)
return
getChannel
(
this
.
order
.
channelId
).
then
(
res
=>
{
...
...
@@ -643,7 +731,7 @@
// that.orderExceptionData.orderExceptionType = 'order_other_exception'
// that.orderExceptionData.orderExceptionType = 'order_miss_exception'
// that.orderExceptionData.orderExceptionType = 'not_customer_service_exception'
// that.orderExceptionData.orderExceptionType = '
goods_add
_exception'
// that.orderExceptionData.orderExceptionType = '
not_shipping_channel
_exception'
that
.
loading
=
false
;
that
.
orderId
=
response
.
data
.
orderId
that
.
getOrderData
()
...
...
@@ -664,12 +752,36 @@
}
);
}
,
// 获取路线
getOpenedRouterList
(){
let
params
=
{
}
if
(
this
.
orderData
.
departureVO
&&
this
.
orderData
.
departureVO
.
departureId
){
params
.
startCityId
=
this
.
orderData
.
departureVO
.
departureId
}
if
(
this
.
orderData
.
objectiveVO
&&
this
.
orderData
.
objectiveVO
.
objectiveId
){
params
.
destCityId
=
this
.
orderData
.
objectiveVO
.
objectiveId
}
if
(
this
.
orderData
.
transportId
){
params
.
transportType
=
this
.
handlerParams
.
transportId
}
// 始发,目的和运输方式都没有的时候不获取
if
(
!
params
.
startCityId
&&
!
params
.
destCityId
&&
!
params
.
transportType
)
return
false
getOpenedRouterList
(
params
).
then
(
res
=>
{
this
.
routerList
=
res
.
data
.
filter
(
item
=>
{
return
this
.
exportCityIds
.
indexOf
(
item
.
startCityId
)
>
-
1
&&
this
.
importCityIds
.
indexOf
(
item
.
destCityId
)
>
-
1
}
)
}
)
}
,
changeExceptionStatus
(){
this
.
$set
(
this
.
handlerParams
,
'
orderExceptionHandlerResult
'
,
''
)
}
,
getOrderData
(){
getOrder
(
this
.
orderId
).
then
(
response
=>
{
this
.
orderData
=
response
.
data
this
.
handlerParams
.
channelId
=
this
.
orderData
.
channelId
this
.
handlerParams
.
lineId
=
this
.
orderData
.
lineId
if
(
response
.
data
.
customerId
){
this
.
getCustomerData
(
response
.
data
.
customerId
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment