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
9dd7b978
Commit
9dd7b978
authored
Jul 17, 2023
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收费异常2.2
parent
2af381df
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
index.vue
src/views/ecw/order/exception/index.vue
+3
-0
pending.vue
src/views/ecw/order/pending.vue
+2
-0
prepayDeal.vue
src/views/ecw/order/prepayDeal.vue
+5
-5
No files found.
src/views/ecw/order/exception/index.vue
View file @
9dd7b978
...
...
@@ -32,6 +32,8 @@
<el-option
v-for=
"item in importCityList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
-->
</el-row>
<el-row>
<el-form-item
:label=
"$t('运输方式')+':'"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:clearable=
"true"
v-model=
"queryParams.transportId"
/>
</el-form-item>
...
...
@@ -222,6 +224,7 @@
<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>
<el-button
v-else-if=
"scope.row.orderExceptionType=='fee_exception '"
v-hasPermi=
"['ecw:exception:feeException']"
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 @
9dd7b978
...
...
@@ -127,6 +127,7 @@
<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>
<el-button
v-else-if=
"scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='fee_exception '"
v-hasPermi=
"['ecw:exception:feeException']"
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>
...
...
@@ -146,6 +147,7 @@
<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>
<el-button
v-else-if=
"scope.row.orderExceptionType=='fee_exception '"
v-hasPermi=
"['ecw:exception:feeException']"
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 @
9dd7b978
...
...
@@ -11,10 +11,10 @@
<router-link
:to=
"
{path: '/order/detail',query: {orderId: orderData.orderId}}" class="link-type">
<span>
{{
orderData
.
orderNo
||
''
}}
</span>
</router-link>
</el-form-item>
</el-row>
<div
v-if=
"shopData&&
orderExceptionData.orderExceptionType!='goods_add_exception'
"
>
<div
v-if=
"shopData&&
['goods_add_exception','fee_exception',].indexOf(orderExceptionData.orderExceptionType) == -1
"
>
<el-row>
<el-form-item
:label=
"$t('产品名称')+':'"
>
{{
shopData
.
prodTitleZh
||
''
}}
...
...
@@ -34,7 +34,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'
,'fee_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>
...
...
@@ -162,7 +162,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'
,'fee_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
>
...
...
@@ -610,7 +610,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 = '
fee
_exception'
that
.
loading
=
false
;
that
.
orderId
=
response
.
data
.
orderId
that
.
getOrderData
()
...
...
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