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
39a45e3d
Commit
39a45e3d
authored
Dec 03, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单佣金申请bug
parent
c9f81ec2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ApprovalDetail.vue
src/views/ecw/order/components/ApprovalDetail.vue
+3
-3
Commission.vue
src/views/ecw/order/special/Commission.vue
+1
-1
No files found.
src/views/ecw/order/components/ApprovalDetail.vue
View file @
39a45e3d
...
...
@@ -58,7 +58,7 @@
<
/div
>
<
div
class
=
"
item
"
>
{{
$t
(
'
佣金规则
'
)
}}
:
{{
$t
(
'
从【{oldType
}
】改为【{newType
}
】
'
,
{
oldType
:
getDictDataLabel
(
DICT_TYPE
.
COMMISSION_TYPE
,
detail
.
c
ommissionType
)
,
oldType
:
getDictDataLabel
(
DICT_TYPE
.
COMMISSION_TYPE
,
detail
.
orgC
ommissionType
)
,
newType
:
getDictDataLabel
(
DICT_TYPE
.
COMMISSION_TYPE
,
detail
.
commissionType
),
}
)
}}
<
/div
>
...
...
@@ -67,10 +67,10 @@
{{
$t
(
'
原运费
'
)
}}
:
{{
detail
.
orgFreight
}}
{{
currencyMap
[
detail
.
freightCurrency
]
}}
/
{{
unitMap
[
detail
.
freightVolume
]
}}
<
/div
>
<
div
>
{{
$t
(
'
新运费
'
)
}}
:
{{
Decimal
(
detail
.
orgFreight
||
0
).
minus
(
detail
.
l
ightCommissionAmount
||
0
).
plus
(
detail
.
lightCommissionAmount
||
0
)
}}
{{
currencyMap
[
detail
.
freightCurrency
]
}}
/
{{
unitMap
[
detail
.
freightVolume
]
}}
{{
$t
(
'
新运费
'
)
}}
:
{{
Decimal
(
detail
.
orgFreight
||
0
).
minus
(
detail
.
orgL
ightCommissionAmount
||
0
).
plus
(
detail
.
lightCommissionAmount
||
0
)
}}
{{
currencyMap
[
detail
.
freightCurrency
]
}}
/
{{
unitMap
[
detail
.
freightVolume
]
}}
<
/div
>
<
div
>
{{
$t
(
'
成本价
'
)
}}
:
{{
Decimal
(
detail
.
orgFreight
||
0
).
minus
(
detail
.
l
ightCommissionAmount
||
0
).
minus
(
detail
.
shadeCommissionAmount
||
0
)
}}
{{
currencyMap
[
detail
.
freightCurrency
]
}}
/
{{
unitMap
[
detail
.
freightVolume
]
}}
{{
$t
(
'
成本价
'
)
}}
:
{{
Decimal
(
detail
.
orgFreight
||
0
).
minus
(
detail
.
orgL
ightCommissionAmount
||
0
).
minus
(
detail
.
shadeCommissionAmount
||
0
)
}}
{{
currencyMap
[
detail
.
freightCurrency
]
}}
/
{{
unitMap
[
detail
.
freightVolume
]
}}
<
/div
>
<
div
>
{{
$t
(
'
明佣
'
)
}}
:
{{
detail
.
lightCommissionAmount
}}
{{
currencyMap
[
detail
.
freightCurrency
]
}}
/
{{
unitMap
[
detail
.
freightVolume
]
}}
...
...
src/views/ecw/order/special/Commission.vue
View file @
39a45e3d
...
...
@@ -35,7 +35,7 @@
<
/el-row
>
<
el
-
form
-
item
:
label
=
"
$t('全包价')
"
v
-
if
=
"
orderItem.charging
"
>
{{
orderItem
.
orgSea
Freight
}}
{{
currencyMap
[
orderItem
.
seaFreightCurrency
]
}}
/
{{
unitMap
[
orderItem
.
seaFreightVolume
]
}}
{{
form
.
org
Freight
}}
{{
currencyMap
[
orderItem
.
seaFreightCurrency
]
}}
/
{{
unitMap
[
orderItem
.
seaFreightVolume
]
}}
<
/el-form-item
>
<
el
-
form
-
item
:
label
=
"
$t('佣金类型')
"
prop
=
"
commissionType
"
>
...
...
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