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
51b38efc
Commit
51b38efc
authored
Sep 04, 2022
by
Marcus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单优惠申请
parent
9d83ed9a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
25 deletions
+43
-25
index.js
src/router/index.js
+1
-1
discount.vue
src/views/ecw/order/special/discount.vue
+42
-24
No files found.
src/router/index.js
View file @
51b38efc
...
...
@@ -297,7 +297,7 @@ export const constantRoutes = [
meta
:
{
title
:
'
订单特价申请
'
,
icon
:
''
,
activeMenu
:
'
/order/index
'
}
},
{
path
:
'
discount/:o
fferProd
Id(
\\
d+)
'
,
path
:
'
discount/:o
rderItem
Id(
\\
d+)
'
,
component
:
(
resolve
)
=>
import
(
'
@/views/ecw/order/special/discount
'
),
props
:
true
,
name
:
'
discount
'
,
...
...
src/views/ecw/order/special/discount.vue
View file @
51b38efc
...
...
@@ -8,7 +8,7 @@
</div>
<el-form
v-if=
"!readonly"
ref=
"form"
:model=
"form"
label-width=
"80px"
>
<el-form-item
label=
"商品类型"
>
<span>
{{
getProductAttrNameById
(
form
.
prod
uct
Type
)
}}
</span>
<span>
{{
getProductAttrNameById
(
form
.
prodType
)
}}
</span>
</el-form-item>
<el-form-item
label=
"商品名称"
>
<span>
{{
form
.
prodTitleZh
}}
</span>
...
...
@@ -17,15 +17,15 @@
<span>
{{
form
.
prodTitleEn
}}
</span>
</el-form-item>
<el-form-item
label=
"线路"
>
{{
`【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)
}
】${ getChannelNameById(form.channelId)
}
从【${
form.departureName
}
】发往【${form.objectiveName
}
】`
}}
{{
`【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)
}
】${ getChannelNameById(form.channelId)
}
从【${
startTitleZh
}
】发往【${destTitleZh
}
】`
}}
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
是否预付
"
>
{{
form
.
isPayAdvance
===
0
?
'
是
'
:
'
否
'
}}
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
旧运费
"
>
<
el
-
input
v
-
model
=
"
form.org
Sea
Freight
"
readonly
>
<
div
slot
=
"
prepend
"
style
=
"
width: 60px
"
>
{{
currentMap
[
form
.
org
Sea
FreightCurrency
]
}}
<
/div
>
<
div
slot
=
"
append
"
style
=
"
width: 60px
"
>
{{
unitMap
[
form
.
org
Sea
FreightVolume
]
}}
<
/div
>
<
el
-
input
v
-
model
=
"
form.orgFreight
"
readonly
>
<
div
slot
=
"
prepend
"
style
=
"
width: 60px
"
>
{{
currentMap
[
form
.
orgFreightCurrency
]
}}
<
/div
>
<
div
slot
=
"
append
"
style
=
"
width: 60px
"
>
{{
unitMap
[
form
.
orgFreightVolume
]
}}
<
/div
>
<
/el-input
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
旧清关费
"
>
...
...
@@ -35,8 +35,8 @@
<
/el-input
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"
新运费
"
required
>
<
el
-
input
v
-
model
.
number
=
"
form.
seaF
reight
"
>
<
el
-
select
v
-
model
=
"
form.
seaF
reightCurrency
"
placeholder
=
"
请选择
"
slot
=
"
prepend
"
style
=
"
width: 100px
"
>
<
el
-
input
v
-
model
.
number
=
"
form.
f
reight
"
>
<
el
-
select
v
-
model
=
"
form.
f
reightCurrency
"
placeholder
=
"
请选择
"
slot
=
"
prepend
"
style
=
"
width: 100px
"
>
<
el
-
option
v
-
for
=
"
item in currencyList
"
:
key
=
"
item.id
"
...
...
@@ -44,7 +44,7 @@
:
value
=
"
item.id
"
>
<
/el-option
>
<
/el-select
>
<
el
-
select
v
-
model
=
"
form.
seaF
reightVolume
"
placeholder
=
"
请选择
"
slot
=
"
append
"
style
=
"
width: 100px
"
>
<
el
-
select
v
-
model
=
"
form.
f
reightVolume
"
placeholder
=
"
请选择
"
slot
=
"
append
"
style
=
"
width: 100px
"
>
<
el
-
option
v
-
for
=
"
item in unitList
"
:
key
=
"
item.id
"
...
...
@@ -84,12 +84,12 @@
<
el
-
descriptions
-
item
label
=
"
商品名称
"
>
{{
form
.
prodTitleZh
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
英文名称
"
>
{{
form
.
prodTitleEn
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
线路
"
>
{{
`【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)
}
】${ getChannelNameById(form.channelId)
}
从【${
form.departureName
}
】发往【${form.objectiveName
}
】`
}}
{{
`【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)
}
】${ getChannelNameById(form.channelId)
}
从【${
startTitleZh
}
】发往【${destTitleZh
}
】`
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
是否预付
"
>
{{
form
.
isPayAdvance
===
0
?
'
是
'
:
'
否
'
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
旧运费
"
>
{{
form
.
org
SeaFreight
}}
{{
currentMap
[
form
.
orgSeaFreightCurrency
]
}}
/
{{
unitMap
[
form
.
orgSea
FreightVolume
]
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
旧运费
"
>
{{
form
.
org
Freight
}}
{{
currentMap
[
form
.
orgFreightCurrency
]
}}
/
{{
unitMap
[
form
.
org
FreightVolume
]
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
旧清关费
"
>
{{
form
.
orgClearanceFreight
}}
{{
currentMap
[
form
.
orgClearanceFreightCurrency
]
}}
/
{{
unitMap
[
form
.
orgClearanceFreightVolume
]
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
新运费
"
>
{{
form
.
seaFreight
}}
{{
currentMap
[
form
.
seaFreightCurrency
]
}}
/
{{
unitMap
[
form
.
seaF
reightVolume
]
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
新运费
"
>
{{
form
.
freight
}}
{{
currentMap
[
form
.
freightCurrency
]
}}
/
{{
unitMap
[
form
.
f
reightVolume
]
}}
<
/el-descriptions-item
>
<
el
-
descriptions
-
item
label
=
"
新清关费
"
>
{{
form
.
clearanceFreight
}}
{{
currentMap
[
form
.
clearanceFreightCurrency
]
}}
/
{{
unitMap
[
form
.
clearanceFreightVolume
]
}}
<
/el-descriptions-item
>
<
/el-descriptions
>
<
/el-card
>
...
...
@@ -106,11 +106,12 @@ import {getUnitList} from "@/api/ecw/unit"
import
{
getChannelList
}
from
"
@/api/ecw/channel
"
import
{
getCurrencyList
}
from
'
@/api/ecw/currency
'
import
{
getProductAttrList
}
from
'
@/api/ecw/productAttr
'
import
{
openedRouterList
}
from
"
@/api/ecw/warehouse
"
export
default
{
name
:
"
specialDiscount
"
,
props
:
{
o
fferProd
Id
:
String
,
o
rderItem
Id
:
String
,
id
:
Number
,
readonly
:
{
type
:
Boolean
,
...
...
@@ -122,14 +123,14 @@ export default {
}
,
created
()
{
// 临时
if
(
this
.
$route
.
query
.
o
ff
erId
){
this
.
form
.
o
fferId
=
this
.
$route
.
query
.
off
erId
-
0
if
(
this
.
$route
.
query
.
o
rd
erId
){
this
.
form
.
o
rderId
=
this
.
$route
.
query
.
ord
erId
-
0
// this.getOrder()
}
// 查看详情,列表进来的
if
(
this
.
o
fferProd
Id
){
this
.
form
.
o
fferProdId
=
this
.
offerProd
Id
-
0
if
(
this
.
o
rderItem
Id
){
this
.
form
.
o
rderItemId
=
this
.
orderItem
Id
-
0
this
.
getOrderSpecial
()
}
...
...
@@ -155,7 +156,7 @@ export default {
"
abnormalState
"
:
0
,
"
applyResult
"
:
""
,
"
applyStatus
"
:
0
,
"
applyType
"
:
0
,
"
applyType
"
:
'
1
'
,
"
ccIds
"
:
""
,
"
channelId
"
:
0
,
"
charging
"
:
0
,
...
...
@@ -206,26 +207,30 @@ export default {
"
transportId
"
:
0
,
"
vweight
"
:
""
,
"
wvolume
"
:
""
}
}
,
startTitleZh
:
''
,
destTitleZh
:
''
}
}
,
methods
:
{
handleSubmit
(){
createOrderSpecial
({
"
applyType
"
:
'
1
'
,
clearanceFreight
:
this
.
form
.
clearanceFreight
,
clearanceFreightCurrency
:
this
.
form
.
clearanceFreightCurrency
,
clearanceFreightVolume
:
this
.
form
.
clearanceFreightVolume
,
o
fferId
:
this
.
form
.
off
erId
,
o
fferProdId
:
this
.
form
.
offerProd
Id
,
seaFreight
:
this
.
form
.
seaF
reight
,
seaFreightCurrency
:
this
.
form
.
seaF
reightCurrency
,
seaFreightVolume
:
this
.
form
.
seaF
reightVolume
,
o
rderId
:
this
.
form
.
ord
erId
,
o
rderItemId
:
this
.
form
.
orderItem
Id
,
freight
:
this
.
form
.
f
reight
,
freightCurrency
:
this
.
form
.
f
reightCurrency
,
freightVolume
:
this
.
form
.
f
reightVolume
,
}
).
then
(
r
=>
{
this
.
$message
.
success
(
r
.
msg
||
'
提交成功
'
)
}
)
}
,
getOrderSpecial
(){
getOrderSpecial
(
this
.
form
.
o
fferProd
Id
).
then
(
r
=>
{
getOrderSpecial
(
this
.
form
.
o
rderItem
Id
).
then
(
r
=>
{
this
.
form
=
r
.
data
}
)
}
,
...
...
@@ -260,6 +265,19 @@ export default {
}
)
return
map
}
}
,
watch
:
{
'
form.lineId
'
(
val
){
if
(
val
){
openedRouterList
({
lineId
:
val
}
).
then
(
r
=>
{
if
(
r
.
data
&&
r
.
data
.
length
>
0
){
this
.
startTitleZh
=
r
.
data
[
0
].
startTitleZh
this
.
destTitleZh
=
r
.
data
[
0
].
destTitleZh
}
}
)
}
}
}
}
<
/script
>
...
...
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